commit 5706d00d5d74b3ec3050fb03275cd91b2340abb6
Author: zhang_li <2235006734@qqq.com>
Date:   Wed Mar 27 17:27:36 2024 +0800

    first commit

diff --git a/App.vue b/App.vue
new file mode 100644
index 0000000..01203cc
--- /dev/null
+++ b/App.vue
@@ -0,0 +1,70 @@
+<script setup lang="ts">
+	import {
+		onLaunch,
+		onShow,
+		onHide
+	} from '@dcloudio/uni-app'
+	import {
+		getCurrentInstance
+	} from 'vue'
+	import {
+		getAccessToken
+	} from '@/utils/auth'
+	const { proxy } = getCurrentInstance()
+
+	import { storeToRefs } from 'pinia'
+	import { useCountStore } from '@/store'
+
+
+	// 获取自定义的store
+	const store = useCountStore()
+
+	onLaunch(async () => {
+		// #ifdef MP-WEIXIN
+		if (uni.canIUse('getUpdateManager')) {
+			const updateManager = uni.getUpdateManager()
+			updateManager.onCheckForUpdate(function (res) {
+				if (res.hasUpdate) {
+					updateManager.onUpdateReady(function () {
+						uni.showModal({
+							title: '更新提示',
+							content: '新版本已经准备好，是否重启应用？',
+							success: function (res) {
+								if (res.confirm) {
+									updateManager.applyUpdate()
+								}
+							}
+						})
+					})
+					updateManager.onUpdateFailed(function () {
+						uni.showModal({
+							title: '已经有新版本了哟~',
+							content: '新版本已经上线啦~，请您删除当前小程序，重新搜索打开哟~'
+						})
+					})
+				}
+			})
+		} else {
+			uni.showModal({
+				title: '提示',
+				content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。'
+			})
+		}
+		// #endif
+		if (getAccessToken()) {
+			await store.GetPermissionInfo().then(res => {
+			}).catch(() => { })
+			await store.GetInfo().then(res => {
+			}).catch(() => { })
+		}
+		// 解决onLaunch和onLoad异步问题
+		proxy.$isResolve();
+	})
+	onShow(() => {
+	})
+	onHide(() => {
+	})
+</script>
+<style lang="scss">
+	@import 'vk-uview-ui/index.scss';
+</style>
\ No newline at end of file
diff --git a/api/http.ts b/api/http.ts
new file mode 100644
index 0000000..a3f62b7
--- /dev/null
+++ b/api/http.ts
@@ -0,0 +1,114 @@
+import axios from 'axios'
+
+import { getFullURL } from '@/utils/http'
+import { getAccessToken, removeToken } from '@/utils/auth'
+
+const instance = axios.create({
+	baseURL: import.meta.env.VITE_BASE_URL,
+	adapter(config) {
+		const { url, method, data, params, headers, baseURL, paramsSerializer } =
+			config
+		return new Promise((resolve, reject) => {
+			uni.request({
+				method: method!.toUpperCase() as any,
+				url: getFullURL(baseURL || '', url!, params, paramsSerializer),
+				header: headers,
+				data,
+				dataType: 'json',
+				responseType: config.responseType,
+				success: (res : any) => {
+					resolve(res)
+				},
+				fail: (error : any) => {
+					reject(error)
+				}
+			})
+		})
+	}
+})
+
+
+/**
+ * 请求拦截
+ */
+instance.interceptors.request.use((config) => {
+	const { method, params, url } = config
+	// 附带鉴权的token
+	const tenantId = 1
+	const headers : any = {
+		token: getAccessToken(),
+		"tenant-id":tenantId,
+		'Authorization': 'Bearer ' + getAccessToken()
+	}
+	if (uni.getStorageSync('openId')) {
+		headers['openId'] = uni.getStorageSync('openId')
+	}
+	// 不缓存get请求
+	if (method === 'get') {
+		headers['Cache-Control'] = 'no-cache'
+	}
+	// delete请求参数放入body中
+	if (method === 'delete') {
+		headers['Content-type'] = 'application/json;'
+		Object.assign(config, {
+			data: params,
+			params: {}
+		})
+	}
+
+	return {
+		...config,
+		headers
+	}
+})
+
+/**
+ * 响应拦截
+ */
+instance.interceptors.response.use((v) => {
+        const code = v.data?.code || 200
+	if (code === 401) {
+		// alert('即将跳转登录页。。。', '登录过期')
+		// setTimeout(redirectHome, 1500)
+		removeToken()
+		uni.showModal({
+			title: '系统提示',
+			content: '登录状态已过期，您可以继续留在该页面，或者重新登录',
+			cancelText: '关闭',
+			confirmText: '重新登录',
+			success: function (res) {
+				if (res.confirm) {
+					uni.reLaunch({ url: '/pages/login' })
+				}
+			}
+		})
+		return v.data
+	} else if (code === 500) {
+		uni.showToast({
+			title: v.data.msg,
+			icon: 'none'
+		})
+		return v.data
+	} else if (code !== 200) {
+		uni.showToast({
+			title: v.data.msg,
+			icon: 'none'
+		})
+		return v.data
+	}
+
+	// @ts-ignore
+	if ((v.status || v.statusCode) === 200) {
+		return v.data
+	}else{
+		
+	}
+	return Promise.reject(v)
+},error=>{
+	console.log(error)
+	uni.showToast({
+		title: '网络错误',
+		icon: 'none'
+	})
+})
+export default instance
\ No newline at end of file
diff --git a/api/login.js b/api/login.js
new file mode 100644
index 0000000..cdae309
--- /dev/null
+++ b/api/login.js
@@ -0,0 +1,41 @@
+import http from './http'
+
+// 登录方法
+export function login(username, password, captchaVerification, tenantName, rememberMe, code, uuid) {
+	const data = {
+		username,
+		password,
+		captchaVerification,
+		tenantName,
+		rememberMe,
+		code,
+		uuid,
+	}
+	return http.post('/system/auth/login', data)
+}
+
+// 获取用户详细信息
+export function getInfo() {
+  return http.get('/system/user/profile/get')
+}
+// 获取权限
+export function getPermissionInfo() {
+  return http.get('/system/auth/get-permission-info')
+}
+// 退出方法
+export function logout() {
+  return http.post('/system/auth/logout')
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/api/request2.js b/api/request2.js
new file mode 100644
index 0000000..aaf6fb8
--- /dev/null
+++ b/api/request2.js
@@ -0,0 +1,2330 @@
+
+import http from './http'
+/**
+ * 获取验证码
+ * @param {*}  
+ */
+export function getCaptchaImage(params) {
+  return http.get('/system/captcha/captchaImage',{params})
+}
+/**
+ * 登录方法
+ */
+export function login(username, password, code, uuid) {
+	const data = {
+		username,
+		password,
+		code,
+		uuid,
+	}
+	return http.post('/system/auth/login', data)
+}
+
+
+/**
+ * 退出
+ */
+export function logout(data) {
+  return http.post('/system/auth/logout',data)
+}
+/**
+ * 获取登录用户的权限信息
+ */
+export function getPermissionInfo() {
+  return http.get('/system/auth/get-permission-info')
+}
+/**
+ * 获取租户信息
+ */
+export function getTenantInfo(name) {
+	const params = {
+		name: name,
+		pageNo: 1,
+		pageSize: 100,
+	}
+  return http.get('/system/tenant/page',params)
+}
+
+
+/**
+ * 获取登录用户信息
+ */
+export function getUserProfile() {
+  return http.get('/system/user/profile/get')
+}
+/**
+ * 修改个人用户密码
+ */
+export function updateUserPwd(oldPassword, newPassword) {
+	const data = {
+		oldPassword,
+		newPassword
+	}
+  return http.put('/system/user/profile/update-password',data)
+}
+/**
+ * 获取仓库代码
+ * @param {*}   
+ * 
+ */
+export function getWarehouseCodeList(pageNo, pageSize) {
+  return http.get("/wms/warehouse/page?pageNo=" + pageNo + "&pageSize=" + pageSize)
+}
+//获取产品标签信息inventorylabel
+export function getInventoryLabel(code) {
+  return http.get("/api/pda/label/inventorylabel/by-code?code=" + code)
+}
+/**
+ * 获取消息列表
+ * @param {*} 
+ * 
+ */
+export function getMessageList(pageNo, pageSize) {
+  return http.get("/system/notify-message/my-page?pageNo=" + pageNo + "&pageSize=" + pageSize)
+}
+/**
+ * 标记站内信为已读
+ * @param {*} 
+ * 
+ */
+export function setMessageUpdateRead(ids) {
+  return http.put("/system/notify-message/update-read?ids=" + ids)
+}
+/**
+ * 标记所有站内信为已读
+ * @param {*} 
+ * 
+ */
+export function setAllMessageUpdateRead() {
+  return http.put("/system/notify-message/update-all-read")
+}
+/**
+ * 获取当前用户的未读站内信数量
+ * @param {*} 
+ * 
+ */
+export function getMessageUnreadCount() {
+  return http.get("/system/notify-message/get-unread-count")
+}
+
+
+/**
+ * 获取配置字典
+ * @param {*} 
+ * 
+ */
+export function getDictionaryItem(data) {
+  return http.post("/system/dict-type/getDictByTypes",data)
+}
+
+/**
+ * 查询 客户信息
+ * @param {*}   物品代码
+ * 
+ */
+export function getBasicCustomerList() {
+  return http.get("/wms/customer/list")
+}
+/**
+ * 根据业务代码查询业务类型
+ * @param {*}   Code
+ * 
+ */
+export function getBusinesstypeByCode(code) {
+	var params = {
+		code: code,
+		pageNo: 1,
+		pageSize: 100
+	}
+  return http.get("/wms/customer/list",{params})
+}
+/**
+ * 按物料代码查询库存明细
+ * @param {*} itemCode 
+ * 
+ */
+export function getBalanceByItemCode(params) {
+  return http.get("/wms/balance/page",{params})
+}
+/**
+ * 按物品查询预计入
+ * @param {*} itemCode 
+ * 
+ */
+
+export function getExpectinByItemcode(params) {
+  return http.get("/wms/expectin/page",{params})
+}
+/**
+ * 按物品查询预计出
+ * @param {*} itemCode 
+ * 
+ */
+
+export function getExpectoutByItemcode(params) {
+  return http.get("/wms/expectout/page",{params})
+}
+/**
+ *  按库位查询库存汇总
+ * @param {*} 
+ * 
+ */
+export function getBalanceByLocationcodeGroup(params) {
+  return http.get("/wms/balance/page",{params})
+}
+/**
+ * 按库位查询库存明细
+ * @param {*} 
+ */
+export function getBalanceByLocationcode(params) {
+  return http.get("/wms/balance/page",{params})
+}
+/**
+ * 查询器具信息接口
+ * @param {*} number  器具代码
+ */
+export function getContainerByNumber(number) {
+	var params = {
+		number: number,
+		pageNo: 1,
+		pageSize: 100
+	}
+  return http.get("/wms/container-main/page",{params})
+}
+
+/**
+ * 查询器具信息接口
+ * @param {*} number  器具代码
+ */
+export function getContainerDetailByNumber(number) {
+  return http.get("/wms/container-main/getContainerByNumber?number=" + number)
+}
+
+/**
+ * 按器具查询库存明细
+ * @param {*器具代码}  
+ * 
+ */
+export function getBalanceByContainerNumberGroup(number) {
+  return http.get("/wms/balance/page")
+}
+/**
+ * 按器具查询库存明细(无器具)
+ * @param {*器具代码} 
+ * 
+ */
+export function getBalanceByContainerNumber(params) {
+  return http.get("/wms/balance/page",{params})
+}
+/**标签
+ * 
+ * @param {*} header   version
+ *  获取标签设置信息
+ */
+export function getLabelByHeader(header, version) {
+	var params = {
+		header: header,
+		version: version,
+	}
+  return http.get("/wms/labeltype/getDetailsByHeader",{params})
+}
+/**包装
+ * 获取包装信息
+ * @param {*} 
+ *  
+ */
+export function getPackageByNumber(number) {
+	var params = {
+		number: number,
+		pageNo: 1,
+		pageSize: 100
+	}
+  return http.get("/wms/package/page",{params})
+}
+
+
+/**
+ * 查询库位信息接口
+ * @param {*} code  库位代码
+ * 
+ */
+export function getBasicLocationByCode(code) {
+	var parmas = {
+		code: code,
+		pageNo: 1,
+		pageSize: 100
+	}
+  return http.get("/wms/location/page",{params})
+}
+
+/**
+ * 校验库位物料关系
+ * @param {*} 
+ * 
+ */
+export function validateItemAndLocation(data) {
+  return http.post("/wms/location/validate",data)
+}
+
+/**
+ * 查询上架推荐库位
+ * @param {*} 
+ * supplierCode
+ * itemCode
+ * batch
+ * inventoryStatus
+ */
+
+
+export function getPutawayRecommendLocation(data) {
+  return http.post("/wms/location/recommendLocation",data)
+}
+
+/**
+ * 查询物品信息接口
+ * @param {*} code  物品代码
+ * 
+ */
+export function getBasicItemByCode(itemCode) {
+	var params = {
+		code: itemCode,
+		pageNo: 1,
+		pageSize: 100
+	}
+  return http.get("/wms/itembasic/page",{params})
+}
+/**
+ * 按物品查询库存汇总
+ * @param {*} itemCode 
+ * /wms/balance/summary
+ */
+export function getBalanceSummary(params) {
+  return http.get("/wms/balance/summary",{params})
+}
+/**
+ * 查询包装信息接口
+ * @param {*} itemCode  物品代码
+ * 
+ */
+export function getItempackagingByItemcode(itemCode) {
+  return http.get("/wms/itempackaging/page?itemCode=" + itemCode)
+}
+/**
+ * 查询生产线物料关系
+ * @param {*} productionLineCode  生产线code
+ * 
+ */
+export function getProductionlineItem(params) {
+  return http.get("/wms/productionlineitem/page" , {params})
+}
+/**
+ * 查询生产线-车间-工位
+ * @param {*}   
+ * 
+ */
+export function getWorkShopLineStation() {
+  return http.get("/wms/issue-request-main/get-workshop-productionline-workstation" )
+}
+/**
+ * 查询客户物品
+ */
+
+export function getCustomerItemList(params) {
+  return http.post("/wms/customeritem/senior",params)
+}
+
+/**
+ * 供应商发货
+ * 
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*}  
+ */
+export function getSupplierDeliverRecordList(params) {
+  return http.post("/wms/supplierdeliver-record-main/senior",params)
+}
+/**
+ * 供应商发货 详情
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ *  @param {*}  
+ */
+export function getSupplierDeliverRecordDetail(id) {
+  return http.get("/wms/supplierdeliver-record-main/getSupplierdeliverRecordById?id=" + id)
+}
+
+/**
+ * 报检单查询 = request_inspect
+ * 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*} 
+ */
+export function getInspectRequestList(params) {
+  return http.post("/wms/inspect-request-main/senior",params)
+}
+/**
+ * 检验单查询 详情 
+ * 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*}  
+ */
+export function getInspectRequestDetail(id) {
+  return http.get("/wms/inspect-request-main/getInspectRequestById?id=" + id)
+}
+/**
+ * 检验单申请 关闭任务
+ * @param {*} params 
+ */
+export function inspectRequestClose(id) {
+  return http.put("/wms/inspect-request-main/close?id=" + id)
+}
+/**
+ * 检验单申请 提交审批
+ * @param {*} params 
+ */
+export function inspectRequestApprove(id) {
+  return http.put("/wms/inspect-request-main/submit?id=" + id)
+}
+/**
+ * 检验单申请 提交审批通过
+ * @param {*} params 
+ */
+
+export function inspectRequestApproveAgree(id) {
+  return http.put("/wms/inspect-request-main/agree?id=" + id)
+}
+/**
+ * 检验单申请 审批驳回
+ * @param {*} params 
+ */
+export function inspectRequestApproveRefused(id) {
+  return http.put("/wms/inspect-request-main/refused?id=" + id)
+}
+/**
+ * 检验单申请 处理
+ * @param {*} params 
+ */
+export function inspectRequestHandle(id) {
+  return http.put("/wms/inspect-request-main/handle?id=" + id)
+}
+/**
+ * 检验单申请 重新添加
+ * @param {*} params 
+ */
+export function inspectRequestAddAgain(id) {
+  return http.put("/wms/inspect-request-main/reAdd?id=" + id)
+}
+/**
+ * 采购收货 任务
+ * status 任务状态 
+ *  开始日期 
+ *  结束日期
+ * 获取日期任务列表
+ *   @param {*}  
+ */
+export function getPurchaseReceiptJobList(params) {
+  return http.post("/wms/purchasereceipt-job-main/senior" ,params)
+}
+/**
+ * 采购收货 任务承接
+ * @param {*} id
+ * 
+ */
+export function takePurchaseReceiptJob(id) {
+  return http.put("/wms/purchasereceipt-job-main/accept?id=" + id)
+}
+/**
+ * 采购收货 放弃承接
+ * @param {*} id
+ * 
+ */
+export function cancleTakePurchaseReceiptJob(id) {
+  return http.put("/wms/purchasereceipt-job-main/abandon?id=" + id)
+}
+/**
+ * 采购收货 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+export function getPurchaseReceiptJobDetail(id) {
+  return http.get("/wms/purchasereceipt-job-main/getPurchasereceiptJobyId?id=" + id)
+}
+/**
+ * 采购收货 任务提交
+ * @param {*}  任务id
+ *
+ */
+export function purchaseReceiptJobSubmit(params) {
+  return http.put("/wms/purchasereceipt-job-main/execute" ,params)
+}
+
+/**
+ * 采购退货 
+ * status 任务状态 
+ *  开始日期 
+ *  结束日期
+ * 获取日期任务列表
+ *  获取任务明细
+ */
+export function getPurchaseReturnJobList(params) {
+  return http.post("/wms/purchasereturn-job-main/senior" ,params)
+}
+/**
+ * 采购退货 获取任务明细
+ * @param {*}  id 任务id
+ * 
+ */
+
+export function getPurchasereturnJobDetail(id) {
+  return http.get("/wms/purchasereturn-job-main/getReturnJobById?id=" + id)
+}
+/**
+ * 采购退货 承接任务
+ * @param {*} id
+ * 
+ */
+export function takePurchasereturnJob(id) {
+  return http.put("/wms/purchasereturn-job-main/accept?id=" + id)
+}
+/**
+ * 采购退货 放弃承接
+ * @param {*} id
+ * 
+ */
+export function cancleTakePurchasereturnJob(id) {
+  return http.put("/wms/purchasereturn-job-main/abandon?id=" + id)
+}
+/**
+ * 采购退货  任务提交
+ * @param {*} params 
+ */
+export function purchaseReturnJobsubmit(params) {
+  return http.put("/wms/purchasereturn-job-main/execute" ,params)
+}
+/**
+ * 采购退货 申请列表
+ * 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ *   @param {*} 
+ */
+export function getPurchaseReturnRequestList(params) {
+  return http.post("/wms/purchasereturn-request-main/senior" ,params)
+}
+/**
+ * 采购退货 获取申请任务明细
+ * @param {*}  id 任务id
+ * 
+ */
+export function getPurchaseReturnRequestDetail(id) {
+  return http.get("/wms/purchasereturn-request-main/getPurchasereturnRequestById?id=" + id)
+}
+/**
+ * 采购退货申请 关闭任务
+ * @param {*} params 
+ */
+export function purchaseReturnRequestClose(id) {
+  return http.put("/wms/purchasereturn-request-main/close?id=" + id)
+}
+/**
+ * 采购退货申请 提交审批
+ * @param {*} params 
+ */
+export function purchaseReturnRequestApprove(id) {
+  return http.put("/wms/purchasereturn-request-main/submit?id=" + id)
+}
+/**
+ * 采购退货申请 提交审批通过
+ * @param {*} params 
+ */
+export function purchaseReturnRequestApproveAgree(id) {
+  return http.put("/wms/purchasereturn-request-main/agree?id=" + id)
+}
+/**
+ * 采购退货申请 审批驳回
+ * @param {*} params 
+ */
+export function purchaseReturnRequestApproveRefused(id) {
+  return http.put("/wms/purchasereturn-request-main/refused?id=" + id)
+}
+/**
+ * 采购退货申请 处理
+ * @param {*} params 
+ */
+export function purchaseReturnRequestHandle(id) {
+  return http.put("/wms/purchasereturn-request-main/handle?id=" + id)
+}
+/**
+ * 采购退货申请 重新添加
+ * @param {*} params 
+ */
+export function purchaseReturnRequestAddAgain(id) {
+  return http.put("/wms/purchasereturn-request-main/reAdd?id=" + id)
+}
+
+
+/**
+ * 采购退货申请 提交
+ * @param {*} params 
+ */
+export function purchaseReturnRequestCreate(params) {
+  return http.post("/wms/purchasereturn-request-main/create" ,params)
+}
+
+/**
+ * 采购退货 记录提交
+ * @param {*} params 
+ */
+export function purchaseReturnRecordSubmit(params) {
+  return http.post("/wms/purchasereturn-record-main/create" ,params)
+}
+
+
+/**
+ * 到货检验 任务
+ * 
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*}  
+ */
+export function getInspectJobList(params) {
+  return http.post("/wms/inspect-job-main/senior" ,params)
+}
+/**
+ * 到货检验 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+export function getInspectJobDetail(id) {
+  return http.get("/wms/inspect-job-main/getInspectJobById?id=" + id)
+}
+/**
+ * 到货检验 任务承接
+ * @param {*} id
+ * 
+ */
+export function takeInspectJob(id) {
+  return http.put("/wms/inspect-job-main/accept?id=" + id)
+}
+/**
+ * 到货检验 放弃承接
+ * @param {*} id
+ * 
+ */
+
+export function cancleTakeInspectJob(id) {
+  return http.put("/wms/inspect-job-main/abandon?id=" + id)
+}
+/**
+ * 到货检验 任务提交
+ * @param {*}  任务id
+ *
+ */
+export function inspectJobSubmit(params) {
+  return http.put("/wms/inspect-job-main/execute",params)
+}
+//根据检验记录单号创建上架申请
+export function createPutAwayRequest(number) {
+  return http.post("/wms/inspect-record-main/createPutAwayRequest?number=" + number)
+}
+ 
+/**
+ * 采购上架 任务
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*}  
+ */
+export function getPutawayJobList(params) {
+  return http.post("/wms/putaway-job-main/senior" ,params)
+}
+/**
+ * 采购上架 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+export function getPutawayJobDetail(id) {
+  return http.get("/wms/putaway-job-main/getPutawayJobById?id=" + id)
+}
+/**
+ * 采购上架 承接任务
+ * @param {*} id
+ * 
+ */
+export function takePutawayJob(id) {
+  return http.put("/wms/putaway-job-main/accept?id=" + id)
+}
+/**
+ * 采购上架 放弃承接
+ * @param {*} id
+ * 
+ */
+export function cancleTakePutawayJob(id) {
+  return http.put("/wms/putaway-job-main/abandon?id=" + id)
+}
+/**
+ * 采购上架 任务提交
+ * @param {*} params 
+ */
+export function putawayJobSubmit(params) {
+  return http.put("/wms/putaway-job-main/execute" + params)
+}
+/**
+ * 采购上架申请 获取任务列表
+ * 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*}  
+ */
+export function getPutawayRequestList(params) {
+  return http.post("/wms/putaway-request-main/senior" + params)
+}
+/**
+ * 采购上架申请 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+export function getPutawayRequestDetail(id) {
+  return http.get("/wms/putaway-request-main/getPutawayRequestById?id=" + id)
+}
+/**
+ * 采购上架申请 提交
+ * @param {*} params 
+ */
+export function putawayRequestSubmit(params) {
+  return http.post("/wms/putaway-request-main/create",params)
+}
+/**
+ * 采购上架申请 关闭任务
+ * @param {*} params 
+ */
+export function putawayRequestClose(id) {
+  return http.put("/wms/putaway-request-main/close?id=" + id)
+}
+/**
+ * 采购上架申请 提交审批
+ * @param {*} params 
+ */
+export function putawayRequestApprove(id) {
+  return http.put("/wms/putaway-request-main/submit?id=" + id)
+}
+/**
+ * 采购上架申请 提交审批通过
+ * @param {*} params 
+ */
+export function putawayRequestApproveAgree(id) {
+  return http.put("/wms/putaway-request-main/agree?id=" + id)
+}
+/**
+ * 采购上架申请 审批驳回
+ * @param {*} params 
+ */
+export function putawayRequestApproveRefused(id) {
+  return http.put("/wms/putaway-request-main/refused?id=" + id)
+}
+/**
+ * 采购上架申请 处理
+ * @param {*} params 
+ */
+export function putawayRequestHandle(id) {
+  return http.put("/wms/putaway-request-main/handle?id=" + id)
+}
+/**
+ * 采购上架申请 重新添加
+ * @param {*} params 
+ */
+export function putawayRequestAddAgain(id) {
+  return http.put("/wms/putaway-request-main/reAdd?id=" + id)
+}
+
+
+/**
+ * 采购上架记录 提交
+ * @param {*} params 
+ */
+export function putawayRecordSubmit(params) {
+  return http.post("/wms/putaway-record-main/create",params)
+}
+/**
+ * 发料任务 列表
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*}  
+ */
+export function getIssueJobList(params) {
+  return http.post("/wms/issue-job-main/senior",params)
+}
+/**
+ * 发料任务明细
+ * @param {*} 任务id
+ * 
+ */
+export function getIssueJobDetail(id) {
+  return http.get( "/wms/issue-job-main/getIssueJobById?id=" + id)
+}
+
+/**
+ * 获取推荐明细接口
+ * @param {*} 任务id
+ * /wms/issue-request-main
+ */
+export function getBalanceByBatchOffShelf(itemCode, qty) {
+  return http.get("/wms/issue-request-main/getBalanceByBatchOffShelf?itemCode=" + itemCode + "&&qty=" + qty)
+}
+
+/**
+ * 发料 任务承接
+ * @param {*} id
+ * 
+ */
+export function takeIssueJob(id) {
+  return http.put("/wms/issue-job-main/accept?id=" + id)
+}
+
+/**
+ * 发料 放弃承接
+ * @param {*} id
+ * 
+ */
+export function cancleTakeIssueJob(id) {
+  return http.put("/wms/issue-job-main/abandon?id=" + id)
+}
+/**
+ * 发料任务 提交
+ * @param {*} params 
+ */
+export function issueJobSubmit(params) {
+  return http.put("/wms/issue-job-main/execute",params)
+}
+
+/**
+ * 生产收料 任务列表
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*}
+ */
+export function getProductionReceiptJobList(params) {
+  return http.post("/wms/productionreceipt-job-main/senior",params)
+}
+/**
+ * 生产收料 获取任务明细
+ * @param {*}  id 任务id
+ * 
+ */
+export function getProductionReceiptJobDetail(id) {
+  return http.get( "/wms/productionreceipt-job-main/getProductionreceiptJobById?id=" + id)
+}
+/**
+ * 生产收料 任务承接
+ * @param {*} id
+ * 
+ */
+export function takeProductionReceiptJob(id) {
+  return http.put( "/wms/productionreceipt-job-main/accept?id=" + id)
+}
+/**
+ * 生产收料 放弃承接
+ * @param {*} id
+ * 
+ */
+export function cancleTakeProductionReceiptJob(id) {
+  return http.put( "/wms/productionreceipt-job-main/abandon?id=" + id)
+}
+
+/**
+ * 生产收料任务 提交
+ * @param {*} params 
+ */
+export function productionReceiptJobSubmit(params) {
+  return http.put( "/wms/productionreceipt-job-main/execute",params)
+}
+/**
+ * 生产收料记录 提交
+ * @param {*} params 
+ */
+export function productionReceiptRecordSubmit(params) {
+  return http.post( "/wms/productreceipt-record-main/create",params)
+}
+
+
+/**
+ * 库存转移 任务
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*} 
+ */
+export function getInventoryMoveJobList(params) {
+  return http.post( "/wms/inventorymove-job-main/senior",params)
+}
+/**
+ * 库存转移  获取任务明细
+ * @param {*}   id 任务id
+ *  
+ */
+
+export function getInventoryMoveJobDetail(id) {
+  return http.get("/wms/inventorymove-job-main/getInventorymoveJobById?id=" + id)
+}
+/**
+ * 库存转移任务 任务承接
+ * @param {*} id
+ * 
+ */
+export function takeInventoryMoveJob(id) {
+  return http.put("/wms/inventorymove-job-main/accept?id=" + id)
+}
+/**
+ * 库存转移任务 放弃承接
+ * @param {*} id
+ * 
+ */
+export function cancleTakeInventoryMoveJob(id) {
+  return http.put("/wms/inventorymove-job-main/abandon?id=" + id)
+}
+
+/**
+ * 库存转移 任务提交
+ * @param {*}  任务id
+ *
+ */
+export function inventoryMoveSubmit(params) {
+  return http.put("/wms/inventorymove-job-main/execute" ,params)
+}
+/**
+ * 库存转移记录 提交
+ * @param {*}  任务id
+ *
+ */
+export function inventoryMoveRecordSubmit(params) {
+  return http.post("/wms/inventorymove-record-main/create" ,params)
+}
+/**
+ * 盘点 任务
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*}  
+ */
+export function getCountJobList(params) {
+  return http.post("/wms/count-job-main/senior" ,params)
+}
+/**
+ * 盘点 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+export function getCountJobDetail(id) {
+  return http.get("/wms/count-job-main/getCountJobById?id=" + id)
+}
+/**
+ * 盘点任务 任务承接
+ * @param {*} id
+ * 
+ */
+export function takeCountJob(id) {
+  return http.put( "/wms/count-job-main/accept?id=" + id)
+}
+/**
+ * 盘点任务 放弃承接
+ * @param {*} id
+ * 
+ */
+export function cancleTakeCountJob(id) {
+  return http.put("/wms/count-job-main/abandon?id=" + id)
+}
+/**
+ * 盘点任务 提交
+ * @param {*}  任务id
+ *
+ */
+export function countJobSubmit(params) {
+  return http.put("/wms/count-job-main/execute", params)
+}
+/**
+ * 计划外入库 任务
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取任务列表
+ * @param {*}  
+ */
+export function getUnPlannedReceiptJobList(params) {
+  return http.post("/wms/unplannedreceipt-job-main/senior", params)
+}
+/**
+ * 计划外入库 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+export function getUnPlannedReceiptJobDetail(id) {
+  return http.get("/wms/unplannedreceipt-job-main/getUnplannedreceiptJobById?id=" + id)
+}
+
+/**
+ * 计划外入库任务 任务承接
+ * @param {*} id
+ * 
+ */
+export function takeUnPlannedReceiptJob(id) {
+  return http.put("/wms/unplannedreceipt-job-main/accept?id=" + id)
+}
+/**
+ * 计划外入库 放弃承接
+ * @param {*} id
+ * 
+ */
+export function cancleTakeUnPlannedReceiptJob(id) {
+  return http.put("/wms/unplannedreceipt-job-main/abandon?id=" + id)
+}
+/**
+ * 计划外入库任务 提交
+ * @param {*} params 
+ */
+export function unPlannedReceiptJobSubmit(params) {
+  return http.put("/wms/unplannedreceipt-job-main/execute",params)
+}
+/**
+ * 计划外入库申请 创建
+ * @param {*} params 
+ */
+export function unPlannedReceiptRequestCreate(params) {
+  return http.post("/wms/unplannedreceipt-request-main/create",params)
+}
+/**
+ * 计划外入库申请 提交审批
+ * @param {*} params 
+ */
+export function unPlannedReceiptRequestApprove(id) {
+  return http.put("/wms/unplannedreceipt-request-main/submit?id=" + id)
+}
+/**
+ * 计划外入库申请 关闭
+ * @param {*} params 
+ */
+export function unPlannedReceiptRequestClose(id) {
+  return http.put("/wms/unplannedreceipt-request-main/close?id=" + id)
+}
+/**
+ * 计划外入库申请 审批通过
+ * @param {*} params 
+ */
+export function unPlannedReceiptRequestApproveAgree(id) {
+  return http.put("/wms/unplannedreceipt-request-main/agree?id=" + id)
+}
+/**
+ * 计划外入库申请 审批驳回
+ * @param {*} params 
+ */
+export function unPlannedReceiptRequestApproveRefused(id) {
+  return http.put("/wms/unplannedreceipt-request-main/refused?id=" + id)
+}
+/**
+ * 计划外入库申请 处理
+ * @param {*} params 
+ */
+export function unPlannedReceiptRequestHandle(id) {
+  return http.put("/wms/unplannedreceipt-request-main/handle?id=" + id)
+}
+/**
+ * 计划外入库申请 重新添加
+ * @param {*} params 
+ */
+export function unPlannedReceiptRequestAddAgain(id) {
+  return http.put("/wms/unplannedreceipt-request-main/reAdd?id=" + id)
+}
+/**
+ * 计划外入库记录 提交
+ * @param {*} params 
+ */
+export function unPlannedReceiptRecordbSubmit(params) {
+  return http.post("/wms/unplannedreceipt-record-main/create",params)
+}
+/**
+ * 计划外出库 任务
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取任务列表
+ * @param {*} 
+ */
+export function getUnPlannedIssueJobList(params) {
+  return http.post("/wms/unplannedissue-job-main/senior",params)
+}
+/**
+ * 计划外出库 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+
+export function getUnPlannedIssueJobDetail(id) {
+  return http.get("/wms/unplannedissue-job-main/getUnplannedissueJobById?id=" + id)
+}
+/**
+ * 计划外出库任务 承接
+ * @param {*} id
+ * 
+ */
+export function takeUnPlannedIssueJob(id) {
+  return http.put("/wms/unplannedissue-job-main/accept?id=" + id)
+}
+/**
+ * 计划外出库任务 放弃承接
+ * @param {*} id
+ * 
+ */
+export function cancleTakeUnPlannedIssueJob(id) {
+  return http.put("/wms/unplannedissue-job-main/abandon?id=" + id)
+}
+/**
+ * 计划外出库任务 提交
+ * @param {*} params 
+ */
+
+export function unPlannedIssueJobSubmit(params) {
+  return http.put("/wms/unplannedissue-job-main/execute",params)
+}
+
+/**
+ * 计划外出库申请 提交
+ * @param {*} params 
+ */
+export function unPlannedIssueRequestCreate(params) {
+  return http.post("/wms/unplannedissue-request-main/create",params)
+}
+/**
+ * 计划外出库申请 提交审批
+ * @param {*} params 
+ */
+export function unPlannedIssueRequestApprove(id) {
+  return http.put( "/wms/unplannedissue-request-main/submit?id=" + id)
+}
+/**
+ * 计划外出库申请 关闭
+ * @param {*} params 
+ */
+export function unPlannedIssueRequestClose(id) {
+  return http.put( "/wms/unplannedissue-request-main/close?id=" + id)
+}
+/**
+ * 计划外出库申请 审批通过
+ * @param {*} params 
+ */
+export function unPlannedIssueRequestApproveAgree(id) {
+  return http.put( "/wms/unplannedissue-request-main/agree?id=" + id)
+}
+/**
+ * 计划外出库申请 审批驳回
+ * @param {*} params 
+ */
+export function unPlannedIssueRequestApproveRefused(id) {
+  return http.put( "/wms/unplannedissue-request-main/refused?id=" + id)
+}
+/**
+ * 计划外出库申请 处理
+ * @param {*} params 
+ */
+export function unPlannedIssueRequestHandle(id) {
+  return http.put("/wms/unplannedissue-request-main/handle?id=" + id)
+}
+/**
+ * 计划外出库申请 重新添加
+ * @param {*} params 
+ */
+
+export function unPlannedIssueRequestAddAgain(id) {
+  return http.put("/wms/unplannedissue-request-main/reAdd?id=" + id)
+}
+
+/**
+ * 计划外出库记录 提交
+ * @param {*} params 
+ */
+export function unPlannedIssueRecordSubmit(params) {
+  return http.post("/wms/unplannedissue-record-main/create",{params})
+}
+/**
+ * 制品收货 任务
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*} 
+ */
+export function getProductReceiptJobList(params) {
+  return http.post("/wms/productreceipt-job-main/senior",params)
+}
+/**
+ * 制品收货 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+export function getProductReceiptJobDetail(id) {
+  return http.get("/wms/productreceipt-job-main/getProductreceiptJobById?id=" + id)
+}
+/**
+ * 制品收货任务 承接
+ * @param {*} id
+ * 
+ */
+export function takeProductReceiptJob(id) {
+  return http.put("/wms/productreceipt-job-main/accept?id=" + id)
+}
+/**
+ * 制品收货任务 放弃承接
+ * @param {*} id
+ * 
+ */
+export function cancleTakeProductReceiptJob(id) {
+  return http.put("/wms/productreceipt-job-main/abandon?id=" + id)
+}
+/**
+ * 制品收货任务 提交
+ * @param {*} params 
+ */
+export function productReceiptJobsubmit(params) {
+  return http.put("/wms/productreceipt-job-main/execute",params)
+}
+/**
+ * 制品收货记录 提交
+ * @param {*} params 
+ */
+
+export function productReceiptRecordsubmit(params) {
+  return http.post("/wms/productreceipt-record-main/create",params)
+}
+
+
+/**
+ * 制品上架 任务
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*}  
+ */
+export function getProductPutawayJobList(params) {
+  return http.post("/wms/productputaway-job-main/senior",params)
+}
+
+/**
+ * 制品上架 获取任务明细
+ * @param {*}  id 任务id
+ * 
+ */
+export function getProductPutawayJobDetail(id) {
+  return http.get("/wms/productputaway-job-main/getProductputawayJobById?id=" + id)
+}
+/**
+ * 制品上架任务 承接
+ * @param {*} id
+ * 
+ */
+
+export function takeProductPutawayJob(id) {
+  return http.put("/wms/productputaway-job-main/accept?id=" + id)
+}
+/**
+ * 制品上架任务 放弃承接
+ * @param {*} id
+ * 
+ */
+
+export function cancleTakeProductPutawayJob(id) {
+  return http.put("/wms/productputaway-job-main/abandon?id=" + id)
+}
+
+/**
+ * 制品上架任务 提交
+ * @param {*}  任务id
+ *
+ */
+export function productPutawayJobSubmit(params) {
+  return http.put("/wms/productputaway-job-main/execute",params)
+}
+
+/**
+ * 制品上架记录 提交
+ * @param {*}  任务id
+ *
+ */
+
+export function productPutawayRecordSubmit(params) {
+  return http.put("/wms/productputaway-record-main/create",params)
+}
+
+/**
+ * 制品拆解 任务
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*} 
+ */
+
+export function getProductDismantleJobList(params) {
+  return http.post("/wms/productdismantle-job-main/senior",params)
+}
+/**
+ * 制品拆解 获取任务明细
+ * @param {*}   id 任务id
+ *  
+ */
+export function getProductDismantleJobDetail(id) {
+  return http.get("/wms/productdismantle-job-main/getProductdismantleJobById?id=" + id)
+}
+/**
+ * 制品拆解 任务承接
+ * @param {*} id
+ * 
+ */
+export function takeProductDismantleJob(id) {
+  return http.put("/wms/purchasereceipt-job-main/accept?id=" + id)
+}
+/**
+ * 制品拆解 放弃承接
+ * @param {*} id
+ * 
+ */
+export function cancleTakeProductDismantleJob(id) {
+  return http.put("/wms/purchasereceipt-job-main/abandon?id=" + id)
+}
+/**
+ * 制品拆解 任务提交
+ * @param {*}  任务id
+ *
+ */
+export function productDismantleJobSubmit() {
+  return http.put("/wms/purchasereceipt-job-main/abandon",{})
+}
+/**
+ * 制品拆解 任务提交
+ * @param {*}  任务id
+ *
+ */
+export function productDismantleRecordSubmit(params) {
+  return http.put("/wms/purchasereceipt-job-main/abandon",params)
+}
+/**
+ * 制品发货 任务
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*}  
+ */
+export function getDeliverJobList(params) {
+  return http.post("/wms/deliver-job-main/senior",params)
+}
+/**
+/**
+ * 制品发货 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+export function getDeliverDetail(id) {
+  return http.get("/wms/deliver-job-main/getDeliverJobById?id=" + id)
+}
+/**
+ * 制品发货任务 承接
+ * @param {*} id
+ * 
+ */
+export function takeDeliverJob(id) {
+  return http.put("/wms/deliver-job-main/accept?id=" + id)
+}
+/**
+ * 制品发货任务 放弃承接
+ * @param {*} id
+ * 
+ */
+export function cancleTakeDeliverJob(id) {
+  return http.put("/wms/deliver-job-main/abandon?id=" + id)
+}
+
+/**
+ * 制品发货 任务提交
+ * @param {*}  任务id
+ *
+ */
+
+export function deliverJobSubmit(params) {
+  return http.put("/wms/deliver-job-main/execute" ,params)
+}
+
+/**
+ * 制品发货申请
+ *  任务状态 
+ *  开始日期 
+ *  结束日期
+ * 获取日期任务列表
+ * @param {*} 
+ */
+export function getDeliverRequestList(params) {
+  return http.post("/wms/deliver-request-main/senior" ,params)
+}
+/**
+ * 制品发货申请 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+export function getDeliverRequestDetail(id) {
+  return http.get("/wms/deliver-request-main/getDeliverRequestById?id=" + id)
+}
+/**
+ * 制品发货申请 提交
+ * @param {*} params 
+ */
+export function deliverRequestSubmit(params) {
+  return http.post("/wms/deliver-request-main/create",params)
+}
+/**
+ * 制品发货申请 关闭任务
+ * @param {*} params 
+ */
+export function deliverRequestClose(id) {
+  return http.put("/wms/deliver-request-main/close?id=" + id)
+}
+/**
+ * 制品发货申请 提交审批
+ * @param {*} params 
+ */
+export function deliverRequestApprove(id) {
+  return http.put("/wms/deliver-request-main/submit?id=" + id)
+}
+/**
+ * 制品发货申请 提交审批通过
+ * @param {*} params 
+ */
+export function deliverRequestApproveAgree(id) {
+  return http.put("/wms/deliver-request-main/agree?id=" + id)
+}
+/**
+/**
+ * 制品发货申请 审批驳回
+ * @param {*} params 
+ */
+export function deliverRequestApproveRefused(id) {
+  return http.put("/wms/deliver-request-main/refused?id=" + id)
+}
+/**
+ * 制品发货申请 处理
+ * @param {*} params 
+ */
+
+export function deliverRequestHandle(id) {
+  return http.put("/wms/deliver-request-main/handle?id=" + id)
+}
+/**
+ * 制品发货申请 重新添加
+ * @param {*} params 
+ */
+export function deliverRequestAddAgain(id) {
+  return http.put("/wms/deliver-request-main/reAdd/reAdd?id=" + id)
+}
+/**
+ * 制品发货记录 提交
+ * @param {*} params 
+ */
+export function deliverRecordSubmit(params) {
+  return http.post("/wms/deliver-record-main/create",params)
+}
+/**
+ * 客户退货 任务
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*} 
+ */
+export function getCustomerReturnJobList(params) {
+  return http.post("/wms/customerreturn-job-main/senior",params)
+}
+/**
+ * 客户退货 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+export function getCustomerReturnJobDetail(id) {
+  return http.get("/wms/customerreturn-job-main/getCustomerreturnJobById?id="+id)
+}
+
+/**
+ * 客户退货任务 承接
+ * @param {*} id
+ * 
+ */
+export function takeCustomerReturnJob(id) {
+  return http.put("/wms/customerreturn-job-main/accept?id="+id)
+}
+/**
+ * 客户退货任务 放弃承接
+ * @param {*} id
+ * 
+ */
+
+export function cancleTakeCustomerReturnJob(id) {
+  return http.put("/wms/customerreturn-job-main/abandon?id="+id)
+}
+/**
+ * 客户退货任务 提交
+ * @param {*}  任务id
+ *
+ */
+export function customerReturnJobSubmit(params) {
+  return http.put("/wms/customerreturn-job-main/execute",params)
+}
+/**
+ * 客户退货申请
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*} 
+ */
+export function getCustomerReturnRequestList(params) {
+  return http.post("/wms/customerreturn-request-main/senior",params)
+}
+
+/**
+ * 客户退货申请 任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+
+export function getCustomerReturnRequestDetail(id) {
+  return http.get("/wms/customerreturn-request-main/getCustomerreturnRequestById?id=" + id)
+}
+
+/**
+ * 客户退货申请 提交
+ * @param {*} params 
+ */
+export function customerReturnRequestSubmit(params) {
+  return http.post("/wms/customerreturn-request-main/create",params)
+}
+/**
+ * 客户退货申请 关闭任务
+ * @param {*} params 
+ */
+export function customerReturnRequestClose(id) {
+  return http.put("/wms/customerreturn-request-main/close?id=" + id)
+}
+/**
+ * 客户退货申请 提交审批
+ * @param {*} params 
+ */
+
+export function customerReturnRequestApprove(id) {
+  return http.put("/wms/customerreturn-request-main/submit?id=" + id)
+}
+/**
+ * 客户退货申请 提交审批通过
+ * @param {*} params 
+ */
+export function customerReturnRequestApproveAgree(id) {
+  return http.put("/wms/customerreturn-request-main/agree?id=" + id)
+}
+/**
+ * 客户退货申请 审批驳回
+ * @param {*} params 
+ */
+
+export function customerReturnRequestApproveRefused(id) {
+  return http.put("/wms/customerreturn-request-main/refused?id=" + id)
+}
+/**
+ * 客户退货申请 处理
+ * @param {*} params 
+ */
+export function customerReturnRequestHandle(id) {
+  return http.put("/wms/customerreturn-request-main/handle?id=" + id)
+}
+/**
+ * 客户退货申请 重新添加
+ * @param {*} params 
+ */
+export function customerReturnRequestAddAgain(id) {
+  return http.put("/wms/customerreturn-request-main/reAdd?id=" + id)
+}
+/**
+ * 客户退货 记录提交
+ * @param {*} params 
+ */
+
+export function customerReturnRecordSubmit(params) {
+  return http.put("/wms/customerreturn-record-main/create",params)
+}
+/**
+ * 调拨入库 任务
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*} 
+ */
+export function getTransferReceiptJobList(params) {
+  return http.post("/wms/transferreceipt-job-main/senior",params)
+}
+
+/**
+ * 调拨入库 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+export function getTransferReceiptJobDetail(id) {
+  return http.get("/wms/transferreceipt-job-main/getTransferreceiptJobById?id=" + id)
+}
+
+/**
+ * 调拨入库任务 承接
+ * @param {*} id
+ * 
+ */
+export function takeTransferReceiptJob(id) {
+  return http.put("/wms/transferreceipt-job-main/accept?id=" + id)
+}
+/**
+ * 调拨入库 放弃承接
+ * @param {*} id
+ * 
+ */
+
+export function cancleTakeTransferReceiptJob(id) {
+  return http.put("/wms/transferreceipt-job-main/abandon?id=" + id)
+}
+
+/**
+ * 调拨入库任务 提交
+ * @param {*}  任务id
+ *
+ */
+export function transferReceiptJobSubmit(params) {
+  return http.put("/wms/transferreceipt-job-main/execute",params)
+}
+/**
+ * 调拨入库记录 提交
+ * @param {*}  id
+ *
+ */
+
+export function transferReceiptRecordSubmit(params) {
+  return http.post("/wms/transferreceipt-record-main/create",params)
+}
+/**
+ * 调拨出库 任务列表
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*} 
+ */
+export function getTransferIssueJobList(params) {
+  return http.post("/wms/transferissue-job-main/senior",params)
+}
+/**
+ * 调拨出库 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+export function getTransferIssueJobDetail(id) {
+  return http.get("/wms/transferissue-job-main/getTransferissueJobById?id=" + id)
+}
+/**
+ * 调拨出库任务 承接
+ * @param {*} id
+ * 
+ */
+export function takeTransferIssueJob(id) {
+  return http.put("/wms/transferissue-job-main/accept?id=" + id)
+}
+/**
+ * 调拨出库任务 放弃承接
+ * @param {*} id
+ * 
+ */
+export function cancleTakeTransferIssueJob(id) {
+  return http.put("/wms/transferissue-job-main/abandon?id=" + id)
+}
+/**
+ * 调拨出库任务 提交
+ * @param {*}  任务id
+ *
+ */
+export function transferIssueJobSubmit(params) {
+  return http.put("/wms/transferissue-job-main/execute",params)
+}
+/**
+ * 调拨出库记录 提交
+ * @param {*}  
+ *
+ */
+export function transferIssueRecordSubmit(params) {
+  return http.post("/wms/transferissue-record-main/create",params)
+}
+
+/**
+ * 制品上架申请
+ * 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*}  
+ */
+
+export function getProductPutawayRequestList(params) {
+  return http.post("/wms/productputaway-request-main/senior",params)
+}
+/**
+ * 制品上架申请 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+
+export function getProductPutawayRequestDetail(id) {
+  return http.get("/wms/productputaway-request-main/getProductputawayRequestById?id=" + id)
+}
+/**
+ * 制品上架申请 提交
+ * @param {*} params 
+ */
+export function productPutawayRequestSubmit(params) {
+  return http.post("/wms/productputaway-request-main/create" ,params)
+}
+/**
+ * 制品上架申请 处理
+ * @param {*} params 
+ */
+export function productPutawayRequestHandle(id) {
+  return http.put("/wms/productputaway-request-main/handle?id=" + id)
+}
+/**
+ * 制品上架申请 重新添加
+ * @param {*} params 
+ */
+export function productPutawayRequestAddAgain(id) {
+  return http.put("/wms/productputaway-request-main/reAdd?id=" + id)
+}
+/**
+ * 制品上架申请 提交审批
+ * @param {*} params 
+ */
+export function productPutawayRequestApprove(id) {
+  return http.put("/wms/productputaway-request-main/submit?id=" + id)
+}
+/**
+ * 制品上架申请 提交审批通过
+ * @param {*} params 
+ */
+export function productPutawayRequestApproveAgree(id) {
+  return http.put("/wms/productputaway-request-main/agree?id=" + id)
+}
+/**
+ * 制品上架申请 审批驳回
+ * @param {*} params 
+ */
+export function productPutawayRequestApproveRefused(id) {
+  return http.put("/wms/productputaway-request-main/refused?id=" + id)
+}
+/**
+ * 制品上架申请 关闭任务
+ * @param {*} params 
+ */
+export function productPutawayRequestClose(id) {
+  return http.put("/wms/productputaway-request-main/close?id=" + id)
+}
+/**
+ * 发料申请列表
+ * @param {*} params 
+ */
+export function getIssueRequestList(params) {
+  return http.post("/wms/issue-request-main/senior",params)
+}
+/**
+ * 发料申请明细
+ * @param {*} id 
+ */
+export function getIssueRequestDetail(id) {
+  return http.get( "/wms/issue-request-main/getIssueRequestById?id=" + id)
+}
+/**
+ * 发料申请 提交
+ * @param {*} params 
+ */
+export function issueRequestSubmit(params) {
+  return http.post( "/wms/issue-request-main/create" ,params)
+}
+/**
+ * 发料申请 处理
+ * @param {*} params 
+ */
+export function issueRequestHandle(id) {
+  return http.put("/wms/issue-request-main/handle?id=" + id)
+}
+
+/**
+ * 发料申请 提交审批
+ * @param {*} params 
+ */
+export function issueRequestSubmitApprove(id) {
+  return http.put("/wms/issue-request-main/submit?id=" + id)
+}
+/**
+ * 发料申请 审批通过
+ * @param {*} params 
+ */
+export function issueRequestSubmitApproveAgree(id) {
+  return http.put("/wms/issue-request-main/agree?id=" + id)
+}
+/**
+ * 发料申请 审批驳回
+ * @param {*} params 
+ */
+export function issueRequestSubmitApproveRefused(id) {
+  return http.put("/wms/issue-request-main/refused?id=" + id)
+}
+/**
+ * 发料申请 申请关闭
+ * @param {*} params 
+ */
+export function issueRequestClose(id) {
+  return http.put("/wms/issue-request-main/close?id=" + id)
+}
+/**
+ * 发料申请 重新添加
+ * @param {*} params 
+ */
+export function issueRequestAddAgain(id) {
+  return http.put("/wms/issue-request-main/reAdd?id=" + id)
+}
+/**
+ * 发料记录 提交
+ * @param {*} params 
+ */
+
+export function issueRecordSubmit(params) {
+  return http.post("/wms/issue-record-main/create",params)
+}
+
+
+/**
+ * 生产退料 任务获取任务列表
+ * 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ * @param {*} 
+ */
+export function getProductionreturnJobList(params) {
+  return http.post("/wms/productionreturn-job-main/senior",params)
+}
+/**
+ * 生产退料任务 获取任务明细
+ * @param {*} id 任务id
+ * 
+ */
+export function getProductionReturnJobDetail(id) {
+  return http.get("/wms/productionreturn-job-main/getProductionreturnJobById?id=" + id)
+}
+
+/**
+ * 生产退料 承接任务
+ * @param {*} id
+ * 
+ */
+export function takeProductionReturnJob(id) {
+  return http.put("/wms/productionreturn-job-main/accept?id=" + id)
+}
+/**
+ * 生产退料 放弃承接
+ * @param {*} id
+ * 
+ */
+export function cancleTakeProductionReturnJob(id) {
+  return http.put("/wms/productionreturn-job-main/abandon?id=" + id)
+}
+/**
+ * 生产退料 任务提交
+ * @param {*}  任务id
+ *
+ */
+export function productionReturnJobSubmit(params) {
+  return http.put("/wms/productionreturn-job-main/execute",params)
+}
+/**
+ * 生产退料申请 获取任务列表
+ * status 任务状态 
+ * 开始日期 
+ * 结束日期
+ * 获取日期任务列表
+ *   @param {*} 
+ */
+export function getProductionReturnRequestList(params) {
+  return http.post("/wms/productionreturn-request-main/senior",params)
+}
+/**
+ * 生产退料申请 获取申请明细
+ * @param {*}    id
+ * 
+ */
+export function getProductionReturnRequestDetail(id) {
+  return http.get("/wms/productionreturn-request-main/getProductionreturnRequestById?id=" + id)
+}
+/**
+ * 生产退料申请 处理
+ * @param {*}    id
+ * 
+ */
+export function productionReturnRequestHandle(id) {
+  return http.put("/wms/productionreturn-request-main/handle?id=" + id)
+}
+/**
+ * 生产退料申请 提交审批
+ * @param {*}    id
+ * 
+ */
+export function productionReturnRequestSubmitApprove(id) {
+  return http.put("/wms/productionreturn-request-main/submit?id=" + id)
+}
+/**
+ * 生产退料申请 审批通过
+ * @param {*}    id
+ * 
+ */
+export function productionReturnRequestSubmitApproveAgree(id) {
+  return http.put("/wms/productionreturn-request-main/agree?id=" + id)
+}
+/**
+ * 生产退料申请 审批驳回
+ * @param {*}    id
+ * 
+ */
+export function productionReturnRequestSubmitApproveRefused(id) {
+  return http.put("/wms/productionreturn-request-main/refused?id=" + id)
+}
+/**
+ * 生产退料申请 关闭
+ * @param {*}    id
+ * 
+ */
+
+export function productionReturnRequestClose(id) {
+  return http.put("/wms/productionreturn-request-main/close?id=" + id)
+}
+/**
+ * 生产退料申请 重新添加
+ * @param {*}    id
+ * 
+ */
+
+export function productionReturnRequestAddAgain(id) {
+  return http.put("/wms/productionreturn-request-main/reAdd?id=" + id)
+}
+
+/**
+ * 生产退料申请 创建
+ * @param {*} params 
+ */
+
+
+export function productionReturnRequestCreate(params) {
+  return http.put("/wms/productionreturn-request-main/create",params)
+}
+/**
+ * 生产退料记录 提交
+ * @param {*} params 
+ */
+export function productionReturnRecordSubmit(params) {
+  return http.post("/wms/productionreturn-record-main/create",params)
+}
+
+/**
+ * 计划外出库申请
+ *  任务状态 
+ *  开始日期 
+ *  结束日期
+ * 获取任务列表
+ *  @param {*}  
+ */
+export function getUnPlannedIssueRequestList(params) {
+	return request({
+		url: baseApi + "/wms/unplannedissue-request-main/senior",
+		method: "post",
+		data: params,
+	});
+}
+
+/**
+ * 计划外出库申请 获取明细
+ * @param {*}   id 任务id
+ * 
+ */
+export function getUnPlannedIssueRequestDetail(id) {
+  return http.get("/wms/unplannedissue-request-main/getUnplannedissueRequestById?id=" + id)
+}
+/**
+ * 计划外入库 申请
+ * status 任务状态 
+ *  开始日期 
+ *  结束日期
+ * 获取任务列表
+ *   @param {*} 
+ */
+export function getUnPlannedReceiptRequestList(params) {
+  return http.post("/wms/unplannedreceipt-request-main/senior",params)
+}
+/**
+ * 计划外入库申请 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+export function getUnPlannedReceiptRequestDetail(id) {
+  return http.get("/wms/unplannedreceipt-request-main/getUnplannedreceiptRequestById?id=" + id)
+}
+/**
+ * 计划外入库 申请提交
+ * @param {*} params 
+ */
+export function unPlannedReceiptRequestSubmit(params) {
+  return http.put("/wms/purchasereturn-request-main/submit",params)
+}
+
+
+/**
+ * 报废出库任务 
+ * status 任务状态 
+ *  开始日期 
+ *  结束日期
+ * 获取日期任务列表
+ * @param {*}  
+ */
+export function getScrapJobList(params) {
+  return http.post("/wms/scrap-job-main/senior",params)
+}
+
+/** 报废出库 获取任务明细
+ * @param {*}   id 任务id
+ */
+export function getScrapJobDetail(id) {
+  return http.get("/wms/scrap-job-main/getScrapJobById?id=" + id)
+}
+/**
+ * 报废出库 任务承接
+ * @param {*} id
+ * 
+ */
+export function takeScrapJob(id) {
+  return http.put("/wms/scrap-job-main/accept?id=" + id)
+}
+/**
+ * 报废出库 放弃承接
+ * @param {*} id
+ * 
+ */
+export function cancleTakeScrapJob(id) {
+  return http.put("/wms/scrap-job-main/abandon?id=" + id)
+}
+/**
+ * 报废出库 任务提交
+ * @param {*}  任务id
+ *
+ */
+export function scrapJobSubmit(params) {
+  return http.put("/wms/scrap-job-main/execute" ,params)
+}
+/**
+ * 报废出库 申请
+ * status 任务状态 
+ *  开始日期 
+ *  结束日期
+ * 获取任务列表
+ *  @param {*}  
+ */
+export function getScrapRequestList(params) {
+  return http.post("/wms/scrap-request-main/senior" ,params)
+}
+/**
+ * 报废出库申请 获取申请明细
+ * @param {*}   id 任务id
+ * 
+ */
+export function getScrapRequestDetail(id) {
+  return http.get("/wms/scrap-request-main/getScrapRequestById?id=" + id)
+}
+/**
+ * 报废出库申请 创建
+ * @param {*} params 
+ */
+export function scrapRequestCreate(params) {
+  return http.post("/wms/scrap-request-main/create",params)
+}
+/**
+ * 报废出库申请 提交审批
+ * @param {*} params 
+ */
+export function scrapRequestApprove(id) {
+  return http.put("/wms/scrap-request-main/submit?id=" + id)
+}
+/**
+ * 报废出库申请 关闭
+ * @param {*} params 
+ */
+export function scrapRequestClose(id) {
+  return http.put("/wms/scrap-request-main/close?id=" + id)
+}
+/**
+ * 报废出库申请 审批通过
+ * @param {*} params 
+ */
+export function scrapRequestApproveAgree(id) {
+  return http.put("/wms/scrap-request-main/agree?id=" + id)
+}
+/**
+ * 报废出库申请 审批驳回
+ * @param {*} params 
+ */
+
+export function scrapRequestApproveRefused(id) {
+  return http.put("/wms/scrap-request-main/refused?id=" + id)
+}
+/**
+ * 报废出库申请 审批驳回
+ * @param {*} params 
+ */
+export function scrapRequestHandle(id) {
+  return http.put("/wms/scrap-request-main/handle?id=" + id)
+}
+/**
+ * 报废出库申请 重新添加
+ * @param {*} params 
+ */
+
+export function scrapRequestAddAgain(id) {
+  return http.put("/wms/scrap-request-main/reAdd?id=" + id)
+}
+/**
+ * 报废出库记录 提交
+ * @param {*} params 
+ */
+export function scrapRecordSubmit(params) {
+  return http.post("/wms/scrap-record-main/create",params)
+}
+
+
+/**
+ * 补料任务 列表
+ * 
+ * status 任务状态 
+ *  开始日期 
+ *  结束日期
+ * 获取日期任务列表
+ * @param {*}  
+ */
+export function getRepleinshJobList(params) {
+  return http.post("/wms/repleinsh-job-main/senior",params)
+}
+
+/**
+ * 补料任务 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+
+export function getRepleinshJobDetail(id) {
+  return http.get("/wms/repleinsh-job-main/getRepleinshJobById?id=" + id)
+}
+
+/**
+ * 补料 任务承接
+ * @param {*} id
+ * 
+ */
+
+export function takeRepleinshJob(id) {
+  return http.put("/wms/repleinsh-job-main/accept?id=" + id)
+}
+/**
+ * 补料任务 放弃承接
+ * @param {*} id
+ * 
+ */
+export function cancleTakeRepleinshJob(id) {
+  return http.put("/wms/repleinsh-job-main/abandon?id=" + id)
+}
+/**
+ * 补料任务 提交
+ * @param {*} params 
+ */
+
+export function repleinshJobSubmit(params) {
+  return http.put("/wms/repleinsh-job-main/execute" ,params)
+}
+/**
+ * 补料申请 提交
+ * @param {*} params 
+ */
+
+export function repleinshRequestSubmit(params) {
+  return http.put("/magic-api/pda/job/putaway/jobSubmit" ,params)
+}
+/**
+ * 补料记录 提交
+ * @param {*} params 
+ */
+export function repleinshRecordSubmit(params) {
+  return http.post("/wms/repleinsh-record-main/create" ,params)
+}
+/**
+ * 器具绑定 提交
+ * @param {*} params 
+ */
+export function containerBindRecordSubmit(params) {
+  return http.post("/wms/container-main/containerBind" ,params)
+}
+/**
+ * 器具解绑 提交
+ * @param {*} params 
+ */
+export function containerUnBindRecordSubmit(params) {
+  return http.post("/wms/container-main/containerUnBind" ,params)
+}
+/**
+ * 拆包 提交
+ * @param {*} params 
+ */
+export function splitPackageRecordSubmit(params) {
+  return http.post("/wms/packagesplit-main/create" ,params)
+}
+/**
+ * 合包 提交
+ * @param {*} params 
+ */
+export function mergePackageRecordSubmit(params) {
+  return http.post("/wms/packagemerge-main/create" ,params)
+}
+/**
+ * 翻包 提交
+ * @param {*} params 
+ */
+
+export function overPackageRecordSubmit(params) {
+  return http.post("/wms/packageover-main/createe" ,params)
+}
+
+/**
+ * "itemCodes": [],
+    "locationCode":"INSPECT"
+	管理精度策略
+ * @param {*} 
+ *  
+ */
+export function getManagementPrecision(params) {
+  return http.post("/wms/rule/getPrecisionStrategyByItemCodes" ,params)
+}
+
+/**
+ * 查询库存通过多种条件 高级筛选
+ * @param {*} 
+ * 
+ */
+
+export function getBalanceByFilter(params) {
+  return http.post("/wms/balance/senior" ,params)
+}
+/**
+ * 查询管理精度，多个物料，多个库位
+ * @param {*} 
+ * 
+ */
+
+export function getPrecisionStrategy(params) {
+  return http.post("/wms/rule/getPrecisionStrategy" ,params)
+}
+/**
+ * 删除文件
+ * @param {*} 
+ * 
+ */
+export function deleteFileById(id) {
+  return http.delete("/infra/file/delete?id=" + id)
+}
+/**
+ * 删除文件(多个文件)
+ * @param {*} 
+ * 
+ */
+
+export function deleteFileByTable(tableName, tableId) {
+  return http.delete("/infra/file/deleteByTable?tableName=" + tableName + "&tableId=" + tableId)
+}
+
+/**
+ * 获取文件列表 
+ * @param {*} 
+ * 
+ */
+export function getFileList(tableName, tableId) {
+  return http.get("/infra/file/list?tableName=" + tableName + "&tableId=" + tableId)
+}
+
+/**
+ * 图片上传
+ * @param {*} 
+ * 
+ */
+
+export function uploadFile(tableName, tableId, filePath, callBack) {
+ var token = storage.getStorage(storage.constant.token)
+ var url = config.request_url + baseApi
+ uni.uploadFile({
+ 	url: url + "/infra/file/upload?tableName=" + tableName + "&tableId=" + tableId,
+ 	filePath: filePath,
+ 	name: 'file',
+ 	header: {
+ 		"Authorization": "Bearer " + token,
+ 		"tenant-id": 1
+ 	},
+ 	success: (uploadFileRes) => {
+ 		callBack(uploadFileRes.data)
+ 		console.log(uploadFileRes.data);
+ 	},
+ 	fail: (error) => {
+ 		callBack(undefined)
+ 	},
+ });
+}
+/**
+ * 获取文件列表 
+ * @param {*} 
+ * 
+ */
+export function getMainMessage() {
+  return http.get("/wms/index/indexPda")
+}
+/**
+ * app检查更新 
+ * @param {*} 
+ * 
+ */
+export function appCheckUpdate() {
+  return http.get("http://192.168.0.119:9527/appUpdate.json")
+}
diff --git a/common/appUpdate.js b/common/appUpdate.js
new file mode 100644
index 0000000..03af4c3
--- /dev/null
+++ b/common/appUpdate.js
@@ -0,0 +1,116 @@
+import {
+	appCheckUpdate
+} from '../api/request2.js';
+export function appUpdate() {
+	let curversion = 0;
+	plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
+		const data = {
+			action: 'checkVersion',
+			appid: plus.runtime.appid,
+			appVersion: plus.runtime.version,
+			wgtVersion: widgetInfo.version,
+			versionCode: widgetInfo.versionCode
+		}
+		curversion=data.versionCode
+	appCheckUpdate().then(res => {
+		console.log("当前版本提示",curversion)
+		if (res.data) {
+			if (res.data.versionCode > Number(curversion)) {
+				var downUrl = res.data.downUrl;
+				var content = res.data.content;
+				var version =res.data.version
+				console.log("新版本提示")
+				uni.showModal({
+					title: "发现新版本:("+version+")",
+					content: content,
+					confirmText: "更新",
+					cancelText: "取消",
+					success: (res) => {
+						if (res.confirm) {
+							confirm(downUrl);
+							console.log('comfirm') //点击确定之后执行的代码
+						} else {
+							console.log('cancel') //点击取消之后执行的代码
+						}
+					}
+				})
+			} else {
+				uni.showToast({
+					title:"当前是最新版本"
+				})
+				console.log("没有新版本")
+			}
+		}
+	}).catch(error => {
+		console.log("版本错误", error)
+	})
+	
+	})
+	
+	
+
+}
+
+export function confirm(downUrl) {
+	var downloadApkUrl = downUrl
+	var dtask = plus.downloader.createDownload(downloadApkUrl, {},
+		function(d, status) {
+
+			// 下载完成  
+			if (status == 200) {
+
+				plus.runtime.install(plus.io.convertLocalFileSystemURL(
+					d.filename), {}, {}, function(error) {
+					uni.showToast({
+						title: '安装失败',
+						duration: 1500
+					});
+				})
+			} else {
+				uni.showToast({
+					title: '更新失败',
+					duration: 1500
+				});
+			}
+		});
+	try {
+		dtask.start(); // 开启下载的任务
+		var prg = 0;
+		var showLoading = plus.nativeUI.showWaiting(
+			"正在下载"); //创建一个showWaiting对象 
+		dtask.addEventListener('statechanged', function(
+			task,
+			status
+		) {
+			// 给下载任务设置一个监听 并根据状态  做操作
+			switch (task.state) {
+				case 1:
+					showLoading.setTitle("正在下载");
+					break;
+				case 2:
+					showLoading.setTitle("已连接到服务器");
+					break;
+				case 3:
+					prg = parseInt(
+						(parseFloat(task.downloadedSize) /
+							parseFloat(task.totalSize)) *
+						100
+					);
+					showLoading.setTitle("  正在下载" + prg + "%  ");
+					break;
+				case 4:
+					plus.nativeUI.closeWaiting();
+					//下载完成
+					break;
+			}
+		});
+	} catch (err) {
+		plus.nativeUI.closeWaiting();
+		uni.showToast({
+			title: '更新失败-03',
+			mask: false,
+			duration: 1500
+		});
+	}
+
+}
\ No newline at end of file
diff --git a/common/array.js b/common/array.js
new file mode 100644
index 0000000..e87d780
--- /dev/null
+++ b/common/array.js
@@ -0,0 +1,320 @@
+// 详情和审批
+export function getDetailAndApproveOption() {
+	let option_detail = [{
+			text: '详情',
+			style: {
+				backgroundColor: '#3C9CFF'
+			}
+		},
+		{
+			text: '提交\n审批',
+			style: {
+				backgroundColor: '#00CC33'
+			}
+		},
+		{
+			text: '关闭',
+			style: {
+				backgroundColor: '#ff0000'
+			}
+		}
+	];
+	return option_detail;
+}
+//详情、审批通过、审批驳回
+export function getDetailAndApprovePassAndApproveNoOption() {
+	let option_detail = [{
+			text: '详情',
+			style: {
+				backgroundColor: '#3C9CFF'
+			}
+		},
+		{
+			text: '审批\n通过',
+			style: {
+				backgroundColor: '#00CC33'
+			}
+		},
+		{
+			text: '审批\n驳回',
+			style: {
+				backgroundColor: '#F56C6C'
+			}
+		},
+		{
+			text: '关闭',
+			style: {
+				backgroundColor: '#ff0000'
+			}
+		}
+	];
+	return option_detail;
+}
+//详情、处理、审批不通过
+export function getDetailAndHandleOption() {
+	let option_detail = [{
+			text: '详情',
+			style: {
+				backgroundColor: '#3C9CFF'
+			}
+		},
+		{
+			text: '处理',
+			style: {
+				backgroundColor: '#00CC33'
+			}
+		},
+		{
+			text: '关闭',
+			style: {
+				backgroundColor: '#ff0000'
+			}
+		}
+	];
+	return option_detail;
+}
+//详情、重新添加、关闭
+export function getDetailAndAddAndCloseOption() {
+	let option_detail = [{
+			text: '详情',
+			style: {
+				backgroundColor: '#3C9CFF'
+			}
+		},
+		{
+			text: '重新\n添加',
+			style: {
+				backgroundColor: '#E6A23C'
+			}
+		},
+		{
+			text: '关闭',
+			style: {
+				backgroundColor: '#F56C6C'
+			}
+		}
+	];
+	return option_detail;
+}
+// 采购退货返回侧滑按钮 详情 、编辑、库位、移除
+export function getPurchaseReceiptOption(allowModifyQty, allowModifyLocation) {
+	var option = []
+	option.push(...getDetailOption())
+	if (allowModifyQty == "TRUE") {
+		option.push(...getEditOption())
+	}
+	if (allowModifyLocation == "TRUE") {
+		option.push(...getLocationOption())
+	}
+	option.push(...getRemoveOption())
+	return option;
+}
+
+//详情
+export function getDetailOption() {
+	let option_detail = [{
+		text: '详情',
+		style: {
+			backgroundColor: '#3C9CFF'
+		}
+	}];
+	return option_detail;
+}
+
+//详情移除(扫描后不允许修改数量)
+export function getDetailRemoveOption() {
+	let option_detail_edit_remove = [{
+			text: '详情',
+			style: {
+				backgroundColor: '#3C9CFF'
+			}
+		},
+		{
+			text: '移除',
+			style: {
+				backgroundColor: '#F56C6C'
+			}
+		}
+	];
+	return option_detail_edit_remove;
+}
+
+export function getRemoveOption() {
+	let option_detail_remove = [{
+		text: '移除',
+		style: {
+			backgroundColor: '#F56C6C'
+		}
+	}];
+	return option_detail_remove;
+}
+
+export function getAddAgainOption() {
+	let option_detail_remove = [{
+		text: '详情',
+		style: {
+			backgroundColor: '#3C9CFF'
+		}
+	}, {
+		text: '重新\n添加',
+		style: {
+			backgroundColor: '#E6A23C'
+		}
+	}];
+	return option_detail_remove;
+}
+
+
+
+export function getEditOption() {
+	let option_detail_edit = [{
+		text: '编辑',
+		style: {
+			backgroundColor: '#F1A532'
+		}
+	}];
+	return option_detail_edit;
+}
+export function getLocationOption() {
+	let option_detail_location = [{
+		text: '库位',
+		style: {
+			backgroundColor: '#00A3FF'
+		}
+	}];
+	return option_detail_location;
+}
+
+
+//清空
+export function getClearOption() {
+	let option_detail_edit_remove = [{
+		text: '清空',
+		style: {
+			backgroundColor: '#F56C6C'
+		}
+	}];
+	return option_detail_edit_remove;
+}
+
+
+//详情编辑移除
+export function getDetailEditRemoveOption() {
+	let option_detail_edit_remove = [{
+			text: '详情',
+			style: {
+				backgroundColor: '#3C9CFF'
+			}
+		},
+		{
+			text: '编辑',
+			style: {
+				backgroundColor: '#F1A532'
+			}
+		},
+		{
+			text: '移除',
+			style: {
+				backgroundColor: '#F56C6C'
+			}
+		}
+	];
+	return option_detail_edit_remove;
+}
+
+
+//详情编辑放弃
+export function getDetailGiveupOption() {
+	let option_detail_giveup = [{
+			text: '详情',
+			style: {
+				backgroundColor: '#3C9CFF'
+			}
+		},
+		{
+			text: '放弃',
+			style: {
+				backgroundColor: '#F56C6C'
+			}
+		}
+	];
+	return option_detail_giveup;
+}
+
+
+
+//详情编辑移除
+export function getEditRemoveOption() {
+	let option_edit_remove = [{
+			text: '编辑',
+			style: {
+				backgroundColor: '#F1A532'
+			}
+		},
+		{
+			text: '移除',
+			style: {
+				backgroundColor: '#F56C6C'
+			}
+		}
+	];
+	return option_edit_remove;
+}
+
+
+// 库存状态字典项
+export function getInventoryStatusArray() {
+	let array = [{
+		text: '待检',
+		value: "INSP"
+	}, {
+		text: '合格',
+		value: "OK"
+	}, {
+		text: '不合格',
+		value: "NOK"
+	}, {
+		text: '隔离',
+		value: "HOLD"
+	}, {
+		text: '报废',
+		value: "SCRAP"
+	}]
+	return array;
+}
+
+// 业务类型字典项
+export function getBusinessTypeArray() {
+	let array = [{
+		text: '供应商发货',
+		value: "SupplierDeliver"
+	}, {
+		text: '采购收货',
+		value: "PurchaseReceipt"
+	}, {
+		text: '采购退货',
+		value: "PurchaseReturn"
+	}, {
+		text: '采购上架',
+		value: "PurchasePutaway"
+	}]
+	return array;
+}
+
+export function getLocationTypeArray(data) {
+	var list = []
+	if (data == undefined || data == null || data == "") {
+		return list
+	}
+
+	if (data.indexOf(',') < 0) {
+		list.push(data)
+	} else {
+		var arrayItems = data.split(',')
+		arrayItems.forEach(res => {
+			list.push(res)
+		})
+	}
+
+	return list
+}
diff --git a/common/balance.js b/common/balance.js
new file mode 100644
index 0000000..1a53c9f
--- /dev/null
+++ b/common/balance.js
@@ -0,0 +1,477 @@
+import {
+	getManagementPrecision,
+	getPrecisionStrategy,
+	getBalanceByFilter
+} from '@/api/request2.js';
+
+/**
+ *  
+	获取管理精度查询策略参数
+ * @param {*} 
+ *  
+ */
+export function getPrecisionStrategyParams(detailSource) {
+	var itemList = []
+	detailSource.forEach(item => {
+		item.subList.forEach(detail => {
+			if (detail.scaned) {
+				var filterResult = itemList.filter(res => {
+					if (res.itemCode == item.itemCode &&
+						res.locationCode == detail.toLocationCode) {
+						return res
+					}
+				})
+				//去掉重复元素
+				if (filterResult.length == 0) {
+					var result = {
+						itemCode: item.itemCode,
+						locationCode: detail.toLocationCode
+					}
+					itemList.push(result)
+				}
+
+			}
+		})
+	})
+	return itemList;
+}
+/**
+ *  
+	获取管理精度查询策略参数
+ * @param {*} 
+ *  
+ */
+export function getPrecisionStrategyParamsByLocation(detailSource, toLocationCode) {
+	var itemList = []
+	detailSource.forEach(item => {
+		item.subList.forEach(detail => {
+			if (detail.scaned) {
+				detail.toLocationCode = toLocationCode;
+				var filterResult = itemList.filter(res => {
+					if (res.itemCode == item.itemCode &&
+						res.locationCode == detail.toLocationCode) {
+						return res
+					}
+				})
+				//去掉重复元素
+				if (filterResult.length == 0) {
+					var result = {
+						itemCode: item.itemCode,
+						locationCode: detail.toLocationCode
+					}
+					itemList.push(result)
+				}
+
+			}
+		})
+	})
+	return itemList;
+}
+
+/**
+ * "itemCode": [],
+    "locationCode":"INSPECT"
+	管理精度策略
+ * @param {*} 
+ *  
+ */
+export function getPrecisionStrategyList(itemList, callback) {
+	// let jsonParem = JSON.stringify(param)
+	let result = {
+		list: [],
+		success: true,
+		message: ''
+	};
+
+	getPrecisionStrategy(itemList).then(res => {
+		if (res.data == null) {
+			result.success = false
+			result.message = '未查询到管理精度信息'
+		} else {
+			result.list = res.data;
+		}
+		callback(result);
+	}).catch(error => {
+		result.success = false;
+		result.message = error;
+		callback(result);
+	})
+}
+
+/**
+ * "itemCode": [],
+    "locationCode":"INSPECT"
+	管理精度策略
+ * @param {*} 
+ *  
+ */
+export function getManagementPrecisions(itemCodes, locationCode, callback) {
+	// let jsonParem = JSON.stringify(param)
+	let result = {
+		list: [],
+		success: true,
+		message: ''
+	};
+
+	var params = {
+		itemCodes: itemCodes,
+		locationCode: locationCode
+	}
+	getManagementPrecision(params).then(res => {
+		if (res.data == null) {
+			result.success = false
+			result.message = '未查询到管理精度信息'
+		} else {
+			result.list = res.data;
+		}
+		callback(result);
+	}).catch(error => {
+		result.success = false;
+		result.message = error;
+		callback(result);
+	})
+}
+
+export function getBalanceByManagementPrecision(label, locationCode, fromInventoryStatuses, callback) {
+	let result = {
+		list: [],
+		success: true,
+		message: ''
+	};
+	let params = {
+		itemCodes: [label.itemCode],
+		locationCode: locationCode
+	};
+	// let jsonParem = JSON.stringify(param)
+	getManagementPrecision(params).then(res => {
+		let managementPrecision = res.data[0].ManagementPrecision;
+		switch (managementPrecision) {
+			case 'BY_PACKAGING':
+				byPacking(label, locationCode, fromInventoryStatuses, res => {
+					res.managementPrecision = managementPrecision;
+					callback(res);
+				});
+				break;
+			case 'BY_BATCH':
+				byBatch(label, locationCode, fromInventoryStatuses, res => {
+					res.managementPrecision = managementPrecision;
+					callback(res);
+				});
+				break;
+			case 'BY_QUANTITY':
+				byQuantity(label, locationCode, fromInventoryStatuses, res => {
+					res.managementPrecision = managementPrecision;
+					callback(res);
+				});
+				break;
+			case 'BY_UNIQUEID':
+				byUniqueId(label, fromInventoryStatuses, res => {
+					res.managementPrecision = managementPrecision;
+					callback(res);
+				});
+				break;
+		}
+	}).catch(error => {
+		let result = {
+			success: false,
+			message: error
+		};
+		callback(result);
+	})
+}
+/** 按包装管理查询库存
+ * @param {Object} label
+ * @param {Object} locationCode
+ * @param {Object} callback
+ */
+export function byPacking(label, locationCode, fromInventoryStatuses, callback) {
+	let result = {
+		success: true,
+		message: '',
+		data: {}
+	};
+	var filters = []
+	filters.push({
+		column: "packingNumber",
+		action: "==",
+		value: label.packingNumber
+	})
+	filters.push({
+		column: "itemCode",
+		action: "==",
+		value: label.itemCode
+	})
+	filters.push({
+		column: "batch",
+		action: "==",
+		value: label.batch
+	})
+	filters.push({
+		column: "locationCode",
+		action: "==",
+		value: locationCode
+	})
+	if (fromInventoryStatuses != null && fromInventoryStatuses != "") {
+		filters.push({
+			column: "inventoryStatus",
+			action: "in",
+			value: fromInventoryStatuses
+		})
+	}
+
+
+	var params = {
+		filters: filters,
+		pageNo: 1,
+		pageSize: 100,
+	}
+	getBalanceByFilter(params).then(res => {
+		if (res.data == null) {
+			result.success = false;
+			result.message =
+				"按包装管理查询、未查询到物料号[" + label.itemCode + "]" +
+				"到箱码[" + label.packingNumber + "]" +
+				"批次[" + label.batch + "]" +
+				"库位[" + label.locationCode + "]的信息"
+		} else {
+			result.success = true;
+			result.data = res.data;
+		}
+
+		callback(result)
+	}).catch(err => {
+		result.success = false;
+		result.data = null;
+		result.message = err;
+		callback(result)
+	})
+}
+/** 按批次管理查询库存
+ * @param {Object} label
+ * @param {Object} locationCode
+ * @param {Object} callback
+ */
+export function byBatch(label, locationCode, fromInventoryStatuses, callback) {
+	var filters = []
+	filters.push({
+		column: "itemCode",
+		action: "==",
+		value: label.itemCode
+	})
+	filters.push({
+		column: "batch",
+		action: "==",
+		value: label.batch
+	})
+	filters.push({
+		column: "packingNumber",
+		action: "==",
+		value: null
+	})
+	filters.push({
+		column: "locationCode",
+		action: "==",
+		value: locationCode
+	})
+
+	if (fromInventoryStatuses != null && fromInventoryStatuses != "") {
+		filters.push({
+			column: "inventoryStatus",
+			action: "in",
+			value: fromInventoryStatuses
+		})
+	}
+
+	var params = {
+		filters: filters,
+		pageNo: 1,
+		pageSize: 100,
+	}
+
+	let result = {
+		success: true,
+		message: '',
+		data: {}
+	};
+	getBalanceByFilter(params).then(res => {
+		if (res.data == null) {
+			result.success = false;
+			result.message =
+				"按批次管理查询、未查询到物料号[" + label.itemCode + "]" +
+				"批次[" + label.batch + "]" +
+				"库位[" + label.locationCode + "]的信息"
+		} else {
+			result.success = true;
+			result.data = res.data;
+		}
+		callback(result)
+	}).catch(err => {
+		result.success = false;
+		result.data = null;
+		result.message = err.message;
+		callback(result)
+	})
+}
+/** 按数量管理查询库存
+ * @param {Object} label
+ * @param {Object} locationCode
+ * @param {Object} callback
+ */
+export function byQuantity(label, locationCode, fromInventoryStatuses, callback) {
+	let result = {
+		success: true,
+		message: '',
+		data: {}
+	};
+
+	var filters = []
+	filters.push({
+		column: "itemCode",
+		action: "==",
+		value: label.itemCode
+	})
+	filters.push({
+		column: "packingNumber",
+		action: "==",
+		value: null
+	})
+	filters.push({
+		column: "batch",
+		action: "==",
+		value: null
+	})
+	filters.push({
+		column: "locationCode",
+		action: "==",
+		value: locationCode
+	})
+
+	if (fromInventoryStatuses != null && fromInventoryStatuses != "") {
+		filters.push({
+			column: "inventoryStatus",
+			action: "in",
+			value: fromInventoryStatuses
+		})
+	}
+
+	var params = {
+		filters: filters,
+		pageNo: 1,
+		pageSize: 100,
+	}
+
+	getBalanceByFilter(params).then(res => {
+		if (res.data == null) {
+			result.success = false;
+			result.message =
+				"按数量管理查询、未查询到物料号[" + label.itemCode + "]" +
+				"库位[" + label.locationCode + "]的信息"
+		} else {
+			result.success = true;
+			result.data = res.data;
+		}
+		callback(result)
+	}).catch(err => {
+		result.success = false;
+		result.data = null;
+		result.message = err.message;
+		callback(result)
+	})
+}
+/** 按唯一码管理查询库存
+ * @param {Object} label
+ * @param {Object} locationCode
+ * @param {Object} callback
+ */
+export function byUniqueId(label, locationCode, fromInventoryStatuses, callback) {
+	let param = {
+		packingNumber: label.packingNumber
+	};
+	let result = {
+		success: true,
+		message: '',
+		data: {}
+	};
+
+	var filters = []
+	filters.push({
+		column: "packingNumber",
+		action: "==",
+		value: label.packingNumber
+	})
+
+	if (fromInventoryStatuses != null && fromInventoryStatuses != "") {
+		filters.push({
+			column: "inventoryStatus",
+			action: "in",
+			value: fromInventoryStatuses
+		})
+	}
+
+	var params = {
+		filters: filters,
+		pageNo: 1,
+		pageSize: 100,
+	}
+
+	getBalanceByFilter(params).then(res => {
+		if (res.data == null) {
+			result.success = false;
+			result.message =
+				"按唯一码管理查询、未查询到箱码[" + label.packingNumber + "]" +
+				"的信息"
+		} else {
+			result.success = true;
+			result.data = res.data;
+		}
+		callback(result)
+	}).catch(err => {
+		result.success = false;
+		result.data = null;
+		result.message = err.message;
+		callback(result)
+	})
+}
+/**
+ * 查询指定库位下的库存
+ * @param {*} param 
+ * @param {*} callback 
+ */
+export function balanceByLocation(locationCode, callback) {
+	let result = {
+		success: true,
+		message: '',
+		data: {}
+	};
+
+	var filters = []
+	filters.push({
+		column: "locationCode",
+		action: "==",
+		value: locationCode
+	})
+
+	var params = {
+		filters: filters,
+		pageNo: 1,
+		pageSize: 100,
+	}
+
+	getBalanceByFilter(params).then(res => {
+		if (res.data == null) {
+			result.success = false;
+			result.message =
+				"按唯一码管理查询、未查询到库位[" + label.locationCode + "]" +
+				"的信息"
+		} else {
+			result.success = true;
+			result.data = res.data;
+		}
+		callback(result)
+	}).catch(err => {
+		result.success = false;
+		result.data = null;
+		result.message = err.message;
+		callback(result)
+	})
+}
diff --git a/common/basic.js b/common/basic.js
new file mode 100644
index 0000000..b725be3
--- /dev/null
+++ b/common/basic.js
@@ -0,0 +1,1014 @@
+let maxPageSize = 1000;
+export {
+	maxPageSize
+}
+
+import { calc } from '@/common/calc'
+
+let jobStatusList = [];
+let itemStatusList = [];
+let locationTypeList = [];
+let uomList = [];
+let inventoryStatusList = [];
+let containerTypeList = [];
+let packUnitList = [];
+let requestStatusList = [];
+let unplannedReceiptReasonList = [];
+let unplannedIissueReason = [];
+let scrapReasonList = [];
+let inspectFailedReasonList = [];
+
+
+
+//获取字典信息
+export function clearCacheData() {
+	jobStatusList = [];
+	itemStatusList = [];
+	locationTypeList = [];
+	uomList = [];
+	inventoryStatusList = [];
+	containerTypeList = [];
+	packUnitList = [];
+	requestStatusList = [];
+	unplannedReceiptReasonList = [];
+	unplannedIissueReason = [];
+	scrapReasonList = [];
+	inspectFailedReasonList = [];
+
+}
+
+//获取字典信息
+export function getDirectoryInfo(type) {
+	var result = [];
+	var list = uni.getStorageSync("dictionary")
+	if (list != undefined && list.length > 0) {
+		for (let item of list) {
+			if (item.type == type) {
+				result = item.subList
+				break;
+			}
+		}
+	}
+
+	return result
+}
+
+
+
+//将字典项转为数组
+export function getDirectoryItemArray(data) {
+	var array = []
+	if (data == undefined || data == null || data == "") {
+		return array
+	}
+
+	if (data.indexOf(',') < 0) {
+		array.push(data)
+	} else {
+		var arrayItems = data.split(',')
+		arrayItems.forEach(res => {
+			array.push(res)
+		})
+	}
+	return array
+}
+
+//查询字典项是否在列表中
+export function checkDirectoryItemExist(list, type) {
+	let exist = false;
+	if (list == null || list.length == 0) {
+		exist = true;
+	} else {
+		var temp = list.filter(res => {
+			if (res == type) {
+				return res
+			}
+		})
+		if (temp != undefined && temp.length > 0) {
+			exist = true
+		}
+	}
+	return exist
+}
+
+//获取任务状态
+export function getJobStateInfo(value) {
+	var resultInfo = "";
+	if (jobStatusList.length == 0) {
+		jobStatusList = getDirectoryInfo("job_status")
+	}
+	if (jobStatusList.length > 0) {
+		for (let item of jobStatusList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取任务状态样式
+export function getJobStateStyle(value) {
+	let item = getJobStateInfo(value);
+	if (item == null || item == '') {
+		return 'other'
+	} else {
+		if (item.remark == '') {
+			return 'other'
+		} else {
+			return item.remark;
+		}
+	}
+}
+
+//获取库位描述
+export function getListLocationTypeDesc(lst) {
+	let desc = '';
+	lst.forEach(res => {
+		desc += getLocationTypeInfo(res).label + ","
+	})
+	desc = desc.slice(0, -1);
+	return desc;
+}
+
+//获取物品状态
+export function getItemStateInfo(value) {
+	var resultInfo = "";
+	if (itemStatusList.length == 0) {
+		itemStatusList = getDirectoryInfo("item_status")
+	}
+	if (itemStatusList.length > 0) {
+		for (let item of itemStatusList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取库位类型
+export function getLocationTypeInfo(value) {
+	var resultInfo = "";
+	if (locationTypeList.length == 0) {
+		locationTypeList = getDirectoryInfo("location_type")
+	}
+	if (locationTypeList.length > 0) {
+		for (let item of locationTypeList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取库位类型名称
+export function getLocationTypeName(value) {
+	let location = getLocationTypeInfo(value);
+
+	return location == '' ? value : location.label;
+}
+
+//获取计量单位
+export function getUnitInfo(value) {
+	var resultInfo = "";
+	if (uomList.length == 0) {
+		uomList = getDirectoryInfo("uom")
+	}
+	if (uomList.length > 0) {
+		for (let item of uomList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取包装单位
+export function getStdPackUnitInfo(value) {
+	var resultInfo = "";
+	if (packUnitList.length == 0) {
+		packUnitList = getDirectoryInfo("pack_unit")
+	}
+	if (packUnitList.length > 0) {
+		for (let item of packUnitList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取申请状态
+export function getRequestStateInfo(value) {
+	var resultInfo = "";
+	if (requestStatusList.length == 0) {
+		requestStatusList = getDirectoryInfo("request_status")
+	}
+	if (requestStatusList.length > 0) {
+		for (let item of requestStatusList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取库存状态
+export function getInventoryStatusInfo(value) {
+	var resultInfo = "";
+	if (inventoryStatusList.length == 0) {
+		inventoryStatusList = getDirectoryInfo("inventory_status")
+	}
+	if (inventoryStatusList.length > 0) {
+		for (let item of inventoryStatusList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取库存样式
+export function getInventoryStatusStyle(value) {
+	let item = getInventoryStatusInfo(value);
+	if (item == null || item == '') {
+		return 'other'
+	} else {
+		if (item.remark == '') {
+			return 'other'
+		} else {
+			return item.remark;
+		}
+	}
+}
+
+//获取库存状态
+export function getInventoryStatusName(value) {
+	let item = getInventoryStatusInfo(value);
+	if (item == null || item == '') {
+		return value
+	} else {
+		if (item.label == '') {
+			return value
+		} else {
+			return item.label;
+		}
+	}
+}
+
+
+//获取状态描述
+export function getInventoryStatusDesc(lst) {
+	let desc = '';
+	lst.forEach(res => {
+		desc += getInventoryStatusInfo(res).label + ","
+	})
+	desc = desc.slice(0, -1);
+	return desc;
+}
+
+
+//获取器具状态
+export function getContainerStatusInfo(value) {
+	var resultInfo = "";
+	if (containerTypeList.length == 0) {
+		containerTypeList = getDirectoryInfo("container_type")
+	}
+	if (containerTypeList.length > 0) {
+		for (let item of containerTypeList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取计划外入库原因
+export function getUnPlannedReceiptReasonList(value) {
+	if (unplannedReceiptReasonList.length == 0) {
+		unplannedReceiptReasonList = getDirectoryInfo("unplanned_receipt_reason")
+	}
+	unplannedReceiptReasonList.forEach(res => {
+		res.text = res.label;
+		res.value = res.code
+	})
+	return unplannedReceiptReasonList
+}
+
+//获取计划外出库原因
+export function getUnPlannedIssuseReasonList(value) {
+	if (unplannedIissueReason.length == 0) {
+		unplannedIissueReason = getDirectoryInfo("unplanned_issue_reason")
+	}
+	unplannedIissueReason.forEach(res => {
+		res.text = res.label;
+		res.value = res.code
+	})
+	return unplannedIissueReason
+}
+
+
+//获取检验不合格原因
+export function getInspectReasonList(value) {
+	if (inspectFailedReasonList.length == 0) {
+		inspectFailedReasonList = getDirectoryInfo("inspect_failed_reason")
+	}
+	inspectFailedReasonList.forEach(res => {
+		res.text = res.label;
+		res.value = res.code
+	})
+	return inspectFailedReasonList
+}
+
+
+// //数量状态
+// export function getCoutJobStatuStyle(val) {
+// 	if (val == 1) return 'state_inspect'
+// 	else if (val == 2) return 'state_ok'
+// 	else if (val == 3) return 'state_nook'
+// 	else return 'other'
+// }
+
+// export function getCountJobStatuDesc(val) {
+// 	if (val == 1) return '待检'
+// 	else if (val == 2) return '合格'
+// 	else if (val == 3) return '不合格'
+// 	else return "未知"
+// }
+
+// export function getPartCodeState(val) {
+// 	if (val == 0) return '可用'
+// 	else if (val == 1) return '新增'
+// 	else if (val == 2) return '隔离'
+// 	else if (val == 3) return '未知'
+// 	else return '未知'
+// }
+
+// export function getLocationState(val) {
+// 	if (val == 'kwlxINSP') return '待检库'
+// 	else if (val == 'kwlxRAW') return '原料库'
+// 	else if (val == 'kwlxSEMI') return '半成品库'
+// 	else if (val == 'kwlxFG') return '成品库'
+// 	else if (val == 'kwlxWIP') return '线边库'
+// 	else if (val == 'kwlxHOLD') return '隔离库'
+// 	else if (val == 'kwlxSCRAP') return '报废库'
+// 	else if (val == 'kwlxNOK') return '不合格品库'
+// 	else if (val == 'kwxOVERFLOW') return '溢出库'
+// 	else if (val == 'kwlxCUsT') return '客户寄售库'
+// 	else if (val == 'kwlxOUTSIDE') return '外库'
+// 	else if (val == 'kwlxDIFF') return '盘点差异库'
+// 	else if (val == 'kwxTRANSPORT') return '在途库'
+// 	else return '未知'
+
+// }
+
+// export function getLocationStyle(val) {
+// 	if (val == 'kwlxRAW') return 'state_raw'
+// 	else if (val == 'kwlxFG') return 'state_fg'
+// 	else if (val == 'kwlxSEMI') return 'state_semi'
+// 	else if (val == 'kwlxHOLD') return 'state_hold'
+// 	else if (val == 4) return 'state_unk'
+// }
+
+// //任务状态
+// export function getJobStatuStyle(val) {
+// 	if (val == 'JOB_PENDING') return 'job_state_un-doing'
+// 	else if (val == '1') return 'job_state_doing'
+// 	else if (val == 'reztDONE') return 'job_state_completed'
+// 	else if (val == 'rwztCLOSED') return 'job_state_close'
+// 	else if (val == 'rwztCANCELLED') return 'job_state_cancelled'
+// 	else return 'unk'
+// }
+// //任务状态
+// //open  pending   completed  close
+// export function getJobStatuDesc(val) {
+// 	if (val == 'JOB_PENDING') return '待处理'
+// 	else if (val == '1') return '执行中'
+// 	else if (val == 'reztDONE') return '完成'
+// 	else if (val == 'rwztCLOSED') return '关闭'
+// 	else if (val == 'rwztCANCELLED') return '作废'
+// 	else return '其他'
+// }
+
+// //检验任务状态
+// export function getInspectTypeStyle(val) {
+// 	if (val == 0) return 'unk'
+// 	else if (val == 1) return 'exempt'
+// 	else if (val == 2) return 'full'
+// 	else if (val == 3) return 'sampling'
+// 	else if (val == 4) return 'pick'
+// 	else return 'other'
+// }
+// //open  pending   completed  close
+// export function getInspectTypeDesc(val) {
+// 	if (val == 0) return '未知'
+// 	else if (val == 1) return '免检'
+// 	else if (val == 2) return '全检'
+// 	else if (val == 3) return '抽检'
+// 	else if (val == 4) return '挑选'
+// 	else return '其他'
+// }
+
+
+// //库存状态
+// export function getInventoryStatusStyle(val) {
+// 	if (val == 'kcztUNK') return 'unk'
+// 	else if (val == 'kcztINSP') return 'inventory_status_insp'
+// 	else if (val == 'kcztOK') return 'inventory_status_ok'
+// 	else if (val == 'kcztNOK') return 'inventory_status_nok'
+// 	else if (val == 'kcztHOLD') return 'inventory_status_hold'
+// 	else if (val == 'kcztSCRAP') return 'inventory_status_scarp'
+// 	else return 'other'
+// }
+
+
+// //库存状态
+// export function getInventoryStatusDesc(val) {
+// 	if (val == 'kcztUNK') return '未知'
+// 	else if (val == 'kcztINSP') return '待检'
+// 	else if (val == 'kcztOK') return '合格'
+// 	else if (val == 'kcztNOK') return '不合格'
+// 	else if (val == 'kcztHOLD') return '隔离'
+// 	else if (val == 'kcztSCRAP') return '报废'
+// 	else return '其他'
+// }
+
+// //库存状态
+// export function getInventoryStatusStyle(val) {
+// 	if (val == 0) return 'unk'
+// 	else if (val == 1) return 'insp'
+// 	else if (val == 2) return 'ok'
+// 	else if (val == 3) return 'nok'
+// 	else if (val == 4) return 'hold'
+// 	else if (val == 5) return 'scarp'
+// 	else if (val == 6) return 'frozen'
+// 	else if (val == 31) return 'nok'
+// 	else return 'other'
+// }
+
+
+// //库存状态kcztINSP
+// export function getInventoryStatusDesc(val) {
+// 	if (val == 0) return '未知'
+// 	else if (val == 1) return '待检'
+// 	else if (val == 2) return '合格'
+// 	else if (val == 3) return '不合格'
+// 	else if (val == 4) return '隔离'
+// 	else if (val == 5) return '报废'
+// 	else if (val == 6) return '冻结'
+// 	else if (val == 31) return '不合格'
+// 	// else if (val == 31) return '目检不合格'
+// 	else return '其他'
+// }
+
+// //物料状态
+// export function getItemStatusStyle(val) {
+// 	if (val == "wpztUNK") return 'item_unk'
+// 	else if (val == "wpztENABLE") return 'item_active'
+// 	else if (val == "wpztHOLD") return 'item_hold'
+// 	else if (val == "wpztNEW") return 'item_new'
+// 	else if (val == "wpztPLAN") return 'item_plan'
+// 	else if (val == "wpztDISABLE") return 'item_disable'
+// 	else return 'other'
+// }
+
+// export function getItemStatusStyle(val) {
+// 	if (val == 0) return 'unk_item'
+// 	else if (val == 1) return 'active_item'
+// 	else if (val == 2) return 'hold_item'
+// 	else if (val == 3) return 'new_item'
+// 	else if (val == 4) return 'plan_item'
+// 	else if (val == 5) return 'disable_item'
+// 	else return 'other'
+// }
+
+
+// //物料状态描述
+// export function getItemStatusDesc(val) {
+// 	if (val == "wpztUNK") return '未知'
+// 	else if (val == "wpztENABLE") return '可用'
+// 	else if (val == "wpztHOLD") return '隔离'
+// 	else if (val == "wpztNEW") return '新增'
+// 	else if (val == "wpztPLAN") return '规划'
+// 	else if (val == "wpztDISABLE") return '禁用'
+// 	else return '其他'
+// }
+
+// //盘点状态
+// export function getCountStageTypeStyle(val) {
+// 	if (val == 0) return 'unk'
+// 	else if (val == 1) return 'initial'
+// 	else if (val == 2) return 'afresh'
+// 	else if (val == 3) return 'supervision'
+// 	else return 'other'
+// }
+
+
+// //盘点状态
+// export function getCountStageDesc(val) {
+// 	if (val == 0) return '未知'
+// 	else if (val == 1) return '初盘'
+// 	else if (val == 2) return '重盘'
+// 	else if (val == 3) return '监盘'
+// 	else return '其他'
+// }
+
+// //盘点计划类型
+// export function getCheckTypeDesc(val) {
+// 	if (val == 0) return '未知'
+// 	else if (val == 1) return '周期盘点'
+// 	else if (val == 2) return '物理盘点'
+// 	else return '其他'
+// }
+
+// //盘点方式	
+// export function getCountMethodDesc(val) {
+// 	if (val == 0) return '未知'
+// 	else if (val == 1) return '库位盘点'
+// 	else if (val == 2) return '物品盘点'
+// 	else if (val == 3) return '库位物料盘点'
+// 	else return '其他'
+// }
+
+// //获取库位类型
+// export function getLocationType(val) {
+// 	if (val == 'kwlxINSP') return 'location_inspect'
+// 	else if (val == 'kwlxRAW') return 'location_raw'
+// 	else if (val == 'kwlxSEMI') return 'location_semi'
+// 	else if (val == 'kwlxFG') return 'location_fg'
+// 	else if (val == 'kwlxWIP') return 'location_wip'
+// 	else if (val == 'kwlxHOLD') return 'location_hold'
+// 	else if (val == 'kwlxSCRAP') return 'location_scrap'
+// 	else if (val == 'kwlxNOK') return 'location_nok'
+// 	else if (val == 'kwxOVERFLOW') return 'location_overflow'
+// 	else if (val == 'kwlxCUsT') return 'location_cust'
+// 	else if (val == 'kwlxOUTSIDE') return 'location_outside'
+// 	else if (val == 'kwlxDIFF') return 'location_diff'
+// 	else if (val == 'kwxTRANSPORT') return 'location_transport'
+// 	else return 'location_other'
+// }
+
+// //获取库位类型描述
+// export function getLocationTypeDesc(val) {
+// 	if (val == 'kwlxINSP') return '待检库'
+// 	else if (val == 'kwlxRAW') return '原料库'
+// 	else if (val == 'kwlxSEMI') return '半成品库'
+// 	else if (val == 'kwlxFG') return '成品库'
+// 	else if (val == 'kwlxWIP') return '线边库'
+// 	else if (val == 'kwlxHOLD') return '隔离库'
+// 	else if (val == 'kwlxSCRAP') return '报废库'
+// 	else if (val == 'kwlxNOK') return '不合格品库'
+// 	else if (val == 'kwxOVERFLOW') return '溢出库'
+// 	else if (val == 'kwlxCUsT') return '客户寄售库'
+// 	else if (val == 'kwlxOUTSIDE') return '外库'
+// 	else if (val == 'kwlxDIFF') return '盘点差异库'
+// 	else if (val == 'kwxTRANSPORT') return '在途库'
+// 	else return '其他'
+
+// }
+
+// //获取任务类型描述
+// export function getJobType(val) {
+// 	if (val == 0) return 'uno'
+// 	else if (val == 1) return 'PurchaseReceiptJob' //采购收货
+// 	else if (val == 2) return 'PurchaseReturnJob' //采购退货任务
+// 	else if (val == 3) return 'InspectJob' //检验任务
+// 	else if (val == 4) return 'PutawayJob' //上架任务
+// 	else if (val == 5) return 'ProductReceiveJob' //完工收货任务
+// 	else if (val == 6) return 'IssueJob' //发料任务
+// 	else if (val == 7) return 'DeliverJob' //发货任务
+// 	else if (val == 8) return 'CheckJob' //校验任务
+// 	else if (val == 9) return 'CountJob' //盘点任务
+// 	else return 'Other'
+// }
+
+export function getPackingNumberAndBatchByList(managementList, itemCode, packingNumber, locationCode, batch) {
+	var itemInfo = {
+		packingNumber: "",
+		batch: ""
+	}
+	var manageType = queryManageModelByList(managementList, itemCode, locationCode)
+	if (manageType == "BY_QUANTITY") {
+		itemInfo.packingNumber = ""
+		itemInfo.batch = ""
+	} else if (manageType == "BY_BATCH") {
+		itemInfo.packingNumber = ""
+		itemInfo.batch = batch
+	} else if (manageType == "BY_PACKAGING") {
+		itemInfo.packingNumber = packingNumber
+		itemInfo.batch = batch
+	} else if (manageType == "BY_UNIQUE_ID") {
+		itemInfo.packingNumber = packingNumber
+		itemInfo.batch = batch
+	} else if (manageType == "") {
+		itemInfo.packingNumber = packingNumber
+		itemInfo.batch = batch
+	}
+	return itemInfo;
+}
+
+export function queryManageModelByList(managementList, itemCode, locationCode) {
+	var result = managementList.find(res => {
+		if (res.itemCode == itemCode && res.locationCode == locationCode) {
+			return res.ManagementPrecision
+		}
+	})
+
+	if (result != undefined) {
+		return result.ManagementPrecision
+	} else {
+		return ""
+	}
+}
+
+
+// 获取业务类型字典项
+export function getBusinessTypeDesc(type) {
+	if (type == "SupplierDeliver") {
+		return "供应商发货"
+	} else if (type = "PurchaseReceipt") {
+		return "采购收货";
+	} else if (type = "PurchaseReturn") {
+		return "采购退货";
+	} else if (type = "PurchasePutaway") {
+		return "采购上架";
+	}
+}
+
+
+export function queryManageModel(managementList, itemCode) {
+	var result = managementList.filter(res => {
+		if (res.itemCode == itemCode) {
+			return res.ManagementPrecision
+		}
+	})
+
+	if (result != undefined) {
+		return result[0].ManagementPrecision
+	} else {
+		return ""
+	}
+}
+
+export function getPackingNumberAndBatch(managementList, itemCode, packingNumber, batch) {
+	var itemInfo = {
+		packingNumber: "",
+		batch: ""
+	}
+
+	var manageType = queryManageModel(managementList, itemCode)
+	if (manageType == "BY_QUANTITY") {
+		itemInfo.packingNumber = ""
+		itemInfo.batch = ""
+	} else if (manageType == "BY_BATCH") {
+		itemInfo.packingNumber = ""
+		itemInfo.batch = batch
+	} else if (manageType == "BY_PACKAGING") {
+		itemInfo.packingNumber = packingNumber
+		itemInfo.batch = batch
+	} else if (manageType == "BY_UNIQUE_ID") {
+		itemInfo.packingNumber = packingNumber
+		itemInfo.batch = batch
+	}
+	return itemInfo;
+}
+
+// //提示是否消息
+// export function showConfirmMsg(content, callback) {
+// 	uni.showModal({
+// 		title: '提示',
+// 		cancelText: '否',
+// 		confirmText: '是',
+// 		content: content,
+// 		success: function(res) {
+// 			if (res.confirm) {
+// 				callback(true);
+// 			} else {
+// 				callback(false);
+// 			}
+// 		},
+// 	})
+// 	scanErrorAudio();
+// }
+
+export function compareTime() {
+	return function(a, b) {
+		// 按照时间降序
+		return Date.parse(a.time) - Date.parse(a.time)
+	}
+}
+//升序
+export function compareAsc(key) {
+	return function(a, b) {
+		var val1 = a[key];
+		var val2 = b[key];
+		return val1 - val2;
+	}
+}
+//倒序
+export function compareDesc(key) {
+	return function(a, b) {
+		var val1 = a[key];
+		var val2 = b[key];
+		return val2 - val1;
+	}
+}
+
+export function goHome() {
+	uni.reLaunch({
+		url: '/pages/index/index'
+	}).catch((e) => {});
+
+}
+/**
+ * 获取当天时间2023-11-07 00:00:00-->2023-11-07 23:59:59
+ */
+export function getTodayDate() {
+	var startTime = new Date(new Date().toLocaleDateString()).getTime();
+	var endTime = startTime + 24 * 60 * 60 * 1000 - 1
+	console.log("获取时间", startTime + "," + endTime)
+	return startTime + "," + endTime;
+}
+
+export function getCurrDateOneMonthsTimes() {
+	var end = Date.now()
+	// var end = new Date('2019/12/31 15:18').getTime()
+	var day = 31
+	var enda = new Date(end);
+	var endm = enda.getMonth() + 1;
+	var d = enda.getDate();
+	if (endm == 4 || endm == 6 || endm == 9 || endm == 11) {
+		day = 30
+	} else {
+		if (d == 31) {
+			day = 30
+		}
+		if (endm == 7 || endm == 12) {
+			day = 31
+		}
+	}
+	if (endm == 1) {
+		var endy = enda.getFullYear();
+		day = 31
+		if (d == 31) {
+			day = 28
+		}
+		if (d == 30) {
+			day = 29
+		}
+		if (d == 29) {
+			day = 30
+		}
+		if (endy % 4 == 0) {
+			day = 31
+			if (d == 31) {
+				day = 29
+			}
+			if (d == 30) {
+				day = 30
+			}
+			if (d == 29) {
+				day = 31
+			}
+		}
+	}
+	if (endm == 2) {
+		var endy = enda.getFullYear();
+		day = 28
+		if (endy % 4 == 0) {
+			day = 29
+		}
+	}
+	var start = 1000 * 60 * 60 * 24 * day
+	var interval = end + start;
+	return interval;
+}
+
+
+export function getCurrDateTimes() {
+	var time = (new Date()).getTime();
+	return time;
+}
+
+export function getBatch() {
+	var date = new Date();
+	var year = date.getFullYear(); //年
+	var month = date.getMonth() + 1; //月
+	var day = date.getDate(); //日
+	var batch = year.toString() + month.toString() + day.toString()
+	return batch;
+}
+
+export function getCurrDate() {
+	var date = new Date();
+	return getDate(date);
+}
+
+export function getCurrDateTime() {
+	var date = new Date();
+	return getDate(date) + " " + getTime(date);
+}
+
+export function getISODateTime() {
+	var date = new Date();
+	return getDate(date) + "T" + getTime(date) + "Z";
+}
+
+//格式化处理
+export function dateFormat(time) {
+	var result = ""
+	if (time != null) {
+		let date = new Date(time);
+		result = getDate(date) + " " + getTime(date);
+	}
+
+	return result;
+}
+
+//获取日期部分
+export function getDate(date) {
+	var year = date.getFullYear(); //年
+	var month = date.getMonth() + 1; //月
+	var day = date.getDate(); //日
+
+	month = month < 10 ? "0" + month : month;
+	day = day < 10 ? "0" + day : day;
+	return year + "-" + month + "-" + day;
+}
+
+//获取时间部分
+export function getTime(date) {
+	let hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
+	let minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
+	let seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+	// 拼接
+	return hours + ":" + minutes + ":" + seconds;
+}
+
+//将20220713转成2022-07-13
+export function toYYYY_MM_DD(value) {
+	return value.substring(0, 4) + "-" + value.substring(4, 6) + "-" + value.substring(6, 8)
+}
+
+export function getRootFontSize() {
+	const self = this;
+	var fontSize = getApp().globalData.rootFontSize;
+	if (fontSize) {
+		return fontSize;
+	} else {
+		fontSize = uni.getStorageSync('root_font_size');
+		if (fontSize) {
+			getApp().globalData.rootFontSize = fontSize;
+		} else {
+			fontSize = '20px'; //默认字体大小
+			self.setRootFontSize(fontSize);
+		}
+		return fontSize;
+
+	}
+}
+
+export function getRemoveOption() {
+	let options = [{
+		text: '移除',
+		style: {
+			backgroundColor: '#F56C6C'
+		}
+	}]
+	return options;
+}
+
+export function setRootFontSize(fontSize) {
+	uni.setStorageSync('root_font_size', fontSize);
+	getApp().globalData.rootFontSize = fontSize;
+}
+
+
+export function scanErrorAudio() {
+	var music = null;
+	music = uni.createInnerAudioContext(); //创建播放器对象
+	music.src = "../../static/video/error.wav";
+	music.volume = 1;
+	music.play(); //执行播放
+	music.onEnded(() => {
+		//播放结束
+		music = null;
+	});
+}
+
+
+export function newMessageAudio() {
+	var music = null;
+	music = uni.createInnerAudioContext(); //创建播放器对象
+	music.src = "../../static/video/error.wav";
+	music.volume = 1;
+	music.play(); //执行播放
+	music.onEnded(() => {
+		//播放结束
+		music = null;
+	});
+}
+
+
+export function vibrate() {
+	uni.vibrateLong({
+		success: function() {
+
+		}
+	})
+}
+
+
+export function getDataSource(subList) {
+	let items = [];
+	subList.forEach(detail => {
+		var item = items.find(r =>
+			r.itemCode == detail.itemCode)
+		if (item == undefined) {
+			item = createItemInfo(detail);
+			let newDetail = createDetailInfo(detail); //
+			item.subList.push(newDetail);
+			items.push(item)
+		} else {
+			item.qty = calc.add(item.qty,detail.qty)
+			let newDetail = createDetailInfo(detail); //
+			item.subList.push(newDetail);
+		}
+	})
+	return items;
+}
+
+export function createItemInfo(res) {
+	let item = {
+		itemCode: res.itemCode,
+		itemName: res.itemName,
+		stdPackQty: Number(res.stdPackQty),
+		stdPackUnit: res.stdPackUnit,
+		qty: Number(res.qty),
+		handleQty: 0,
+		uom: res.uom,
+		subList: []
+	}
+	return item;
+}
+
+export function createDetailInfo(data) {
+	data.scaned = false;
+	// data.record = {};
+	let detail = data;
+	return detail;
+}
+
+export function updateTitle(title) {
+	uni.setNavigationBarTitle({
+		title: title
+	})
+}
+
+export function clearTirmAndWrap(content) {
+	return content.replace(/<\/?.+?\/?>|\r|\n|\s*/g, '')
+}
+
+export function navigateBack(backIndex) {
+	let canNavBack = getCurrentPages()
+	if (canNavBack && canNavBack.length - 1 > backIndex) {
+		uni.navigateBack({
+			delta: backIndex
+		})
+	} else {
+		history.back();
+	}
+}
+/**
+ * 深度克隆对象
+ * @param {*} target 
+ */
+export function  deepCopyData(target) {
+	// 克隆原始类型和null
+	if (!(target !== null && (typeof target === 'object' || typeof target === 'function'))) {
+		return target;
+	}
+	
+	let cloneTarget = Array.isArray(target) ? [] : {};
+	// 克隆对象和数组
+	for (const key in target) {
+		cloneTarget[key] = deepCopyData(target[key]);
+	}
+
+	return cloneTarget;
+}
diff --git a/common/calc.js b/common/calc.js
new file mode 100644
index 0000000..2b48e48
--- /dev/null
+++ b/common/calc.js
@@ -0,0 +1,17 @@
+/* 解决js计算精度问题 */
+import { Decimal } from 'decimal.js';//引入
+class Calc {
+    add(num1,num2) {
+        return new Decimal(num1).add(new Decimal(num2)).toNumber()
+    }
+    sub(num1,num2) {
+        return new Decimal(num1).sub(new Decimal(num2)).toNumber()
+    }
+    mul(num1,num2) {
+        return new Decimal(num1).mul(new Decimal(num2)).toNumber()
+    }
+    div(num1,num2) {
+        return new Decimal(num1).div(new Decimal(num2)).toNumber()
+    }
+}
+export const calc = new Calc();
\ No newline at end of file
diff --git a/common/detail.js b/common/detail.js
new file mode 100644
index 0000000..1ba7aa9
--- /dev/null
+++ b/common/detail.js
@@ -0,0 +1,83 @@
+import {
+		calc
+	} from '@/common/calc'
+
+import { Decimal } from 'decimal.js';//引入
+	export function getDataSource(subList) {
+		let items = [];
+		subList.forEach(detail => {
+			var item = items.find(r =>
+				r.itemCode == detail.itemCode)
+			if (item == undefined) {
+				item = createItemInfo(detail);
+				let newDetail = createDetailInfo(detail); //
+				item.subList.push(newDetail);
+				items.push(item)
+			} else {
+				item.qty = calc.add(item.qty, detail.qty)
+				let newDetail = createDetailInfo(detail); //
+				item.subList.push(newDetail);
+			}
+		})
+		return items;
+	}
+
+	export function createItemInfo(detail) {
+		let item = {
+			itemCode: detail.itemCode,
+			itemName: detail.itemName,
+			stdPackQty: Number(detail.stdPackQty) || undefined,
+			stdPackUnit: detail.stdPackUnit,
+			qty: Number(detail.qty),
+			handleQty: 0,
+			uom: detail.uom,
+			subList: []
+		}
+		return item;
+	}
+
+	export function createDetailInfo(data) {
+		data.scaned = false;
+		// data.record = {};
+		let detail = data;
+		return detail;
+	}
+
+	//根据明细创建记录
+	export function createRecordInfo(detail, balance) {
+		var record = {}
+		// let record = JSON.parse(JSON.stringify(detail));
+		//克隆对象，深度克隆，防止双向绑定同一个变量
+		Object.assign(record, detail)
+		detail.scaned = true;
+		detail.balance = balance;
+		detail.recommendInventoryStatus = detail.inventoryStatus;
+		detail.inventoryStatus = balance.inventoryStatus;
+		record.qty = Number(balance.qty);
+		return record;
+	}
+
+	//计算实际数量
+	export function calcHandleQty(detailSource) {
+		for (let item of detailSource) {
+			item.handleQty = new Decimal(0).toNumber();
+			// item.qty = new Decimal(0).toNumber();
+			for (let detail of item.subList) {
+				if (detail != undefined && detail.scaned) {
+					item.handleQty = calc.add(item.handleQty,detail.handleQty);
+					// item.qty = calc.add(item.qty,detail.qty); 
+				}
+			}
+		}
+	}
+
+
+	export function getScanCount(subList) {
+		let items = subList.filter(r => {
+			if (r.scaned) {
+				return r;
+			}
+		})
+		let scanCount = items != null ? items.length : 0;
+		return scanCount;
+	}
diff --git a/common/directory.js b/common/directory.js
new file mode 100644
index 0000000..934b432
--- /dev/null
+++ b/common/directory.js
@@ -0,0 +1,516 @@
+let jobStatusList = [];
+let itemStatusList = [];
+let itemTypeList =[];
+let locationTypeList = [];
+let uomList = [];
+let inventoryStatusList = [];
+let containerTypeList = [];
+let packUnitList = [];
+let requestStatusList = [];
+let unplannedReceiptReasonList = [];
+let unplannedIssueReasonList = [];
+let unplannedIissueReason = [];
+let scrapReasonList = [];
+let inspectFailedReasonList = [];
+let inspectResultList = [];
+let nextActionList = [];
+let inspectTypeList = [];
+let sampleMethodList = [];
+let transferModeList = [];
+let countStageList = [];
+
+
+
+
+
+// 获取业务类型字典项
+export function getBusinessTypeDesc(type) {
+	if (type == "SupplierDeliver") {
+		return "供应商发货"
+	} else if (type = "PurchaseReceipt") {
+		return "采购收货";
+	} else if (type = "PurchaseReturn") {
+		return "采购退货";
+	} else if (type = "PurchasePutaway") {
+		return "采购上架";
+	}
+}
+
+//获取字典信息
+export function clearCacheData() {
+	jobStatusList = [];
+	itemStatusList = [];
+	itemTypeList =[];
+	locationTypeList = [];
+	uomList = [];
+	inventoryStatusList = [];
+	containerTypeList = [];
+	packUnitList = [];
+	requestStatusList = [];
+	unplannedReceiptReasonList = [];
+	unplannedIssueReasonList = [];
+	unplannedIissueReason = [];
+	scrapReasonList = [];
+	inspectFailedReasonList = [];
+	inspectResultList = [];
+	nextActionList = [];
+	inspectTypeList = [];
+	sampleMethodList = [];
+	transferModeList = [];
+	countStageList = [];
+}
+
+//获取字典信息
+export function getDirectoryInfo(type) {
+
+	var result = [];
+	var list = uni.getStorageSync("dictionary")
+	if (list != undefined && list.length > 0) {
+		for (let item of list) {
+			if (item.type == type) {
+				result = item.subList
+				break;
+			}
+		}
+	}
+
+	return result
+}
+
+//将字典项转为数组
+export function getDirectoryItemArray(data) {
+	var array = []
+	if (data == undefined || data == null || data == "") {
+		return array
+	}
+
+	if (data.indexOf(',') < 0) {
+		array.push(data)
+	} else {
+		var arrayItems = data.split(',')
+		arrayItems.forEach(res => {
+			array.push(res)
+		})
+	}
+	return array
+}
+
+//查询字典项是否在列表中
+export function checkDirectoryItemExist(list, type) {
+	let exist = false;
+	if (list == null || list.length == 0) {
+		exist = true;
+	} else {
+		var temp = list.filter(res => {
+			if (res == type) {
+				return res
+			}
+		})
+		if (temp != undefined && temp.length > 0) {
+			exist = true
+		}
+	}
+	return exist
+}
+
+
+//获取任务状态
+export function getJobStateInfo(value) {
+	var resultInfo = "";
+	if (jobStatusList.length == 0) {
+		jobStatusList = getDirectoryInfo("job_status")
+	}
+	if (jobStatusList.length > 0) {
+		for (let item of jobStatusList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取任务状态样式
+export function getJobStateStyle(value) {
+	let item = getJobStateInfo(value);
+	if (item == null || item == '') {
+		return 'other'
+	} else {
+		if (item.remark == '') {
+			return 'other'
+		} else {
+			return item.remark;
+		}
+	}
+}
+
+//获取库位描述（多个库位）
+export function getListLocationTypeDesc(list) {
+	let desc = '';
+	list.forEach(res => {
+		desc += getLocationTypeInfo(res).label + ","
+	})
+	desc = desc.slice(0, -1);
+	return desc;
+}
+
+
+//获取物品状态（多个状态）
+export function getListItemStateDesc(list) {
+	let desc = '';
+	list.forEach(res => {
+		desc += getItemStateInfo(res).label + ","
+	})
+	desc = desc.slice(0, -1);
+	return desc;
+}
+
+//获取物品类型（多个）
+export function getListItemTypeDesc(list) {
+	let desc = '';
+	list.forEach(res => {
+		desc += getItemTypeInfo(res).label + ","
+	})
+	desc = desc.slice(0, -1);
+	return desc;
+}
+
+//获取物品类型
+export function getItemTypeInfo(value) {
+	var resultInfo = "";
+	if (itemTypeList.length == 0) {
+		itemTypeList = getDirectoryInfo("item_type")
+	}
+	if (itemTypeList.length > 0) {
+		for (let item of itemTypeList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+
+
+
+//获取物品状态
+export function getItemStateInfo(value) {
+	var resultInfo = "";
+	if (itemStatusList.length == 0) {
+		itemStatusList = getDirectoryInfo("item_status")
+	}
+	if (itemStatusList.length > 0) {
+		for (let item of itemStatusList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取库位类型
+export function getLocationTypeInfo(value) {
+	var resultInfo = "";
+	if (locationTypeList.length == 0) {
+		locationTypeList = getDirectoryInfo("location_type")
+	}
+	if (locationTypeList.length > 0) {
+		for (let item of locationTypeList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取库位类型名称
+export function getLocationTypeName(value) {
+	let location = getLocationTypeInfo(value);
+
+	return location == '' ? value : location.label;
+}
+
+
+//获取库位类型名称
+export function getLocationTypeNameList(lst) {
+	let desc = '';
+	lst.forEach(res => {
+		desc += getLocationTypeInfo(res).label + ","
+	})
+	desc = desc.slice(0, -1);
+	return desc;
+}
+
+//获取计量单位
+export function getUnitInfo(value) {
+	var resultInfo = "";
+	if (uomList.length == 0) {
+		uomList = getDirectoryInfo("uom")
+	}
+	if (uomList.length > 0) {
+		for (let item of uomList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取包装单位
+export function getStdPackUnitInfo(value) {
+	var resultInfo = "";
+	if (packUnitList.length == 0) {
+		packUnitList = getDirectoryInfo("pack_unit")
+	}
+	if (packUnitList.length > 0) {
+		for (let item of packUnitList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取申请状态
+export function getRequestStateInfo(value) {
+	var resultInfo = "";
+	if (requestStatusList.length == 0) {
+		requestStatusList = getDirectoryInfo("request_status")
+	}
+	if (requestStatusList.length > 0) {
+		for (let item of requestStatusList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+
+//获取库存状态
+export function getInventoryStatusInfo(value) {
+	var resultInfo = "";
+	if (inventoryStatusList.length == 0) {
+		inventoryStatusList = getDirectoryInfo("inventory_status")
+	}
+	if (inventoryStatusList.length > 0) {
+		for (let item of inventoryStatusList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取库存样式
+export function getInventoryStatusStyle(value) {
+	let item = getInventoryStatusInfo(value);
+	if (item == null || item == '') {
+		return 'other'
+	} else {
+		if (item.remark == '') {
+			return 'other'
+		} else {
+			return item.remark;
+		}
+	}
+}
+
+//获取库存样式
+export function getInventoryStatusName(value) {
+	let item = getInventoryStatusInfo(value);
+	if (item == null || item == '') {
+		return value
+	} else {
+		if (item.label == '') {
+			return value
+		} else {
+			return item.label;
+		}
+	}
+}
+
+//获取状态描述 list
+export function getInventoryStatusDesc(lst) {
+	let desc = '';
+	lst.forEach(res => {
+		desc += getInventoryStatusInfo(res).label + ","
+	})
+	desc = desc.slice(0, -1);
+	return desc;
+}
+
+//获取器具状态
+export function getContainerStatusInfo(value) {
+	var resultInfo = "";
+	if (containerTypeList.length == 0) {
+		containerTypeList = getDirectoryInfo("container_type")
+	}
+	if (containerTypeList.length > 0) {
+		for (let item of containerTypeList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取计划外入库原因
+export function getUnPlannedReceiptReasonList(value) {
+	if (unplannedReceiptReasonList.length == 0) {
+		unplannedReceiptReasonList = getDirectoryInfo("unplanned_receipt_reason")
+	}
+	unplannedReceiptReasonList.forEach(res => {
+		res.text = res.label;
+		res.value = res.value
+	})
+	return unplannedReceiptReasonList
+}
+
+//获取计划外出库原因
+export function getUnPlannedIssuseReasonList(value) {
+	if (unplannedIssueReasonList.length == 0) {
+		unplannedIssueReasonList = getDirectoryInfo("unplanned_issue_reason")
+	}
+	unplannedIssueReasonList.forEach(res => {
+		res.text = res.label;
+		res.value = res.value
+	})
+	return unplannedIssueReasonList
+}
+
+//获取报废出库原因
+export function getScarpReasonList(value) {
+	if (scrapReasonList.length == 0) {
+		scrapReasonList = getDirectoryInfo("scrap_reason")
+	}
+	scrapReasonList.forEach(res => {
+		res.text = res.label;
+		res.value = res.value
+	})
+	return scrapReasonList
+}
+
+//获取检验失败原因
+export function getInspectFailedReasonList(value) {
+	if (inspectFailedReasonList.length == 0) {
+		inspectFailedReasonList = getDirectoryInfo("inspect_failed_reason")
+	}
+	inspectFailedReasonList.forEach(res => {
+		res.text = res.label;
+		res.value = res.value
+	})
+	return inspectFailedReasonList
+}
+
+//获取检验结果
+export function getInspectResultList(value) {
+	if (inspectResultList.length == 0) {
+		inspectResultList = getDirectoryInfo("inspect_result")
+	}
+	inspectResultList.forEach(res => {
+		res.text = res.label;
+		res.value = res.value
+	})
+	return inspectResultList
+}
+
+
+
+//获取下一步动作
+export function getNextActionList(value) {
+	if (nextActionList.length == 0) {
+		nextActionList = getDirectoryInfo("next_action")
+	}
+	nextActionList.forEach(res => {
+		res.text = res.label;
+		res.value = res.value
+	})
+	return nextActionList
+}
+
+
+
+//获取检验类型
+export function getInspectType(value) {
+	var resultInfo = "";
+	if (inspectTypeList.length == 0) {
+		inspectTypeList = getDirectoryInfo("inspect_type")
+	}
+	if (inspectTypeList.length > 0) {
+		for (let item of inspectTypeList) {
+			if (item.value == value) {
+				resultInfo = item.label
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+//获取抽检方式
+export function getSampleMethod(value) {
+	var resultInfo = "";
+	if (sampleMethodList.length == 0) {
+		sampleMethodList = getDirectoryInfo("sample_method")
+	}
+	if (sampleMethodList.length > 0) {
+		for (let item of sampleMethodList) {
+			if (item.value == value) {
+				resultInfo = item.label
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取运输方式
+export function getTransferModeName(value) {
+	var resultInfo = "";
+	if (transferModeList.length == 0) {
+		transferModeList = getDirectoryInfo("transfer_mode")
+	}
+	if (transferModeList.length > 0) {
+		for (let item of transferModeList) {
+			if (item.value == value) {
+				resultInfo = item.label
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+//获取盘点阶段名称
+export function getCountStageName(value) {
+	var resultInfo = "";
+	if (countStageList.length == 0) {
+		countStageList = getDirectoryInfo("count_stage")
+	}
+	if (countStageList.length > 0) {
+		for (let item of countStageList) {
+			if (item.value == value) {
+				resultInfo = item.label
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
diff --git a/common/label.js b/common/label.js
new file mode 100644
index 0000000..7ffefd7
--- /dev/null
+++ b/common/label.js
@@ -0,0 +1,194 @@
+let labelDic = [];
+
+import {
+	getLabelByHeader,
+	getPackageByNumber
+} from '../api/request2.js';
+
+import {
+	checkDirectoryItemExist,
+	getDirectoryItemArray
+} from '../common/directory.js';
+
+
+
+export function getLabelInfo(scanMsg,headerType, callBack) {
+	console.log('扫描信息:',  scanMsg);
+	if (scanMsg.length == 0) {
+		return null
+	}
+	let items = scanMsg.split(';');
+	let header = items[0];
+	let version = items[1];
+	if ((header != undefined) && (version!=undefined)) {
+		var hearList =getDirectoryItemArray(headerType)
+		if(!checkDirectoryItemExist(hearList,header)){
+			let labelResult = {
+				label: {
+					labelType: "",
+					barType: '',
+					code:""
+				},
+				package: null,
+				success: false,
+				message: '请输入'+headerType+"开始的标签",
+			}
+			callBack(labelResult);
+			return;
+		}
+		
+		//解析扫描的是一维码还是二维码
+		let type = header.substring(header.length - 1, header.length);
+		if (type == 'Q') //qrcode
+		{
+			getQRCodeInfo(header, version, scanMsg, callBack);
+		} else if (type == 'B') //barcode
+		{
+			getBarCodeInfo(header, version, items[2], callBack);
+		} else { //直接输入文本
+			getBarCodeInfo('text', 'V1.0', scanMsg, callBack);
+		}
+	}else {
+		let labelResult = {
+			label: {
+				labelType: "",
+				barType: '',
+				code:""
+			},
+			package: null,
+			success: false,
+			message: '标签格式不正确',
+		}
+		callBack(labelResult);
+	}
+}
+
+export function getQRCodeInfo(header, version, scanMsg, callBack) {
+	//获取包装信息
+	let labelItem = labelDic.find(r => r.header == header && r.version == version);
+	if (labelItem == undefined) {
+		let labelResult = {
+			label: {
+				barType: 'QRCode',
+			},
+			package: {},
+			success: true,
+			message: ''
+		}
+		getLabelByHeader(header, version).then(res => {
+			if (res.data==null) {
+				labelResult.success = false;
+				labelResult.message = '未查找到标签头为[' + header + ']的标签类型';
+				callBack(labelResult);
+			} else {
+				let newItem = {
+					header: header,
+					version: version,
+					label: res.data,
+				};
+				
+				labelDic.push(newItem);
+				getLabelItems(newItem, scanMsg, callBack);
+			}
+		}).catch(err => {
+			labelResult.success = false;
+			labelResult.message = err;
+			callBack(err);
+		})
+	} else {
+		getLabelItems(labelItem, scanMsg, callBack);
+	}
+}
+
+export function getLabelItems(labelItem, scanMsg, callBack) {
+	let labelResult = analysisQRCodeLabel(labelItem, scanMsg);
+	if (labelResult.label.labelType == 'PurchaseLabel' || labelResult.label.labelType == 'MakeLabel') {
+		//查询包装信息
+		let packingNumber = labelResult.label.packingNumber
+		if (packingNumber != undefined) {
+			getPackageByNumber(packingNumber).then(pack => {
+				if (pack.data.list.length == 0) {
+					labelResult.success = false;
+					labelResult.message = '包装号[' + packingNumber + ']没有包装信息';
+				} else {
+					labelResult.package = pack.data.list[0];
+					console.log('包装信息', JSON.stringify(labelResult.package))
+				}
+				callBack(labelResult);
+			}).catch(err => {
+				labelResult.success = false;
+				labelResult.message = err;
+				callBack(labelResult);
+			})
+		} else {
+			labelResult.success = false;
+			labelResult.message = '在条码中未解析到箱码';
+			callBack(labelResult);
+		}
+	} else {
+		callBack(labelResult);
+	}
+}
+
+export function analysisQRCodeLabel(labelItem, scanMsg) {
+	let labelResult = {
+		label: {
+			labelType: labelItem.label.labelType,
+			barType: 'QRCode',
+		},
+		package: {},
+		success: true,
+		message: ''
+	}
+	
+	let separators = labelItem.label.separators;
+	if (separators == undefined || separators == null) {
+		labelResult.message = "未读取到分隔符";
+	} else {
+		if (scanMsg.indexOf(separators) < 0) {
+			labelResult.success = false;
+			labelResult.message = "标签格式不正确";
+		} else {
+			try {
+				let scanItems = scanMsg.split(separators);
+				if (scanItems.length > 0) {
+					scanItems.forEach((item, index) => {
+						let type = item.substring(0, 1);
+						let value = item.substring(1, item.length);
+						if (type == 'H') {
+							labelResult.label.header = item;
+						} else if (type == 'V') {
+							labelResult.label.version = item;
+						} else {
+							let barcode = labelItem.label.subList.find(code => code.prefixChar.toUpperCase() ==
+								type
+								.toUpperCase());
+							if (barcode != undefined) {
+								labelResult.label[barcode.code] = value;
+							}
+						}
+					})
+				}
+			} catch (e) {
+				labelResult.message = e.message;
+			}
+
+		}
+	}
+	// console.log('标签', labelResult.label)
+	return labelResult;
+}
+
+export function getBarCodeInfo(header, version, value, callBack) {
+	let labelResult = {
+		label: {
+			labelType: header,
+			barType: 'BarCode',
+			code:value
+		},
+		package: null,
+		success: true,
+		message: '',
+	}
+	callBack(labelResult);
+}
diff --git a/common/record.js b/common/record.js
new file mode 100644
index 0000000..f4a988c
--- /dev/null
+++ b/common/record.js
@@ -0,0 +1,91 @@
+import {
+	getBusinesstypeByCode
+} from '@/api/request2.js';
+
+import {
+	getDirectoryItemArray,
+} from '@/common/directory.js';
+import { calc } from '@/common/calc'
+import { Decimal } from 'decimal.js';//引入
+	import {
+		deepCopyData
+	} from '@/common/basic.js';
+
+export function createItemInfo(balance, pack) {
+	let item = {
+		itemCode: pack.itemCode,
+		itemName: pack.itemName,
+		stdPackQty: pack.stdPackQty,
+		stdPackUnit: pack.stdPackUnit,
+		qty: new Decimal(balance.qty).toNumber(),
+		handleQty:new Decimal(0).toNumber(),
+		uom: pack.uom,
+		subList: []
+	}
+	return item;
+}
+
+export function createDetailInfo(balance, pack) {
+	balance.scaned = true;
+	// data.toInventoryStatus = this.toInventoryStatus == "" ? data.inventoryStatus : this.toInventoryStatus;
+	// data.inventoryStatus = data.inventoryStatus;
+	let detail = deepCopyData(balance);
+	detail.balanceQty = new Decimal(detail.qty).toNumber()
+	detail.qty = new Decimal(detail.qty).toNumber();
+	detail.stdPackQty = new Decimal(pack.stdPackQty).toNumber()
+	detail.stdPackUnit = pack.stdPackUnit
+	detail.handleQty =  new Decimal(detail.qty).toNumber() ;
+	detail.package = pack;
+
+	return detail;
+}
+
+//计算实际数量
+export function calcHandleQty(detailSource) {
+	for (let item of detailSource) {
+		item.handleQty = new Decimal(0).toNumber();
+		item.qty = new Decimal(0).toNumber();
+		for (let detail of item.subList) {
+			if(detail!=undefined){
+				if(detail.scaned){
+					item.handleQty = calc.add(item.handleQty,detail.handleQty);
+				}
+				item.qty = calc.add(item.qty,detail.qty); 
+			}
+		}
+	}
+}
+
+export function getBusinessType(typeCode, callback) {
+	let result = {
+		success: true,
+		businessType: '',
+		fromlocationTypeList: '',
+		tolocationTypeList: '',
+		itemCodeTypeList:"",
+		useOnTheWay:"FALSE",
+		fromInventoryStatuses: '',
+		toInventoryStatuses: '',
+		message: ''
+	};
+	getBusinesstypeByCode(typeCode).then(res => {
+		if (res.data.total > 0) {
+			result.businessType = res.data.list[0];
+			result.fromlocationTypeList = getDirectoryItemArray(res.data.list[0].outLocationTypes)
+			result.tolocationTypeList = getDirectoryItemArray(res.data.list[0].inLocationTypes)
+			result.itemCodeTypeList = getDirectoryItemArray(res.data.list[0].itemTypes)
+			result.fromInventoryStatuses = res.data.list[0].outInventoryStatuses;
+			result.toInventoryStatuses = res.data.list[0].inInventoryStatuses;
+			result.useOnTheWay =res.data.list[0].useOnTheWay
+			callback(result)
+		} else {
+			result.success = false;
+			result.message = '业务类型[' + typeCode + ']获取失败';
+			callback(result)
+		}
+	}).catch(error => {
+		result.success = false;
+		result.message = error;
+		callback(result)
+	})
+}
diff --git a/common/style/PDA_style-delete.css b/common/style/PDA_style-delete.css
new file mode 100644
index 0000000..47edd46
--- /dev/null
+++ b/common/style/PDA_style-delete.css
@@ -0,0 +1,221 @@
+
+@media screen and (min-width:400px) {
+	uni-app, uni-page-head{
+		height: 60px;
+	}
+	uni-page-head .uni-page-head{
+		height: 60px !important;
+	}
+	uni-page-head[uni-page-head-type=default]~uni-page-wrapper{
+		height: calc(100% - 70px) !important;
+	}
+	uni-page-head .uni-page-head__title{
+		font-size: 1.125rem !important;
+		line-height: 40px !important;
+		font-weight: normal !important;
+	}
+	uni-page-head .uni-btn-icon{
+		font-size: 1.725rem !important;
+	}
+	.font_xs{
+		font-size: 0.825rem !important;
+	}
+	.font_xl{
+		font-size: 1.325rem !important;
+	}
+	.mini-type-style{
+		font-size: 0.8rem !important;
+	}
+	.cen_card .label_box .label_info uni-text{
+		line-height: 1.725 !important;
+		/* font-size: 1rem !important; */
+		color: #333;
+	}
+	.cen_card .label_box .label_info{
+		background-color: #eee !important;
+	}
+	.popup_box .detail-list{
+		box-shadow: none !important;
+	}
+	.detail-list,.device-detail{
+		box-shadow: 0 0 10px rgba(0, 0, 0, 0.15) !important;
+	}
+	.list_form .uni-table-tr{
+		background-color: #f0f0f0 !important;
+	}
+	.list_form .uni-table-th{
+		border-bottom: 1px solid #cfcfcf !important;
+	}
+	/* yuanswitch 
+	.require_wrap{
+		padding-top: 0 !important;
+	}
+	.require_wrap .require_cell{
+		line-height: 1.75 !important;
+	}
+	.ljh_box .tit_ljh{
+		font-size: 1.25rem !important;
+	}
+	.cen_card .label_box .label_info {
+		background-color: #eee !important;
+	}
+	.cen_card .label_box .label_info uni-image{
+		width: 48rpx !important;
+		height: 48rpx !important;
+	}
+	
+	.cen_card .label_box .label_info uni-text{
+		line-height: 1.5 !important;
+		font-size: 1rem !important;
+		color: #333;
+	}
+	.ljh_box .tit_ljh .state-style, .top_card .state-style{
+		font-size: 0.8rem !important;
+	}
+	.card_task .ljh_box{
+		margin-bottom: 0 !important;
+	}
+	.task_num uni-image{
+		width: 56rpx !important;
+		height: 56rpx !important;
+	}
+	.task_num uni-text{
+		font-size: 1rem !important; 
+	}
+	.pda_receipt_label .label_order uni-text{
+		font-size: 1rem;
+		color: #434556;
+	}
+	.pda_receipt_label .icon_normal{
+		width: 56rpx;
+		height: 56rpx;
+	}
+	.pda_receipt_bot .icon_normal{
+		width: 56rpx;
+		height: 56rpx;
+		float: left;
+	}
+	.pda_receipt_bot .text_darkblue{
+		float: left;
+		font-size: 1rem;
+		margin-top: 8rpx;
+		display: inline-block;
+	}*/
+	.top_card .text_lightblue{
+		font-size: 1rem !important;
+	}
+	.top_card .cell_box .cell_info{
+		margin-bottom: 0;
+	}
+	.uni-tab-item-title{
+		font-size: 1.125rem !important;
+	}
+	.cell_box .cell_info uni-view{
+		font-size: 1rem !important;
+		color: #101010 !important;
+	}
+	.cell_box .cell_info .text_lightblue{
+		font-size: 0.875rem !important;
+		color: #6A6E7A !important;
+	}
+	.cell_box .cell_info .text_black{
+		font-size: 1.125rem !important;
+		
+	}
+	.scan_float uni-image{
+		margin-top: 18rpx !important;
+	}
+	.scan_float uni-view{
+		font-size: 0.875rem !important;
+		letter-spacing: 1px;
+	}
+	.new_btn_bot .new_save_btn,.popup_box .pop_title uni-text{
+		font-size: 1rem !important;		
+	}
+	.bot_card{
+		background-color: #eee !important;
+	}
+	.bot_card_item uni-text{
+		font-size: 0.8rem !important;
+		font-weight: 600;
+	}
+	.summary_state .state_point{
+		font-size: 1rem !important;
+	}
+	.summary_item label{
+		float: left;
+	}
+	.summary_item uni-text{
+		font-size: 1.125rem !important;
+		font-weight: normal !important;
+		float: left;
+	}
+	/* popup */
+	.popup_box{
+		box-sizing: border-box;
+	}
+	.popup_box .uni-steps{
+		width:100%;
+		overflow-x: hidden;
+	}
+	.popup_box .uni-steps__row-line-item{
+		height: 60rpx !important;
+	}
+	.popup_box .uni-steps__row-text-container{
+		margin-top: 0 !important;
+	}
+	.popup_box,.uni-popup .uni-scroll-view-content{
+		border-top-left-radius:30rpx !important;
+		border-top-right-radius:30rpx !important;
+	}
+	.popup_box .pop_title{
+		font-size: 1.125rem !important;
+		letter-spacing: 1px;
+	}
+	.popup_box .pop_tab .tab_tit{
+		font-size: 0.875rem !important;
+	}
+	.popup_box .pop_tab .tab_tit_active{
+		font-size: 1rem !important;
+	}
+	.popup_box .pop_tab .tab_info{
+		min-height: 200rpx !important;
+	}
+	.popup_box .pop_tab .tab_info uni-textarea{
+		height: 200rpx;
+	}
+	.popup_box .pop_tab .tab_info uni-button{
+		font-size: 0.875rem !important;
+		letter-spacing: 1px;
+	}
+	/*底部按钮*/
+	.new_btn_bot .new_save_btn{
+		background-color: #E4EAFF !important;
+		height: 50px;
+		line-height: 50px;
+	}
+	.new_btn_bot .new_clear_btn{
+		font-size: 1rem !important;
+		line-height: 50px;
+	}
+	.scroll-detail{
+		padding-bottom: 70px !important;
+	}
+	.count_shadow,.device-detail{
+		box-shadow: 0 0 20rpx rgba(0,0,0,0.2);
+	}
+	.list_info {
+		padding: 0 20rpx 20rpx;
+		margin-top: 0;
+	}
+	.uni-scroll-view-content .creattp_list{
+		width: 100% !important;
+	}
+	.creattp_list .uni-list .list_cell uni-text{
+		font-weight: bold;
+	}
+	.popup_box .scan_scroll{
+		max-height: 44vh !important;
+		
+	}
+}
diff --git a/common/style/new_style.css b/common/style/new_style.css
new file mode 100644
index 0000000..83a2cd4
--- /dev/null
+++ b/common/style/new_style.css
@@ -0,0 +1,2749 @@
+/*WMY 20220818 cssv1.0*/
+/*公共*/
+uni-page-head .uni-page-head {
+	z-index: 98 !important;
+	background-color: #fff !important;
+}
+
+uni-page-head .uni-page-head__title {
+	font-weight: normal;
+}
+
+.whole {
+	width: 100%;
+}
+
+.fl {
+	float: left;
+}
+
+.fr {
+	float: right;
+}
+
+.tc {
+	text-align: center;
+}
+
+.text_bold {
+	font-weight: bold;
+}
+
+.text_black {
+	color: #101010;
+}
+
+.text_packingCode {
+	color: #101010;
+	word-break: break-all;
+}
+
+.text_lightblue {
+	color: #6A6E7A;
+}
+
+.text_darkblue {
+	color: #434556;
+}
+
+.text_blue {
+	color: #5A7CF3;
+}
+
+.font_xs {
+	font-size: 0.775rem;
+}
+
+.font_sm {
+	font-size: 0.825rem;
+}
+
+.font_xl {
+	font-size: 1.125rem;
+}
+
+.margin_top {
+	margin-top: 20rpx;
+}
+
+.margin_bottom {
+	margin-bottom: 20rpx;
+}
+
+.margin_xs_top {
+	margin-top: 10rpx;
+}
+
+.margin_xs_bottom {
+	margin-bottom: 10rpx;
+}
+
+.margin_right {
+	margin-right: 20rpx;
+}
+
+.margin {
+	margin: 20rpx;
+}
+
+.padding_10 {
+	padding: 10rpx;
+}
+
+.padding_15 {
+	padding: 15rpx;
+}
+
+.padding_20 {
+	padding: 20rpx;
+}
+
+.padding {
+	padding: 20rpx;
+}
+
+.padding_bottom {
+	padding-bottom: 20rpx;
+}
+
+.nopad {
+	padding: 0 !important;
+}
+
+.nopad_bot {
+	padding-bottom: 0 !important;
+}
+
+/* 
+物料状态 
+未知，可用，隔离，新增，规划，禁用
+*/
+
+.item_active {
+	background-color: #5FCB94;
+	color: #FFFFFF;
+}
+
+.item_hold {
+	background-color: #FF4206;
+	color: #FFFFFF;
+}
+
+.item_new {
+	background-color: #E6A23C;
+	color: #FFFFFF;
+}
+
+.item_plan {
+	background-color: #2677F9;
+	color: #FFFFFF;
+}
+
+.item_disable {
+	background-color: #666;
+	color: #FFFFFF;
+}
+
+/* 器具状态 */
+.container_empty {
+	background-color: #FF4206;
+	color: #FFFFFF;
+}
+
+.container_useing {
+	background-color: #5FCB94;
+	color: #FFFFFF;
+}
+
+
+.container_repair {
+	background-color: #666;
+	color: #FFFFFF;
+}
+
+.container_scrap {
+	background-color: #E6A23C;
+	color: #FFFFFF;
+}
+
+
+
+.scan_float {
+	position: fixed;
+	z-index: 10;
+	right: 20rpx;
+	bottom: 20%;
+	width: 110rpx;
+	height: 110rpx;
+	background-color: #5A7CF3;
+	border-radius: 50%;
+	text-align: center;
+	box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
+	opacity: 0.8;
+}
+
+.scan_float image {
+	width: 40rpx;
+	height: 40rpx;
+	margin-top: 10rpx;
+}
+
+.scan_float view {
+	color: #fff;
+	font-size: .725rem;
+	margin-top: -8rpx;
+}
+
+.top_card {
+	background-color: #5A7CF3;
+	overflow: hidden;
+	/* padding: 20rpx 0; */
+}
+
+.top_card .device-detail {
+	/* margin-top: 0 !important; */
+}
+
+.top_card .mini-type-style {
+	color: #fff !important;
+	font-weight: normal;
+	height: 46rpx;
+}
+
+.cen_card {
+	padding: 0 0rpx;
+	width: 100%;
+	box-sizing: border-box;
+	float: left;
+}
+
+.cell_box {
+	width: 100%;
+}
+
+.cell_box .cell_info {
+	position: relative;
+	/* width: 25%; */
+	padding: 0 20rpx;
+	/* margin: 0 0 20rpx; */
+	text-align: center;
+}
+
+.cell_box .cell_long {
+	/* width: 33%; */
+}
+
+.cell_box .cell_info view {
+	font-size: 0.9375rem;
+	margin-bottom: 10rpx;
+	color: #7B8195;
+}
+
+.cell_box .cell_info .text_black {
+	font-size: 0.875rem;
+	color: #101010;
+}
+
+.cell_box .cell_info .text_lightblue {
+	color: #949CB6;
+	font-size: 0.8rem;
+}
+
+.cell_box .cell_info::after {
+	position: absolute;
+	content: "";
+	right: 0;
+	top: 50%;
+	transform: translateY(-50%);
+	width: 1px;
+	height: 20px;
+	background-color: #ddd;
+}
+
+.cell_box .cell_info:last-child::after {
+	width: 0;
+}
+
+.cen_card .label_box {
+	margin-bottom: 20rpx;
+}
+
+.cen_card .label_box .label_info {
+	background-color: #eee;
+	color: #434556;
+	font-size: 0.875rem;
+	padding: 8rpx;
+	border-radius: 8rpx;
+	margin-right: 10rpx;
+	vertical-align: middle;
+}
+
+.cen_card .label_box .label_info image {
+	/* float: left; */
+	vertical-align: middle;
+}
+
+.cen_card .label_box .label_info text {
+	/* line-height: 1.25; */
+	/* float: left; */
+	vertical-align: middle;
+}
+
+.photo_btn {
+	background-color: #ececec;
+	color: #5A7CF3;
+	font-size: 0.875rem;
+	padding: 8rpx 10rpx;
+	border-radius: 8rpx;
+}
+
+.photo_btn text {
+	line-height: 1.5;
+}
+
+.cen_card .cell_box .text_black {
+	font-size: 0.875rem;
+}
+
+.cen_card .cell_box .cell_info .text_lightblue {
+	font-size: 0.925rem;
+}
+
+.bot_card {
+	background-color: #f8f8f8;
+	padding: 16rpx;
+	overflow: hidden;
+}
+
+.bot_card_item {
+	width: 50%;
+	text-align: left;
+	height: 60rpx;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+/* .item_long{
+	width: 32% !important;
+}
+*/
+.item_short {
+	width: 20%;
+}
+
+.bot_card_item uni-text {
+	font-size: .725rem;
+	margin-left: 4rpx;
+	color: #333333;
+	background-color: transparent;
+}
+
+.bot_card_item .icon_state {
+	float: left;
+	margin-top: 22rpx;
+}
+
+.summary_wrap {
+	padding: 20rpx;
+	padding-top: 0;
+}
+
+.summary_state .state_point {
+	font-size: 0.825rem;
+}
+
+.summary_item uni-text {
+	font-size: 0.825rem;
+}
+
+.bot_card_item uni-text.state_point {
+	background-color: transparent;
+}
+
+.bot_card_item label {
+	vertical-align: middle;
+}
+
+.icon_normal {
+	width: 58rpx;
+	height: 58rpx;
+	vertical-align: middle
+}
+
+.bot_card_item .icon_normal {
+	float: left;
+	width: 46rpx;
+	height: 46rpx;
+}
+
+.icon_bg {
+	display: inline-block;
+	width: 46rpx;
+	height: 46rpx;
+	border-radius: 4rpx;
+}
+
+.icon_bg_xm {
+	background-color: #45B5F3;
+}
+
+.icon_bg_kw {
+	background-color: #5A7CF3;
+}
+
+.icon_bg_pc {
+	background-color: #BF94EB;
+}
+
+.icon_state {
+	display: inline-block;
+	width: 20rpx;
+	height: 20rpx;
+	border-radius: 50%;
+}
+
+.state_point {
+	background: none;
+}
+
+.title_tab {
+	display: flex;
+	justify-content: center;
+	height: 100rpx;
+}
+
+.bottom {
+	padding: 0 !important;
+}
+
+.uni-popup .uni-scroll-view {
+	overflow: visible !important;
+}
+
+.uni-popup .uni-scroll-view-content {
+	overflow-y: scroll;
+	max-height: 94vh;
+	background-color: #fff;
+	border-top-left-radius: 20rpx;
+	border-top-right-radius: 20rpx;
+}
+
+.uni-popup .scroll-Y {
+	padding-bottom: 0;
+}
+
+.popup_box {
+	position: relative;
+	border-top-left-radius: 16rpx;
+	border-top-right-radius: 16rpx;
+	background: #fff url(@/static/icons_ui/popup_bot_bg.png) no-repeat left top;
+	background-size: 100%;
+	max-height: 93vh;
+}
+
+.popup_box .pop_title {
+	font-size: 0.9rem;
+	font-weight: bold;
+	color: #fff;
+	padding: 20rpx 20rpx;
+	font-size: 35rpx;
+}
+
+.popup_box .pop_title text {
+	font-size: 0.9rem;
+	font-weight: normal;
+}
+
+.popup_box .uni-steps {
+	width: 98%;
+}
+
+.popup_box .top_bg {
+	width: 100%;
+	height: inherit;
+}
+
+.popup_box .pop_tab {
+	padding: 20rpx;
+	box-sizing: border-box;
+	width: 100%;
+}
+
+.popup_box .pop_tab .tab_tit {
+	font-size: .825rem;
+	text-align: center;
+	color: #333;
+	background-color: #fff;
+	/* width: 30%; */
+	box-sizing: border-box;
+	padding: 10rpx 16rpx;
+	border-top-left-radius: 8rpx;
+	border-top-right-radius: 8rpx;
+	margin-right: 6rpx;
+}
+
+.popup_box .pop_tab .tab_tit_active {
+	color: #5A7CF3;
+	font-weight: bold;
+	/* font-size: 0.875rem; */
+}
+
+.popup_box .pop_tab .tab_info {
+	position: relative;
+	background-color: #fff;
+	border-radius: 8rpx;
+	box-shadow: 0 6rpx 20rpx rgba(90, 124, 143, 0.1);
+	min-height: 100rpx;
+}
+
+.popup_box .pop_tab .tab_info textarea {
+	height: 320rpx;
+}
+
+.popup_box .pop_tab .tab_info .uni-textarea-placeholder {
+	font-size: 0.825rem;
+}
+
+.popup_box .scan_scroll {
+	max-height: 41vh;
+	width: 100%;
+	overflow-x: hidden;
+	overflow-y: scroll;
+}
+
+.popup_box .scan_scroll .uni-scroll-view-content {
+	/* width: 104%; */
+	overflow-x: hidden;
+	background-color: transparent;
+}
+
+.popup_box .pop_tab .next_info {
+	box-shadow: 0 0 20rpx rgba(90, 124, 143, 0.1);
+}
+
+.popup_box .pop_tab .tab_notitle {
+	border-radius: 8rpx;
+}
+
+.popup_box .pop_tab .tab_info button {
+	position: absolute;
+	bottom: 10rpx;
+	right: 20rpx;
+	background: #3C9CFF;
+	color: #fff;
+	border: 0;
+	border-radius: 8rpx;
+	width: 130rpx;
+	float: right;
+	font-size: .725rem;
+}
+
+.popup_box .pop_tab .tab_info textarea {
+	padding-top: 20rpx;
+}
+
+.list_wrap {
+	margin: 20rpx;
+}
+
+.ljh_box {
+	padding: 20rpx;
+	z-index: 10;
+	width: 100%;
+	float: left;
+	box-sizing: border-box;
+}
+
+.ljh_left {
+	margin-top: 10rpx;
+}
+
+/* .ljh_right{
+	float: right;
+} */
+.ljh_right uni-text {
+	line-height: 1.5;
+}
+
+.ljh_right .tnum .num_edit {
+	background-color: #FFF9DB;
+	width: 150rpx;
+}
+
+.ljh_right .tnum {
+	font-size: 1.25rem;
+	color: #EC5B28;
+	font-weight: bold;
+	margin-right: 4rpx;
+}
+
+.ljh_right .tunit {
+	font-size: 0.875rem;
+	color: #F5AB91;
+}
+
+.ljh_box .tit_ljh {
+	line-height: 1.5;
+	font-size: 0.875rem;
+	color: #101010;
+	font-weight: bold;
+	word-break: break-all;
+}
+
+.ljh_box .tit_ljh .mini-type-style {
+	float: left;
+	margin-top: 10rpx;
+	padding: 0 8rpx;
+	font-size: 0.725rem;
+}
+
+.ljh_box .tit_ljh .state-style,
+.top_card .state-style {
+	font-size: .625rem;
+	padding: 4rpx 6rpx;
+	margin-right: 8rpx;
+	vertical-align: middle;
+	font-weight: normal;
+	border-radius: 4rpx;
+	color: #fff;
+}
+
+.ljh_box .tit_ljh .state-style {
+	/* padding: 6rpx; */
+}
+
+.ljh_box .tit_ljh text {
+	float: left;
+}
+
+.ljh_box .desc_ljh {
+	line-height: 1.5;
+}
+
+.label_normal {
+	margin-top: 20rpx;
+}
+
+.label_normal .label_col image {
+	float: left;
+	vertical-align: middle;
+}
+
+.label_normal .label_col text {
+	font-size: 0.825rem;
+	line-height: 1.25;
+	float: left;
+	color: #434556;
+}
+
+.lo_cellbox {
+	margin-top: 20rpx;
+}
+
+.lo_cellbox .cell_info {
+	margin-bottom: 0;
+}
+
+/*提交按钮*/
+.new_btn_bot {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	box-sizing: border-box;
+	width: 100%;
+	background-color: #fff;
+	padding: 20rpx;
+	z-index: 10;
+	box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.2);
+}
+
+.bot_pos {
+	position: initial;
+}
+
+.new_btn_bot .new_save_btn {
+	background-color: #E7ECFF;
+	color: #5A7CF3;
+	font-size: .875rem;
+}
+
+.new_btn_bot .new_clear_btn {
+	background-color: #FFDADD;
+	color: #f00;
+	font-size: .875rem;
+	margin-right: 20rpx;
+}
+
+.new_btn_bot .new_cancel_btn {
+	background-color: #eee;
+	color: #333;
+	font-size: .875rem;
+	margin-right: 20rpx;
+}
+
+.new_btn_bot .btn_double {
+	width: 50%;
+}
+
+.new_btn_bot uni-button:after {
+	border: 0;
+}
+
+.choose_main {
+	position: relative;
+	z-index: 2;
+}
+
+.choose_layout {
+	position: relative;
+	width: 100%;
+	height: 130rpx;
+	background-color: #fff;
+
+}
+
+.choose_icon_layout {
+	position: absolute;
+	right: 160rpx;
+	top: 10rpx;
+	bottom: 0rpx;
+	/* width: 100rpx;
+	height:100rpx; */
+}
+
+.choose_icon {
+	margin-top: 5rpx;
+	margin-bottom: 10rpx;
+	width: 100rpx;
+	height: 100rpx;
+}
+
+.choose_marked {
+	position: absolute;
+	width: 100%;
+	/* height: 100%; */
+	top: 0;
+	left: 0;
+	bottom: 0;
+	right: 0;
+	border-top: 6rpx solid #5FCB94;
+	background-image: linear-gradient(rgba(95, 203, 148, 0.5), rgba(95, 203, 148, 0));
+	border-top-left-radius: 16rpx;
+	border-top-right-radius: 16rpx;
+}
+
+.choose_marked_faild {
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	border-top: 6rpx solid #FF0000;
+	background-image: linear-gradient(rgba(255, 100, 97, 0.3), rgba(255, 100, 97, 0));
+	border-top-left-radius: 16rpx;
+	border-top-right-radius: 16rpx;
+}
+
+.nodeliver_tag {
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	border-top-left-radius: 16rpx;
+	border-top-right-radius: 16rpx;
+	border-top: 6rpx solid #F54D4D;
+	background-image: linear-gradient(rgba(245, 77, 77, 0.1), rgba(245, 77, 77, 0));
+
+}
+
+.choose_marked image {
+	float: right;
+	margin-right: 28%;
+	margin-top: 20rpx;
+	width: 120rpx;
+	height: 120rpx;
+}
+
+.choose_marked_faild image {
+	float: right;
+	margin-right: 28%;
+	margin-top: 20rpx;
+	width: 120rpx;
+	height: 120rpx;
+}
+
+.pop_list {
+	background-color: #fff;
+	/* padding: 20rpx; */
+	padding-top: 0;
+	margin-top: 20rpx;
+}
+
+.uni-scroll-view-content .creattp_list {
+	padding: 6rpx 20rpx 0;
+	box-sizing: border-box;
+	width: 96%;
+}
+
+.list_info .uni-scroll-view-content {
+	max-height: 10vh;
+}
+
+.pop_list .detail-content {
+	margin-bottom: 20rpx;
+	border-radius: 16rpx;
+	overflow: hidden;
+	box-shadow: 0 0 14rpx rgba(0, 0, 0, 0.1);
+}
+
+.pop_btn {
+	padding: 20rpx;
+	padding-top: 0;
+}
+
+.pop_btn button {
+	width: 49%;
+	height: 90rpx;
+	line-height: 90rpx;
+	font-size: 0.875rem;
+	margin: 0;
+	color: #333;
+}
+
+.pop_btn button::after {
+	border: 0;
+}
+
+.pop_btn .cancel {
+	background-color: #eee;
+}
+
+.pop_btn .save {
+	background-color: #5A7CF3;
+	color: #fff;
+}
+
+.popinpop {
+	margin: 10px 1%;
+	border-radius: 8px;
+	background-color: #fff;
+	color: #666666;
+	line-height: 1.5;
+	box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.1);
+	width: 98%;
+
+}
+
+.scan_btn:after {
+	border: 8rpx;
+}
+
+.popup_box .pop_tab .tab_info .clean_scan_btn {
+	background-color: #eee;
+	color: #333;
+	margin-right: 140rpx;
+	border-radius: 8rpx;
+}
+
+.popup_box .pop_tab .tab_info .clean_scan_btn::after {
+	border: 0;
+}
+
+/*检验任务-topline*/
+.card_task {
+	padding: 20rpx;
+	padding-bottom: 0;
+}
+
+.task_num {
+	border-bottom: 1px solid #eee;
+	padding-bottom: 10rpx;
+	margin-bottom: 10rpx;
+	overflow: hidden;
+}
+
+.top_card .task_num {
+	border: 0;
+}
+
+.task_num image {
+	vertical-align: middle;
+	margin-right: 10rpx;
+}
+
+.task_num text {
+	color: #333;
+	vertical-align: middle;
+}
+
+.label_order image {
+	/* vertical-align: text-bottom; */
+	vertical-align: middle;
+}
+
+.label_order text {
+	font-size: .825rem;
+	vertical-align: middle;
+}
+
+.tit_jxs {
+	font-size: 1rem !important;
+	margin-bottom: 10rpx;
+}
+
+.tit_jxs .state-style {
+	vertical-align: middle;
+	margin-top: 6rpx;
+}
+
+/* 为按序发货添加 */
+/* .state-style{
+	background-color: #ececec;
+} */
+.receipt_bot {
+	justify-content: space-between;
+	border-top: 1px solid #eee;
+	padding-top: 10rpx;
+}
+
+/*收货列表*/
+.require_wrap {
+	background-color: #fff;
+	padding: 20rpx;
+}
+
+.require_wrap uni-button:after {
+	border: 0;
+}
+
+.require_wrap .require_cell {
+	background: #f5f5f5;
+	font-size: .825rem;
+	padding: 10rpx 20rpx;
+	margin-right: 20rpx;
+	border-radius: 50rpx;
+	line-height: 1.5;
+	margin-left: 0;
+	border: 1px solid #f5f5f5;
+}
+
+.require_wrap .require_active {
+	border: 1px solid #5A7CF3;
+	background-color: #EFF6FF;
+	color: #5A7CF3;
+}
+
+.require_wrap .require_active text {
+	display: inline-block;
+	width: 20rpx;
+	height: 20rpx;
+	background-color: #5A7CF3;
+	border-radius: 50%;
+	float: left;
+	margin: 12rpx 10rpx 12rpx 0;
+}
+
+.list_inspect .uni-input-input {
+	color: #f00;
+}
+
+.list_form {
+	padding: 20rpx;
+	padding-top: 0;
+}
+
+.list_form .uni-table-tr {
+	background-color: #f8f8f8;
+	color: red;
+}
+
+.list_form .uni-table-th {
+	padding: 10rpx !important;
+	border-bottom: 1px solid #ececec;
+	font-weight: normal !important;
+	font-size: 0.775rem;
+	color: red;
+}
+
+.list_form .uni-easyinput {
+	background-color: #FFF9DB;
+}
+
+.list_form .uni-easyinput__content {
+	min-height: 50rpx !important;
+	text-align: center;
+}
+
+.count_shadow {
+	box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.1);
+}
+
+.count_list {
+	font-size: 0.8rem;
+	color: #0F5EFF;
+	padding: 10rpx 0;
+}
+
+.count_list text:first-child {
+	margin-left: 0;
+}
+
+.count_list text {
+	margin: 10rpx;
+}
+
+.popuni_list::after {
+	height: 0 !important;
+}
+
+.uni-list .list_cell {
+	margin-bottom: 20rpx;
+	height: 100rpx;
+	align-items: center;
+	box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.1);
+}
+
+.uni-list .list_cell:last-child {
+	margin-bottom: 0;
+}
+
+.uni-list .list_cell .is-input-border {
+	border: 0;
+}
+
+.uni-list .list_cell .title {
+	padding-left: 20rpx;
+	font-size: 0.875rem;
+}
+
+.uni-list .list_cell .info {
+	padding-right: 20rpx;
+	color: #333;
+	font-size: 0.875rem;
+}
+
+.popuni_list .list_cell {
+	background-color: #fff;
+	border-radius: 8rpx;
+	box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.1);
+}
+
+.popuni_list .list_cell .uni-data-tree-input {
+	padding-left: 0;
+}
+
+.popuni_list .list_cell .input-value-border {
+	border: 0;
+	padding: 0;
+}
+
+.popuni_list .list_cell .selected-list {
+	padding-left: 0;
+}
+
+/* .uni-list .list_cell .necessary_tag{
+	padding-right: 0;
+	color: #f00;
+} */
+.uni-list .list_cell .uni-easyinput {
+	padding-right: 20rpx;
+	text-align: right;
+	box-sizing: border-box;
+	border: 0;
+}
+
+.uni-list .list_cell .uni-input-input {
+	font-size: 0.875rem;
+}
+
+.list_card {
+	margin-top: 20rpx;
+	box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.1);
+}
+
+.list_card:first-child {
+	margin-top: 10rpx;
+}
+
+.inspect_form .uni-label {
+	font-size: 0.875rem;
+}
+
+.pda-list-cell-db .is-input-border,
+.pda-list-cell-db .input-value-border {
+	border: 0 !important;
+}
+
+.list_locode {
+	padding: 20rpx;
+	padding-top: 0;
+}
+
+.inspect_card {
+	background-color: #fff;
+	margin: 20rpx;
+	border-radius: 16rpx;
+}
+
+.inspect_card .ljh_box text {
+	line-height: 1.75;
+}
+
+.inspect_list_locode {
+	border-bottom: 1px solid #eee;
+	padding-bottom: 20rpx;
+}
+
+.inspect_list_locode image {
+	vertical-align: middle;
+}
+
+.default_nodata {
+	position: relative;
+	left: 50%;
+	transform: translateX(-50%);
+	margin-top: 100rpx;
+	width: 390rpx;
+	height: 300rpx;
+
+}
+
+
+.default_goscan {
+	width: 100%;
+}
+
+.default_goscan .img_goscan {
+	position: relative;
+	width: 500rpx;
+	height: 500rpx;
+	left: 50%;
+	transform: translateX(-50%);
+}
+
+.default_goscan button {
+	width: 60%;
+	height: 100rpx;
+	background-color: #5A7CF3;
+	color: #fff;
+	border-radius: 50rpx;
+	text-align: center;
+	line-height: 100rpx;
+}
+
+.default_goscan button image {
+	width: 30rpx;
+	height: 30rpx;
+	margin-right: 20rpx;
+	vertical-align: middle;
+	margin-top: -8rpx;
+
+}
+
+.new_bot_box {
+	position: fixed;
+	width: 100%;
+	left: 0;
+	bottom: 0;
+	background-color: transparent;
+	z-index: 10;
+}
+
+.new_bot_box .uni-collapse {
+	background-color: transparent !important;
+}
+
+.new_bot_box .uni-collapse-item__title.uni-collapse-item-border {
+	width: 96%;
+	margin: 0 2%;
+	border-top-left-radius: 16rpx;
+	border-top-right-radius: 16rpx;
+	overflow: hidden;
+	text-align: center;
+}
+
+.new_bot_box .uni-collapse-item__title-text {
+	padding-left: 40rpx;
+}
+
+.new_bot_box .uni-collapse-item__title.uni-collapse-item-border,
+.new_bot_box .uni-collapse-item__title-box {
+	background-color: #7B8195 !important;
+	color: #fff !important;
+}
+
+.new_bot_box .uni-collapse-item__title-box {
+	height: 80rpx !important;
+	line-height: 80rpx !important;
+}
+
+.new_bot_box .content {
+	background-color: #fff !important;
+}
+
+.new_bot_box .content .uni-easyinput {
+	box-sizing: border-box;
+}
+
+.new_bot_box .content .uni-data-picker,
+.new_bot_box .input-value,
+.new_bot_box .uni-input-input,
+.new_bot_box .selected-item,
+.new_bot_box .placeholder,
+.new_bot_box .uni-easyinput__content-input {
+	font-size: 0.875rem !important;
+}
+
+.new_bot_box .content .tit_bot_box {
+	padding: 20rpx 20rpx 10rpx;
+	font-size: 0.875rem;
+}
+
+.new_bot_box .uni-collapse-item__wrap-content.uni-collapse-item--border {
+	border: 0;
+}
+
+.new_bot_box .border .uni-easyinput {
+	border: 1px solid #e5e5e5;
+	border-radius: 10rpx;
+}
+
+.hold_form .uni-table-th-content {
+	font-weight: normal;
+	font-size: 0.775rem;
+}
+
+.top_wrap {
+	padding: 20rpx;
+	background-color: #fff;
+}
+
+.top_wrap .top_card {
+	border-radius: 8px;
+	color: #fff;
+	line-height: 100rpx;
+}
+
+.top_wrap .top_card .top_lines_info {
+	padding: 0 20rpx;
+}
+
+.top_wrap .top_card .top_lines_info text {
+	font-size: 0.9rem;
+	margin-left: 10rpx;
+}
+
+/* 按序收货 */
+.recept_form {
+	padding: 20rpx;
+}
+
+.recept_form .form_title {
+	padding: 20rpx 20rpx 0;
+}
+
+.recept_form .form_title image {
+	float: left;
+	margin-top: 10rpx;
+	margin-right: 10rpx;
+}
+
+.recept_form .form_title text {
+	font-size: 1rem;
+	vertical-align: middle;
+}
+
+.recept_form .table--border {
+	border: 0 !important;
+}
+
+.recept_form th {
+	background-color: #F3F6FF;
+	color: #434556 !important;
+}
+
+.recept_form th.table--border,
+.recept_form td.table--border {
+	border: 0;
+}
+
+.recept_form .recept_form_info {
+	background-color: #fff;
+	border-radius: 16rpx;
+	padding-bottom: 16rpx;
+}
+
+.recept_form .uni-table-td {
+	font-size: 0.8rem;
+}
+
+/* 天津发货详情 */
+.deliver_card {
+	flex: 1;
+	line-height: 30px;
+	margin: 20rpx 20rpx 0;
+	border-radius: 16rpx;
+	overflow: hidden;
+	background-color: transparent;
+	position: relative;
+	border-bottom-color: #f5f5f5;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+}
+
+.deliver_card .card_info {
+	background-color: #fff;
+}
+
+.deliver_card .deliverState {
+	background-color: #fff;
+	padding: 20rpx 10rpx;
+	background-color: transparent;
+	border-left: 10rpx solid transparent;
+}
+
+.deliver_card .deliverState .content-text image {
+	vertical-align: text-bottom;
+	margin-right: 6rpx;
+}
+
+.deliver_card .deliverState .content-text text {
+	margin-right: 10rpx;
+}
+
+.deliver_card .deliverState1 {
+	background-color: #fff;
+	border-left: 10rpx solid #F6CB61;
+}
+
+.deliver_card .deliverState3 {
+	background-color: #fff;
+	border-left: 10rpx solid #5FCB94;
+}
+
+.deliver_card .deliverState4 {
+	background-color: #fff;
+	border-left: 10rpx solid #EC5B28;
+}
+
+.deliver_card .card_state {
+	border: 1px solid transparent;
+	padding: 0 20rpx;
+	font-size: 0.8rem;
+	position: absolute;
+	right: 20rpx;
+	top: 50%;
+	transform: translateY(-50%);
+	border-radius: 80rpx;
+}
+
+.deliver_card .tjpending {
+	border-color: #F6CB61;
+	color: #F6CB61;
+}
+
+.deliver_card .tjsent {
+	border-color: #5FCB94;
+	color: #5FCB94;
+}
+
+.deliver_card .tjnosend {
+	border-color: #EC5B28;
+	color: #EC5B28;
+}
+
+.login_wrap {
+	width: 100%;
+	position: relative;
+	top: -20rpx;
+	background-color: #fff;
+	border-top-left-radius: 16rpx;
+	border-top-right-radius: 16rpx;
+}
+
+.login_title {
+	position: absolute;
+	top: 120rpx;
+	left: 30rpx;
+	color: #fff;
+	font-size: 1.125rem;
+	font-weight: bold;
+	letter-spacing: 4rpx;
+	line-height: 1.5;
+}
+
+.login_title text {
+	font-size: 1.125rem;
+	letter-spacing: 0;
+}
+
+/* 登录 */
+.mybox .is-input-border {
+	border: 0 !important;
+}
+
+/* 消息列表 */
+.msg_body {
+	background-color: #fff;
+}
+
+.msg_list {
+	padding-top: 20rpx;
+}
+
+.msg_list .uni-list-chat__header {
+	width: 60rpx !important;
+	height: 60rpx !important;
+	background-color: #3d7eff;
+	border-color: transparent !important;
+	border-radius: 6rpx !important;
+}
+
+.msg_list .uni-list--border-top,
+.msg_list .uni-list--border-bottom,
+.msg_list .uni-list--border:after,
+.msg_body .uni-list:after {
+	height: 0 !important;
+}
+
+.msg_list .uni-list-chat__header-image {
+	width: 50rpx !important;
+	height: 50rpx !important;
+}
+
+.msg_list .uni-badge--dot {
+	left: inherit !important;
+	right: 20rpx;
+	top: 40rpx !important;
+}
+
+.msg_list .uni-list-chat__content-title {
+	font-size: .9rem !important;
+}
+
+.msg_list .hasread .uni-list-chat__header {
+	background-color: #ccc;
+}
+
+/* index */
+.index_top {
+	background-color: #5A7CF3;
+	width: 100%;
+}
+
+.index_top .uni-searchbar {
+	padding-right: 0 !important;
+}
+
+.index_top .index_btn {
+	background-color: transparent;
+	font-size: 0.825rem;
+	padding: 0 0.9rem;
+
+}
+
+.index_top uni-button:after {
+	border: 0 !important;
+}
+
+.index_top .uni-searchbar__box {
+	background-color: rgba(255, 255, 255, 0.3) !important;
+	border-color: transparent !important;
+	justify-content: inherit !important;
+}
+
+.index_top .uni-searchbar__text-input,
+.uni-searchbar__box-icon-search,
+.index_top .uniui-search {
+	color: #fff !important;
+}
+
+.index_top .uni-searchbar__text-placeholder,
+.index_top .uni-input-placeholder {
+	color: #eee !important;
+}
+
+.index_top .uni-input-input {
+	color: #fff;
+}
+
+.common_title {
+	font-size: .825rem;
+	font-weight: bold;
+}
+
+.common_icons {
+	width: 100%;
+	padding: 20rpx;
+	box-sizing: border-box;
+}
+
+.common_icons .common_info {
+	position: relative;
+	top: -120rpx;
+	background-color: #fff;
+	width: 100%;
+	box-sizing: border-box;
+	padding: 20rpx;
+	border-radius: 16rpx;
+
+	/* box-shadow: 0 0 10rpx rgba(0,0,0,0.1); */
+}
+
+.common_icons .common_info .common_cell {
+	margin-right: 20rpx;
+	text-align: center;
+}
+
+.common_icons .common_info .common_cell .cell_icon {
+	background-color: #EEF2FE;
+	border-radius: 50%;
+	width: 110rpx;
+	height: 110rpx;
+	margin: 20rpx 20rpx 0;
+}
+
+.common_icons .common_info .common_cell .cell_icon image {
+	float: left;
+	width: 50rpx;
+	height: 50rpx;
+	margin: 35rpx;
+}
+
+.common_icons .common_info .cell_last {
+	margin-right: 0;
+}
+
+uni-tabbar .uni-tabbar-border {
+	height: 0;
+}
+
+.index_menu {
+	width: 100%;
+	float: left;
+	margin-top: -100rpx;
+	/* height: calc(100% - 200px); */
+}
+
+.index_menu .menu_content {
+	width: 26%;
+	text-align: center;
+	float: left;
+	height: 100%;
+	overflow-y: scroll;
+}
+
+.index_menu .index_title .title_left {
+	width: 100%;
+	border-left: 2px solid transparent;
+	line-height: 80rpx;
+	font-size: 0.825rem;
+	text-align: center;
+}
+
+.index_menu .menu_content .index_title {
+	width: 100%;
+	float: left;
+	line-height: 100rpx;
+	font-size: 0.825rem;
+}
+
+.index_menu .menu_content .tit_active {
+	box-sizing: border-box;
+	background-color: #fff;
+	border-left: 2px solid #5A7CF3;
+	font-weight: bold;
+	float: left;
+}
+
+.index_menuinfo {
+	width: 74%;
+	float: left;
+	box-sizing: border-box;
+	padding: 20rpx;
+	position: relative;
+	overflow-y: scroll;
+	background-color: #fff;
+	/* height: 100%; */
+
+}
+
+.menu_ab {
+	position: absolute;
+	top: 420rpx;
+	left: 0;
+	width: 100%;
+	z-index: 10;
+	/* height: calc(100% - 185px); */
+
+}
+
+.index_menuinfo .icon_block {
+	position: relative;
+	text-align: center;
+	width: 33%;
+	float: left;
+	/* margin-top: -10rpx; */
+}
+
+.index_menuinfo .icon_block image {
+	float: left;
+	width: 80%;
+	height: 80rpx;
+	margin: 3% 10% 0;
+}
+
+.index_menuinfo .icon_block text {
+	float: left;
+	width: 100%;
+	font-size: .8rem;
+	height: 80rpx;
+	color: #101010;
+}
+
+.index_menuinfo .icon_block .index_badge {
+	width: 42rpx;
+	height: 42rpx;
+	font-size: 0.6rem;
+	background-color: #c00;
+	position: absolute;
+	right: 0;
+	color: #fff;
+	text-align: center;
+	line-height: 42rpx;
+	border-radius: 50%;
+}
+
+uni-tabbar.uni-tabbar-bottom .uni-tabbar {
+	box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.1);
+}
+
+uni-modal .uni-modal__bd {
+	font-size: 1rem !important;
+	color: #000 !important;
+}
+
+.passwordpage .uni-forms-item__label .label-text {
+	font-size: 0.8rem !important;
+}
+
+.passwordpage .is-input-border {
+	border: 0 !important;
+}
+
+.passwordpage .is-direction-left {
+	padding: 10rpx 20rpx;
+	background-color: #fff;
+	/* margin: 20rpx 0; */
+}
+
+.passwordpage .uni-forms-item__inner {
+	padding-bottom: 10rpx !important;
+}
+
+.passwordpage .new_save_btn {
+	font-size: 1rem;
+}
+
+.personal uni-button:after {
+	border: 0 !important;
+}
+
+.personal .uni-list:after {
+	height: 0 !important;
+}
+
+.personal .uni-list-item__icon {
+	margin-right: 0 !important;
+}
+
+.personal .uni-list-item__extra-text {
+	font-size: 1rem !important;
+	color: #101010 !important;
+	font-weight: bold;
+}
+
+.personal .uni-list--border-top,
+.uni-list--border-bottom,
+.uni-list--border::after {
+	background-color: transparent !important;
+}
+
+uni-modal .uni-modal__ft {
+	font-size: 0.875rem;
+}
+
+uni-modal .uni-modal__title {
+	color: #333;
+}
+
+uni-modal .uni-modal__bd {
+	padding: 1.3em 1.6em 1.3em;
+	min-height: 40px;
+	/* font-size: 15px; */
+	line-height: 1.4;
+	/* color: #999; */
+	max-height: 400px;
+	overflow-x: hidden;
+	overflow-y: auto;
+}
+
+uni-modal .uni-modal__hd {
+	padding: 1em 1.6em .3em;
+	height: 30px;
+}
+
+/*dy_add*/
+.btn_unusual button {
+	margin-right: 10rpx;
+}
+
+.btn_unusual button:last-child {
+	margin-right: 0;
+}
+
+/* .tit_ljh .text_white{
+	color: #fff !important;
+	font-size: 0.725rem;
+	font-weight: normal;
+	padding: 4rpx;
+} */
+.bot_card .pending {
+	color: #5FCB94;
+}
+
+.camera_pop {
+	border-top-left-radius: 16rpx;
+	border-top-right-radius: 16rpx;
+}
+
+.camera_list {
+	padding: 20rpx;
+	box-sizing: border-box;
+	max-height: 75vh;
+	overflow-y: scroll;
+}
+
+.camera_list .list_cell {
+	border-bottom: 1px solid #eee;
+	box-shadow: none;
+	margin-bottom: 0;
+}
+
+.camera_list .list_cell .uni-easyinput {
+	padding-right: 0;
+}
+
+.camera_list .list_cell .title {
+	color: #666;
+}
+
+.camera_list .selected-item {
+	font-size: 0.875rem;
+}
+
+.camera_list .input-value span {
+	padding: 0;
+	font-size: 0.875rem;
+}
+
+.camera_pop .pop_btn {
+	background-color: #fff;
+}
+
+.cell_box .result_card .text_black {
+	font-size: 1rem;
+}
+
+.cell_box .result_card .red {
+	color: #c00;
+}
+
+.new_btn_bot .btn_triple {
+	margin-right: 10rpx;
+}
+
+.cell_box .scan_btn_fr {
+	float: right;
+	background-color: #ececec;
+	color: #5A7CF3;
+	font-size: 0.725rem;
+	padding: 10rpx 20rpx;
+	border-radius: 16rpx;
+	line-height: 2;
+	margin: 0 20rpx 20rpx 0;
+	height: 60rpx;
+}
+
+.cell_box .scan_btn_fr image {
+	/* margin-top: 4rpx; */
+	/* float: left; */
+}
+
+.cell_box .scan_btn_fr text {}
+
+.login_wrap .content-clear-icon {
+	display: none;
+}
+
+.login_wrap .conone .uni-easyinput {
+	padding-left: 10rpx !important;
+}
+
+.quality_cell {
+	height: auto !important;
+}
+
+.quality_cell .title {
+	line-height: 80rpx;
+	color: #666;
+}
+
+.check_textarea {
+	font-size: 0.875rem;
+	color: #333;
+}
+
+.check_textarea uni-textarea {
+	padding: 10rpx 20rpx;
+	height: 40px;
+}
+
+.check_textarea .uni-textarea-placeholder {
+	font-size: 0.875rem;
+	color: #ccc;
+}
+
+.common_card .ljh_box,
+.pop_card .ljh {
+	width: 100%;
+	box-sizing: border-box;
+}
+
+.common_card .ljh_box .tit_ljh,
+.pop_card .ljh_box .tit_ljh {
+	float: left;
+	width: 50%;
+}
+
+.common_card .ljh_info,
+.pop_card .ljh_info {
+	width: 100%;
+	box-sizing: border-box;
+}
+
+.common_card .desc_card,
+.pop_card .desc_card {
+	width: 100%;
+	box-sizing: border-box;
+	padding: 0;
+}
+
+.common_card .label_xm,
+.pop_card .label_xm {
+	background-color: #45B5F3;
+	line-height: 2.0;
+	padding: 0 10rpx;
+	color: #fff;
+	border-radius: 8rpx;
+	max-width: 300rpx;
+	font-size: 0.7rem;
+	overflow: visble;
+	word-break: break-all;
+	/* overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	 font-size: 0.7rem;*/
+}
+
+.result_nodata text {
+	display: inline-block;
+	width: 100%;
+	text-align: center;
+	color: #999;
+	font-size: 1.125rem;
+	margin-top: -20rpx;
+}
+
+.passwordpage .uni-forms-item__label {
+	width: 180rpx !important;
+}
+
+/* 20221114add */
+.semi_col {
+	margin-top: 0;
+}
+
+.semi_col .uni-collapse-item__title-text span {
+	font-size: 1rem;
+	/* font-weight: bold; */
+}
+
+.semi_col .common_card .ljh_box .tit_ljh {
+	font-size: 1rem;
+	width: 56%;
+	/* font-weight: normal; */
+}
+
+.semi_col .num_color {
+	color: #EC5B28;
+}
+
+.issuelist {
+	position: relative;
+}
+
+.issuelist .notuse,
+.issuelist .use {
+	float: right;
+	color: #333;
+	font-size: 0.825rem;
+}
+
+.issuelist .notuse image,
+.issuelist .use image {
+	vertical-align: middle;
+}
+
+.issuecard .task_num {
+	border: 0;
+	margin-bottom: 0;
+	padding: 0;
+
+	border-bottom: 1px solid #eee;
+	padding-bottom: 10rpx;
+	margin-bottom: 10rpx;
+	overflow: hidden;
+}
+
+.issuelist .tag_icon {
+	width: 94rpx;
+	height: 94rpx;
+	position: absolute;
+	right: 0;
+	top: -6rpx;
+}
+
+button::after {
+	border: none;
+	border-radius: 0;
+}
+
+.btn_confirm {
+	width: 50%;
+	border: none;
+	background: #009EFF;
+	border-radius: 0;
+	color: #FFFFFF;
+}
+
+.btn_cancle {
+	width: 50%;
+	border: none;
+	background: #FFFFFF;
+	border-radius: 0;
+	color: #000000;
+}
+
+.line_color {
+	/* color: #E7E6E4; */
+	color: #F5EBF4;
+	/* padding-top: 10rpx;
+	padding-bottom: 10rpx; */
+}
+
+
+
+.filter_button {
+	font-size: 28rpx;
+	padding-left: 20rpx;
+	padding-right: 20rpx;
+	/* width: 240rpx; */
+	color: #fff;
+	background-color: #3C9CFF;
+}
+
+.filter_button_after {
+	opacity: 0.7;
+}
+
+.btn_edit_big_confirm {
+	font-size: 35rpx;
+	width: 50%;
+	color: #fff;
+	background-color: #3C9CFF;
+	border: none;
+	border-radius: 0;
+}
+
+.btn_edit_big_cancle {
+	font-size: 35rpx;
+	width: 50%;
+	color: #303133;
+	border: none;
+	border-radius: 0;
+	box-shadow: none;
+	background-color: #fff;
+
+}
+
+.btn_edit_big_after {
+	opacity: 0.7;
+}
+
+.btn_add_big {
+	background-color: #D8D8D8;
+	color: #fff;
+	text-align: center;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.icons_close {
+	width: 70rpx;
+	height: 70rpx;
+	margin: 10rpx;
+}
+
+.paizhao {
+	padding-bottom: 10rpx;
+	padding-top: 20rpx;
+	padding-left: 20rpx;
+}
+
+.paizhao image {
+	width: 50rpx;
+	height: 50rpx;
+}
+
+.card_partCode {
+	font-size: 36rpx;
+	font-weight: 500;
+	padding: 10rpx;
+
+}
+
+.card_itemCode {
+	font-size: 36rpx;
+	/* font-weight: 500; */
+	padding: 5rpx 10rpx;
+}
+
+.card_itemName {
+	color: #909399;
+	font-size: 30rpx;
+	padding: 5rpx 20rpx;
+}
+
+.card_ProdLine {
+	color: #909399;
+	font-size: 30rpx;
+	padding: 5rpx 30rpx;
+}
+
+
+/* .std_pack {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	padding: 0px;
+	color: #909399;
+	font-size: 30rpx;
+}
+ */
+
+
+.card_content {
+	font-size: 32rpx;
+	padding: 5px;
+}
+
+.card_icon_normal {
+	width: 45rpx;
+	height: 45rpx;
+	vertical-align: middle
+}
+
+.card_packing_code {
+	color: #3315EB;
+	padding: 5px;
+}
+
+.card_packing_code_content {
+	font-size: 32rpx;
+	padding: 5px;
+}
+
+.card_batch {
+	color: #9747FF;
+	padding: 5px;
+}
+
+
+.card_batch_content {
+	font-size: 32rpx;
+	padding: 5px;
+}
+
+.card_container {
+	color: #0076F6;
+	padding: 5px;
+}
+
+
+.card_container_content {
+	font-size: 32rpx;
+	padding: 5px;
+}
+
+.card_business {
+	color: #F1A532;
+	padding: 5px;
+}
+
+.card_business_content {
+	font-size: 32rpx;
+	padding: 5px;
+}
+
+.card_location {
+	color: #DA8910;
+	padding: 5px;
+}
+
+.card_to_location {
+	color: #329362;
+	padding: 5px;
+}
+
+.card_location_content {
+	font-size: 32rpx;
+	padding: 5px;
+}
+
+.card_supportCode {
+	color: #DA8910;
+}
+
+.card_supportCode_content {
+	font-size: 32rpx;
+}
+
+.scan_view {
+	/* #0CC2B6 20% */
+	background: linear-gradient(90deg, rgba(12, 194, 182, 0.2) 0%, rgba(12, 194, 182, 0) 100%)
+}
+
+.card_view {
+	font-size: 32rpx;
+	padding: 5rpx;
+}
+
+/* 
+.pack_view {
+	font-size: 32rpx;
+	padding: 5rpx;
+}
+
+.location_view {
+	font-size: 32rpx;
+	padding: 5rpx;
+}
+
+.batch_view {
+	font-size: 32rpx;
+	padding: 5rpx;
+}
+ */
+.business_view {
+	font-size: 32rpx;
+	padding: 5rpx;
+}
+
+.pop_customer {
+	border-radius: 8rpx;
+	background-color: #fff;
+}
+
+.nodata {
+	width: 390rpx;
+	height: 300rpx;
+}
+
+.text_ellipsis {
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.task_top {
+	margin: 0rpx 10rpx;
+	background-color: #fff;
+}
+
+.task_item {
+	margin: 0rpx 10rpx;
+	background-color: #fff;
+}
+
+.task_card {
+	padding: 12rpx;
+	background-color: #fff;
+	border-radius: 10rpx;
+	margin: 12rpx;
+}
+
+.task_number {
+	font-size: 35rpx;
+	font-weight: 600;
+	/* bold */
+}
+
+.task_text {
+	font-size: 30rpx;
+	margin: 5rpx 0rpx;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.request_state_un-doing {
+	font-size: 28rpx;
+	background: rgba(95, 203, 148, 0.2);
+	color: #22AF68;
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+}
+
+.job_state_doing {
+	font-size: 28rpx;
+	background: rgba(236, 156, 0, 0.2);
+	color: #EC9C00;
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+}
+
+.job_state_un-doing {
+	font-size: 28rpx;
+	background: rgba(95, 203, 148, 0.2);
+	color: #22AF68;
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+}
+
+.job_state_completed {
+	font-size: 28rpx;
+	background: rgba(95, 203, 148, 0.2);
+	color: #22AF68;
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+}
+
+.job_state_close {
+	font-size: 28rpx;
+	background: rgba(95, 203, 148, 0.2);
+	color: #22AF68;
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+}
+
+
+.job_state_cancelled {
+	font-size: 28rpx;
+	background: rgba(95, 203, 148, 0.2);
+	color: #ff0000;
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+}
+
+.pop_detail {
+	background-color: #fff;
+	width: 100%;
+	border-radius: 8rpx 8rpx 0rpx 0rpx;
+	padding: 15rpx;
+}
+
+.pop_detail .item {
+	padding-top: 5rpx;
+	padding-bottom: 5rpx;
+
+	margin-left: 10rpx;
+	margin-right: 10rpx;
+
+	display: flex;
+	flex-direction: row;
+
+	-webkit-justify-content: space-between;
+	justify-content: space-between;
+}
+
+.pop_detail .item_title {
+	padding-top: 5rpx;
+	padding-bottom: 5rpx;
+}
+
+.pop_detail .text_wrap {
+	color: #909399;
+	word-break: break-all;
+	text-align: right;
+}
+
+.pop_detail .item_big_title {
+	/* 	color: #2196F3; */
+	/* 	font-size: 35rpx; */
+	margin-left: 10rpx;
+	margin-right: 10rpx;
+	margin-top: 10rpx;
+	margin-bottom: 10rpx;
+}
+
+
+
+
+/deep/.uni-popup .uni-popup__wrapper {
+	width: 100% !important;
+	padding: 15rpx 20rpx 15rpx 20rpx;
+}
+
+.btn_bottom {
+	position: fixed;
+	bottom: 10rpx;
+	right: 0;
+}
+
+.btn_add_small {
+
+	background-color: #3C9CFF;
+	width: 200rpx;
+	font-size: 30rpx;
+	color: #fff;
+	border-radius: 5rpx;
+}
+
+.btn_add_small_after {
+	opacity: 0.7;
+}
+
+.btn_commit_after {
+	opacity: 0.7;
+}
+
+/* 禁用时样式 */
+button[disabled] {
+	background-color: #fff;
+	color: #666;
+}
+
+.btn_commit {
+	background-color: #3C9CFF;
+	font-size: 30rpx;
+	color: #fff;
+	text-align: center;
+	padding-left: 80rpx;
+	padding-right: 80rpx;
+	margin-right: 20rpx;
+	margin-left: 10rpx;
+}
+
+.btn_add {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+
+	position: absolute;
+	width: 97%;
+	height: 35px;
+	border-radius: 3px;
+	opacity: 1;
+	padding: 5px;
+	margin-left: 5px;
+	margin-right: 5px;
+
+	box-sizing: border-box;
+	border: 1px dashed #AAAAAA;
+	background: #D8D8D8;
+
+	color: #FFFFFF;
+	font-size: 16px;
+	font-weight: normal;
+	line-height: 26px;
+	letter-spacing: 0em;
+}
+
+.btn_clear_after {
+	opacity: 0.7;
+}
+
+
+.btn_clear {
+	background-color: #fff;
+	font-size: 30rpx;
+	color: #000;
+	text-align: center;
+	padding-left: 80rpx;
+	padding-right: 80rpx;
+	margin-right: 10rpx;
+	margin-left: 20rpx;
+}
+
+.icons_scan_close {
+	width: 35rpx;
+	height: 35rpx;
+}
+
+.count_image {
+	width: 45rpx;
+	height: 45rpx;
+}
+
+.count_type_light {
+	color: #0CC2B6;
+	font-size: 30rpx;
+	margin-left: 10rpx;
+	margin-right: 10rpx;
+}
+
+.count_type_black {
+	color: #FA5151;
+	font-size: 30rpx;
+	margin-left: 10rpx;
+	margin-right: 10rpx;
+}
+
+.btn_bot {
+	position: fixed;
+	bottom: 0;
+	right: 0;
+	padding-bottom: 20rpx;
+	padding-right: 20rpx;
+	z-index: 10;
+}
+
+.btn_single_commit {
+	background-color: #3C9CFF;
+	font-size: 30rpx;
+	color: #fff;
+	text-align: center;
+	width: 180rpx;
+}
+
+.center {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+}
+
+.space_between {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+}
+
+.text_recommend {
+	color: #0A84FF;
+	font-size: 38rpx;
+}
+
+.text_balance {
+	font-size: 36rpx;
+}
+
+.text_default {
+	color: #000000;
+	font-size: 36rpx;
+}
+
+.text_greater {
+	color: #F56C6C;
+	font-size: 36rpx;
+}
+
+.text_less {
+	color: #FF9500;
+	font-size: 36rpx;
+}
+
+.text_equal {
+	color: #34C759;
+	font-size: 38rpx;
+}
+
+.std_pack {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	padding: 0px;
+	color: #909399;
+	font-size: 30rpx;
+}
+
+.std_uom {
+	color: #909399;
+	font-size: 30rpx;
+	margin-left: 5rpx;
+	margin-right: 5rpx;
+}
+
+.uom {
+	color: #909399;
+	font-size: 30rpx;
+	margin-left: 5rpx;
+	margin-right: 5rpx;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+}
+
+
+.std_split {
+	color: #909399;
+	font-size: 36rpx;
+	margin-left: 5rpx;
+	margin-right: 5rpx;
+}
+
+.inspect_job {
+	color: #F1A532;
+	font-size: 36rpx;
+	margin-right: 10rpx;
+}
+
+.ok_job {
+	color: #53C21D;
+	font-size: 36rpx;
+	margin-right: 2rpx;
+}
+
+.nook_job {
+	color: #E45656;
+	font-size: 36rpx;
+	margin-right: 10rpx;
+}
+
+.raw_location {
+	padding-top: 5rpx;
+	padding-bottom: 5rpx;
+	padding-left: 15rpx;
+	padding-right: 15rpx;
+	background-color: #34C759;
+	color: #fff;
+	font-size: 35rpx;
+}
+
+.fg_location {
+	padding-top: 5rpx;
+	padding-bottom: 5rpx;
+	padding-left: 15rpx;
+	padding-right: 15rpx;
+	background-color: #5A7CF3;
+	color: #fff;
+	font-size: 35rpx;
+}
+
+.semi_location {
+	padding-top: 5rpx;
+	padding-bottom: 5rpx;
+	padding-left: 15rpx;
+	padding-right: 15rpx;
+	background-color: #FF9500;
+	color: #fff;
+	font-size: 35rpx;
+}
+
+.hold_location {
+	padding-top: 5rpx;
+	padding-bottom: 5rpx;
+	padding-left: 15rpx;
+	padding-right: 15rpx;
+	background-color: #F56C6C;
+	color: #fff;
+	font-size: 35rpx;
+}
+
+.unk_location {
+	padding-top: 5rpx;
+	padding-bottom: 5rpx;
+	padding-left: 15rpx;
+	padding-right: 15rpx;
+	background-color: #999999;
+	color: #fff;
+	font-size: 35rpx;
+}
+
+.qty_input {
+	width: 150rpx;
+	height: 60rpx;
+	line-height: 10rpx;
+	font-size: 10rpx;
+	color: #000000;
+	text-align: right;
+	border: 1px solid rgb(220, 211, 211);
+	padding: 5rpx;
+}
+
+.qty_inspect_input {
+	width: 150rpx;
+	height: 60rpx;
+	line-height: 10rpx;
+	font-size: 10rpx;
+	color: #000000;
+	text-align: center;
+	border: 1px solid rgb(220, 211, 211);
+	padding: 5rpx;
+}
+
+.icon_close {
+	width: 100rpx;
+	height: 100rpx;
+	opacity: 1;
+
+}
+
+.icon_edit {
+	width: 30rpx;
+	height: 40%;
+	opacity: 1;
+	margin-left: 10rpx;
+}
+
+.title_popup {
+	margin-top: 16px;
+	margin-bottom: 16px;
+	margin-left: 8px;
+	margin-right: 8px;
+	font-size: 35rpx;
+	text-align: center;
+}
+
+.close_button {
+	/* 自动布局子元素 */
+	position: static;
+	left: 20px;
+	/* top: 1109.01px; */
+	width: 100%;
+	height: 40px;
+	border-radius: 40px;
+	opacity: 1;
+
+	/* 自动布局 */
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	padding: 9px 12px;
+	gap: 10px;
+	align-self: stretch;
+
+	/* 颜色/白色 */
+	background: #FFFFFF;
+	box-sizing: border-box;
+	/* 颜色/边框 */
+	border: 1px solid #E7E6E4;
+	z-index: 3;
+}
+
+/**
+ * 申请状态  新增
+ */
+.request_status_new {
+	font-size: 28rpx;
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+	background: rgba(34, 175, 104, 0.2);
+	color: rgba(34, 175, 104, 1);
+}
+
+/**
+ * 申请状态 审批中
+ */
+.request_status_reviewing {
+	font-size: 28rpx;
+	background: rgba(236, 156, 0, 0.2);
+	color: rgba(236, 156, 0, 1);
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+}
+
+/**
+ * 申请状态 审批通过
+ */
+.request_status_agreed {
+	font-size: 28rpx;
+	background: rgba(103, 194, 57, 0.2);
+	color: rgba(103, 194, 57, 1);
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+}
+
+/**
+ * 申请状态 审批驳回
+ */
+.request_status_refused {
+	font-size: 28rpx;
+	background: rgba(245, 108, 108, 0.2);
+	color: rgba(245, 108, 108, 1);
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+}
+
+/**
+ * 申请状态 处理中
+ */
+.request_status_handling {
+	font-size: 28rpx;
+	background: rgba(60, 156, 255, 0.2);
+	color: rgba(60, 156, 255, 1);
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+}
+
+/**
+ * 申请状态 部分完成
+ */
+.request_status_partial {
+	font-size: 28rpx;
+	background: #D3FF3C;
+	color: #ffffff;
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+}
+
+/**
+ * 申请状态 已完成
+ */
+.request_status_completed {
+	font-size: 28rpx;
+	background: #D3FF3C;
+	color: #ffffff;
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+}
+
+/**
+ * 申请状态 中止
+ */
+.request_status_abort {
+	font-size: 28rpx;
+	background: #F33140;
+	color: #ffffff;
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+}
+
+/**
+ * 申请状态 已关闭
+ */
+.request_status_cancelled {
+	font-size: 28rpx;
+	background: #F33140;
+	color: #ffffff;
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+}
diff --git a/common/style/pdabasic.css b/common/style/pdabasic.css
new file mode 100644
index 0000000..d3b92ce
--- /dev/null
+++ b/common/style/pdabasic.css
@@ -0,0 +1,762 @@
+/* 
+.pda-list {
+	padding: 10rpx 10rpx;
+	box-sizing: border-box;
+	display: flex;
+	width: 100%;
+	flex-direction: row;
+}
+ */
+
+/* 列表 */
+.pda-list {
+	padding: 0 20rpx;
+	box-sizing: border-box;
+	background-color: #FFFFFF;
+	position: relative;
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	border-radius: 16rpx;
+	margin-bottom: 10rpx;
+}
+
+.pda-list:after {
+	position: absolute;
+	z-index: 10;
+	/* right: 0; */
+	bottom: 0;
+	left: 0;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.pda-list-cell {
+	position: relative;
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	border-bottom: 1px solid #eee;
+	padding: 10rpx 0;
+}
+
+.pda-list-cell:last-child {
+	border-bottom: 0;
+}
+
+.pda-list-cell-left {
+	white-space: nowrap;
+	/* padding: 0 10rpx; */
+}
+
+.pda-list-cell-db,
+.pda-list-cell-right {
+	flex: 1;
+}
+
+.pda-list-cell .pda-list-cell-db .uni-input-input {
+	font-size: .875rem;
+}
+
+.pda-list-cell .uni-easyinput__content-input,
+.pda-list-cell .uni-input-placeholder {
+	height: 2rem;
+	line-height: 2rem;
+}
+
+.pda-list-cell .placeholder {
+	color: #999 !important;
+	font-size: 0.875rem;
+	padding-left: 10rpx;
+}
+
+.pda-list-cell .uni-label {
+	color: #434556;
+}
+
+.list_locode .uni-collapse-item__title-box {
+	font-weight: bold !important;
+}
+
+.display-flex {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.list-body {
+	/* 	height: 84rpx; */
+	display: flex;
+	flex: 1;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: flex-start;
+	overflow: hidden;
+}
+
+.list-text-top {
+	width: 100%;
+	color: #000;
+	font-weight: bolder;
+	/* line-height: 36rpx; */
+	/* font-size: 30rpx; */
+}
+
+.list-text-bottom {
+	/* line-height: 30rpx; */
+	/* 	font-size: 26rpx; */
+	color: #8f8f94;
+}
+
+
+/* 改为detail-content */
+/* margin-bottom: 20rpx; */
+.device-detail {
+	padding: 10rpx !important;
+	margin: 10rpx;
+	border-radius: 16rpx;
+	background-color: #fff;
+	color: #666666;
+	line-height: 1.5;
+	overflow: hidden;
+}
+
+.list-style {
+	margin-bottom: 0rpx;
+	border-radius: 16rpx;
+	background-color: #FFFFFF;
+	color: #666666;
+	line-height: 1.5;
+}
+
+.border-font {
+	color: #000;
+	font-weight: bolder;
+}
+
+.space-between {
+	-webkit-justify-content: space-between;
+	justify-content: space-between;
+}
+
+.accept-button {
+	width: 30%;
+	font-size: 16px;
+	background-color: #7ac756;
+	color: #ffffff;
+}
+
+.bigsave-button {
+	width: 80%;
+	font-size: 16px;
+	background-color: #007AFF;
+	color: #ffffff;
+}
+
+.save-button {
+	width: 30%;
+	font-size: 16px;
+	background-color: #007AFF;
+	color: #ffffff;
+}
+
+.scroll-detail {
+	overflow: hidden;
+	padding-bottom: 60px;
+	height: 480px;
+	/* 没有高度不可以回到顶部 */
+	/* 	background-color: #ffffff; */
+}
+
+.scrollView {
+	overflow: hidden;
+	padding-bottom: 50px
+}
+
+.scroll-Y {
+	/* 	height: 70ux; */
+	padding-bottom: 50px
+}
+
+.bottom1 {
+	position: fixed;
+	width: 100%;
+	/* padding: 10rpx 10rpx; */
+	left: 0;
+	/* 	right: 0; */
+	bottom: 0;
+	background-color: #ffffff;
+}
+
+.bottom {
+	position: fixed;
+	display: flex;
+	width: 100%;
+	padding: 10rpx 10rpx;
+	left: 0;
+	/* right: 0; */
+	bottom: 0;
+	background-color: #ffffff;
+}
+
+
+.pars-num {
+	/* 	font-size: 26rpx; */
+}
+
+.right-width {
+	text-align: center;
+	width: 100rpx;
+}
+
+.state-style {
+	float: left;
+	margin-top: 10rpx;
+	/* border-radius: 16rpx;
+	padding: 0rpx 10rpx; */
+	/* line-height: 50rpx;
+		height: 50rpx; */
+	/* width: 120rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center; */
+	/* 垂直居中 */
+}
+
+.uni-popup-view {
+	background-color: #fff;
+	border-radius: 10px;
+}
+
+.uni-popup-button-box {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	padding: 10px 15px;
+}
+
+.uni-popup-button {
+	flex: 1;
+	/* 	// border-radius: 50px;
+	// color: #666; */
+	/* font-size: 16px; */
+}
+
+/* 任务状态 */
+/* 打开 */
+.open {
+	font-size: 28rpx;
+	background: rgba(95, 203, 148, 0.2);
+	color: #22AF68;
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+}
+
+/* 进行中 */
+.pending {
+	font-size: 28rpx;
+	background: rgba(236, 156, 0, 0.2);
+	color: #EC9C00;
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 10rpx;
+}
+
+/* 完成 */
+.completed {
+	background-color: #E6A23C;
+	color: #FFFFFF;
+	border-radius: 10rpx;
+}
+
+/* 关闭 */
+.close {
+	background-color: #F56C6C;
+	color: #FFFFFF;
+}
+
+
+/* 关闭 */
+.other {
+	background-color: #808080;
+	color: #FFFFFF;
+	border-radius: 10rpx;
+}
+
+/* 其他 */
+.unk {
+	background-color: #ececec;
+	color: #666;
+	border-radius: 10rpx;
+}
+
+/* 检验任务状态 */
+/* 免检 */
+.exempt {
+	background-color: #409EFF;
+	color: #FFFFFF;
+}
+
+/* 全检 */
+.full {
+	background-color: #67C23A;
+	color: #FFFFFF;
+}
+
+/* 抽检 */
+.sampling {
+	background-color: #E6A23C;
+	color: #FFFFFF;
+}
+
+/* 挑检 */
+.pick {
+	background-color: #F56C6C;
+	color: #FFFFFF;
+}
+
+/* 库存状态 */
+
+.uni-link {
+	background-color: #BD2C00;
+	color: #BD2C00 !important;
+}
+
+.inventory_status_insp {
+	color: #F9AE3D;
+	margin-right: 10rpx;
+}
+
+.inventory_status_ok {
+	color: #67C23A;
+	margin-right: 10rpx;
+}
+
+.inventory_status_nok {
+	color: #FF2424;
+	margin-right: 10rpx;
+}
+
+.inventory_status_hold {
+	color: #EC9C00;
+	margin-right: 10rpx;
+}
+
+.inventory_status_scarp {
+	color: #999;
+	margin-right: 10rpx;
+}
+
+.frozen {
+	color: #FF581D;
+	margin-right: 10rpx;
+}
+
+.pass {
+	color: #67C23A !important;
+}
+
+.unPass {
+	color: #FF2424 !important;
+}
+
+.location_inspect {
+	background-color: #F6CB61;
+	color: #FFFFFF;
+}
+
+.location_raw {
+	background-color: #2DA8D8;
+	color: #FFFFFF;
+}
+
+.location_semi {
+	background-color: #EDAE50;
+	color: #FFFFFF;
+}
+
+.location_fg {
+	background-color: #078343;
+	color: #FFFFFF;
+}
+
+.location_wip {
+	background-color: #FC85FE;
+	color: #FFFFFF;
+}
+
+.location_scrap {
+	background-color: #E30016;
+	color: #FFFFFF;
+}
+
+.location_noc {
+	background-color: #C31223;
+	color: #FFFFFF;
+}
+
+.location_overflow {
+	background-color: #7D1EDC;
+	color: #FFFFFF;
+}
+
+.location_customer {
+	background-color: #5A7CF3;
+	color: #FFFFFF;
+}
+
+.location_hold {
+	background-color: #FF8C00;
+	color: #FFFFFF;
+}
+
+
+
+
+/* //物料状态
+export function getItemTypeStyle(val) {
+	if (val == 0) return 'active'
+	else if (val == 1) return 'hold'
+	else if (val == 2) return 'new'
+	else if (val == 3) return 'plan'
+	else if (val == 4) return 'disable'
+	else return 'other'
+}
+ */
+
+/* 物料状态 */
+.active {
+	background-color: #5FCB94;
+	color: #FFFFFF;
+}
+
+.hold_item {
+	background-color: #FF4206;
+	color: #FFFFFF;
+}
+
+.new {
+	background-color: #E6A23C;
+	color: #FFFFFF;
+}
+
+.plan {
+	background-color: #2677F9;
+	color: #FFFFFF;
+}
+
+.disable {
+	background-color: #666;
+	color: #FFFFFF;
+}
+
+/* 任务编号字体 */
+.text-number {
+	color: #000;
+	font-weight: bolder;
+}
+
+/* 物料编号字体 */
+.text-itemcode {
+	/* 	font-size: 26rpx; */
+	color: #000;
+	font-weight: bolder;
+}
+
+.text-desc {
+	color: #8f8f91;
+	/* font-size: 22rpx; */
+}
+
+/* 物料编号字体 */
+.text-bolder {
+	color: #000;
+	font-weight: bolder;
+}
+
+.detail-list {
+	background-color: #fff;
+	padding:5rpx 10rpx;
+	/* margin: 20rpx; */
+	/* border-radius: 16rpx; */
+	/* overflow: hidden; */
+}
+
+.detail-content {
+	position: relative;
+	flex: 1;
+	/* font-size: 26rpx; */
+	color: #101010;
+}
+
+.example-body {
+	background-color: #FFFFFF;
+}
+
+.result-box {
+	text-align: center;
+	padding: 20px 0px;
+	/* font-size: 16px; */
+}
+
+.toptext {
+	padding-left: 20upx;
+	line-height: 80upx;
+}
+
+.numberstyle {
+	display: flex;
+	/* 	flex-direction: row-reverse; */
+	border-bottom: 10upx solid #EEEEEE;
+	width: 200upx;
+	padding-bottom: 20upx;
+}
+
+.input {
+	height: 20rpx;
+	padding: 0rpx 8rpx;
+	line-height: 50rpx;
+	/* font-size: 25rpx; */
+	background: #FFF;
+	border-radius: 4rpx;
+	flex: 1;
+}
+
+.mini-type-style {
+	vertical-align: middle;
+	font-size: 0.725rem;
+	margin-right: 6rpx;
+	border-radius: 4rpx;
+	padding: 4rpx 8rpx;
+	/* width: 80rpx; */
+	/* height: 46rpx;
+	min-width: 80rpx;
+	display: flex;
+	flex-direction: column; */
+
+}
+
+.text-color {
+	color: #000;
+	font-weight: bolder;
+}
+
+.tabs {
+	flex: 1;
+	flex-direction: column;
+	overflow: hidden;
+	/* background-color: #ffffff; */
+}
+
+/* .scroll-h {
+	touch-action: none;
+	width: 100%;
+	height: 100rpx;
+	flex-direction: row;
+	white-space: nowrap;
+	justify-content: center;
+} */
+
+.line-h {
+	height: 1rpx;
+	background-color: #cccccc;
+}
+
+.uni-tab-item {
+	/* #ifndef APP-PLUS */
+	display: inline-block;
+	/* #endif */
+	flex-wrap: nowrap;
+	padding: 0 30rpx;
+}
+
+.uni-tab-item-title {
+	position: relative;
+	color: #555;
+	/* font-size: 24rpx; */
+	height: 100rpx;
+	line-height: 100rpx;
+	flex-wrap: nowrap;
+	/* #ifndef APP-PLUS */
+	white-space: nowrap;
+	/* #endif */
+}
+
+.uni-tab-item-title-active {
+	color: #101010;
+	font-weight: bold;
+}
+
+.uni-tab-item-title-active:after {
+	left: 50%;
+	transform: translateX(-50%);
+	position: absolute;
+	bottom: -20rpx;
+	display: inline-block;
+	content: "";
+	width: 40rpx;
+	height: 8rpx;
+	background-color: #5a7cf3;
+	border-radius: 5px;
+}
+
+/* .blece {
+	padding: 10upx;
+	color: #111111;
+	border-bottom: 2px solid #f5f5f5;
+	display: flex;
+	flex-wrap: wrap;
+} */
+
+.conbox {
+	/* padding: 10rpx 0; */
+	padding-left: 10rpx;
+}
+
+.myinput {
+	display: flex;
+	box-sizing: border-box;
+	overflow: hidden;
+	position: relative;
+	flex: 1;
+	justify-content: center;
+	flex-direction: row;
+	align-items: center;
+	height: 88rpx;
+	padding: 20rpx 0;
+	/* border-width: 0.5px;
+	border-style: solid;
+	border-color: #e5e5e5;
+	border-radius: 5px; 
+	background-color: rgb(248, 248, 248);
+	font-size: 18px;*/
+	font-size: .825rem;
+}
+
+.qtyinput {
+	height: 50px;
+	padding: 10px 0px;
+	font-size: 20px;
+}
+
+
+.count-input {
+	padding: 5rpx 3rpx;
+	width: 95%;
+	font-size: 18px;
+}
+
+.pda-data-picker {
+	padding: 5rpx 3rpx;
+	width: 95%;
+	font-size: 18px;
+}
+
+.inputPlaceholderStyle {
+	font-size: 16px;
+}
+
+.inputfocus {
+	border-color: #007AFF;
+}
+
+
+.txt-16 {
+	font-size: 16px;
+}
+
+.txt-18 {
+	font-size: 18px;
+}
+
+.txt-20 {
+	font-size: 20px;
+}
+
+.pda-label {
+	width: 210rpx;
+	word-wrap: break-word;
+	word-break: break-all;
+	text-indent: 20rpx;
+	font-size: 16px;
+}
+
+.fontsize-16 {
+	font-size: 16px;
+}
+
+.fontsize-18 {
+	font-size: 18px;
+}
+
+.fontsize-20 {
+	font-size: 20px;
+}
+
+/deep/ .uni-collapse-item__title-text {
+	font-size: 16px;
+}
+
+
+/deep/ .input-value {
+	font-size: 16px;
+}
+
+/deep/ .uni-input-input {
+	font-size: 18px;
+}
+
+page {
+	width: 100%;
+	height: 100%;
+	/* background-color: #fff; */
+}
+
+.page-wraper {
+	display: flex;
+	flex-direction: column;
+	width: 100%;
+	height: 100%;
+	/* background-color: #fff; */
+}
+
+.page-header {
+	background-color: #fff;
+	font-size: 35rpx;
+	padding: 10rpx 20rpx;
+}
+
+.page-header .header_item {
+	/* padding-left: 10rpx; */
+	padding: 5rpx 10rpx;
+	font-size:32rpx ;
+}
+
+.page-header .header_job_top {
+	padding:5rpx 0rpx;
+}
+.page-main {
+	flex: 1;
+	position: relative;
+	background: #fff;
+}
+
+.page-main-scroll {
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+}
+
+.page-main-list {
+	/*  height: 80rpx;
+	    line-height: 80rpx; */
+	text-align: center;
+	background: #e0e0e0;
+
+}
diff --git a/common/style/uni.css b/common/style/uni.css
new file mode 100644
index 0000000..6b1ded6
--- /dev/null
+++ b/common/style/uni.css
@@ -0,0 +1,3405 @@
+@font-face {
+	font-family: uniicons;
+	font-weight: normal;
+	font-style: normal;
+	src: url('~@/static/uni.ttf') format('truetype');
+}
+
+/* #ifdef H5 */
+.fix-left-window {
+	padding-left: var(--window-left);
+}
+
+.pc-hide {
+	display: none !important;
+}
+
+/* #endif */
+
+/*通用 */
+
+/* view{
+	font-size:28rpx;
+	line-height:1.8;
+} */
+progress,
+checkbox-group {
+	width: 100%;
+}
+
+form {
+	width: 100%;
+}
+
+.uni-flex {
+	display: flex;
+	flex-direction: row;
+}
+
+.uni-flex-item {
+	flex: 1;
+}
+
+.uni-row {
+	flex-direction: row;
+}
+
+.uni-column {
+	flex-direction: column;
+}
+
+.uni-link {
+	color: #576B95;
+	font-size: 26rpx;
+}
+
+.uni-center {
+	text-align: center;
+}
+
+.uni-inline-item {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	/* justify-content: center; */
+	/* background-color: #888888; */
+}
+
+/* .uni-inline-item text {
+	margin-right: 20rpx;
+}
+ */
+/* .uni-inline-item text:last-child {
+	margin-right: 0rpx;
+	margin-left: 20rpx;
+} */
+
+/* page */
+.common-page-head {
+	padding: 35rpx;
+	text-align: center;
+}
+
+.common-page-head-title {
+	display: inline-block;
+	padding: 0 40rpx;
+	font-size: 30rpx;
+	height: 88rpx;
+	line-height: 88rpx;
+	color: #BEBEBE;
+	box-sizing: border-box;
+	border-bottom: 2rpx solid #D8D8D8;
+}
+
+.uni-padding-wrap {
+	/* width:690rpx; */
+	padding: 0 30rpx;
+}
+
+.uni-word {
+	text-align: center;
+	padding: 200rpx 100rpx;
+}
+
+.uni-title {
+	font-size: 30rpx;
+	font-weight: 500;
+	padding: 20rpx 0;
+	line-height: 1.5;
+}
+
+.uni-text {
+	font-size: 28rpx;
+}
+
+.uni-title text {
+	font-size: 24rpx;
+	color: #888;
+}
+
+.uni-text-gray {
+	color: #ccc;
+}
+
+.uni-text-small {
+	font-size: 24rpx;
+}
+
+.uni-common-mb {
+	margin-bottom: 30rpx;
+}
+
+.uni-common-pb {
+	padding-bottom: 30rpx;
+}
+
+.uni-common-pl {
+	padding-left: 30rpx;
+}
+
+.uni-common-mt {
+	margin-top: 30rpx;
+}
+
+/* 背景色 */
+.uni-bg-red {
+	background: #F76260;
+	color: #FFF;
+}
+
+.uni-bg-green {
+	background: #09BB07;
+	color: #FFF;
+}
+
+.uni-bg-blue {
+	background: #007AFF;
+	color: #FFF;
+}
+
+.uni-bg-white {
+	background: #FFFFFF;
+}
+
+/* 标题 */
+.uni-h1 {
+	font-size: 80rpx;
+	font-weight: 700;
+}
+
+.uni-h2 {
+	font-size: 60rpx;
+	font-weight: 700;
+}
+
+.uni-h3 {
+	font-size: 48rpx;
+	font-weight: 700;
+}
+
+.uni-h4 {
+	font-size: 36rpx;
+	font-weight: 700;
+}
+
+.uni-h5 {
+	font-size: 28rpx;
+	color: #8f8f94;
+}
+
+.uni-h6 {
+	font-size: 24rpx;
+	color: #8f8f94;
+}
+
+.uni-bold {
+	font-weight: bold;
+}
+
+/* 文本溢出隐藏 */
+.uni-ellipsis {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+/* 竖向百分百按钮 */
+.uni-btn-v {
+	padding: 10rpx 0;
+}
+
+.uni-btn-v button {
+	margin: 20rpx 0;
+}
+
+/* 表单 */
+.uni-form-item {
+	display: flex;
+	width: 100%;
+	padding: 10rpx 0;
+}
+
+.uni-form-item .title {
+	padding: 10rpx 25rpx;
+}
+
+.uni-label {
+	width: 210rpx;
+	word-wrap: break-word;
+	word-break: break-all;
+	text-indent: 20rpx;
+}
+
+.uni-input {
+	height: 80rpx;
+	padding: 15rpx 25rpx;
+	line-height: 80rpx;
+	font-size: 28rpx;
+	background: #FFF;
+	flex: 1;
+}
+
+radio-group,
+checkbox-group {
+	width: 100%;
+}
+
+radio-group label,
+checkbox-group label {
+	padding-right: 20rpx;
+}
+
+.uni-form-item .with-fun {
+	display: flex;
+	flex-wrap: nowrap;
+	background: #FFFFFF;
+}
+
+.uni-form-item .with-fun .uni-icon {
+	width: 40px;
+	height: 80rpx;
+	line-height: 80rpx;
+	flex-shrink: 0;
+}
+
+/* loadmore */
+.uni-loadmore {
+	height: 80rpx;
+	line-height: 80rpx;
+	text-align: center;
+	padding-bottom: 30rpx;
+}
+
+/*数字角标*/
+/* .uni-badge,
+.uni-badge-default {
+	font-family: 'Helvetica Neue', Helvetica, sans-serif;
+	font-size: 12px;
+	line-height: 1;
+	display: inline-block;
+	padding: 3px 6px;
+	color: #333;
+	border-radius: 100px;
+	background-color: rgba(0, 0, 0, .15);
+} */
+.uni-badge.uni-badge-inverted {
+	padding: 0 5px 0 0;
+	color: #929292;
+	background-color: transparent
+}
+
+.uni-badge-primary {
+	color: #fff;
+	background-color: #007aff
+}
+
+.uni-badge-blue.uni-badge-inverted,
+.uni-badge-primary.uni-badge-inverted {
+	color: #007aff;
+	background-color: transparent
+}
+
+.uni-badge-green,
+.uni-badge-success {
+	color: #fff;
+	background-color: #4cd964;
+}
+
+.uni-badge-green.uni-badge-inverted,
+.uni-badge-success.uni-badge-inverted {
+	color: #4cd964;
+	background-color: transparent
+}
+
+.uni-badge-warning,
+.uni-badge-yellow {
+	color: #fff;
+	background-color: #f0ad4e
+}
+
+.uni-badge-warning.uni-badge-inverted,
+.uni-badge-yellow.uni-badge-inverted {
+	color: #f0ad4e;
+	background-color: transparent
+}
+
+.uni-badge-danger,
+.uni-badge-red {
+	color: #fff;
+	background-color: #dd524d
+}
+
+.uni-badge-danger.uni-badge-inverted,
+.uni-badge-red.uni-badge-inverted {
+	color: #dd524d;
+	background-color: transparent
+}
+
+.uni-badge-purple,
+.uni-badge-royal {
+	color: #fff;
+	background-color: #8a6de9
+}
+
+.uni-badge-purple.uni-badge-inverted,
+.uni-badge-royal.uni-badge-inverted {
+	color: #8a6de9;
+	background-color: transparent
+}
+
+/*折叠面板 */
+.uni-collapse-content {
+	height: 0;
+	width: 100%;
+	overflow: hidden;
+}
+
+.uni-collapse-content.uni-active {
+	height: auto;
+}
+
+/*卡片视图 */
+.uni-card {
+	background: #fff;
+	border-radius: 8rpx;
+	margin: 20rpx 0;
+	position: relative;
+	/* box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, .3); */
+}
+
+.uni-card-content {
+	font-size: 30rpx;
+}
+
+.uni-card-content.image-view {
+	width: 100%;
+	margin: 0;
+}
+
+.uni-card-content-inner {
+	position: relative;
+	padding: 30rpx;
+}
+
+.uni-card-footer,
+.uni-card-header {
+	position: relative;
+	display: flex;
+	min-height: 50rpx;
+	padding: 20rpx 30rpx;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.uni-card-header {
+	font-size: 36rpx;
+}
+
+.uni-card-footer {
+	color: #6d6d72;
+}
+
+.uni-card-footer:before,
+.uni-card-header:after {
+	position: absolute;
+	top: 0;
+	right: 0;
+	left: 0;
+	height: 2rpx;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-card-header:after {
+	top: auto;
+	bottom: 0;
+}
+
+.uni-card-media {
+	justify-content: flex-start;
+}
+
+.uni-card-media-logo {
+	height: 84rpx;
+	width: 84rpx;
+	margin-right: 20rpx;
+}
+
+.uni-card-media-body {
+	height: 84rpx;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: flex-start;
+}
+
+.uni-card-media-text-top {
+	line-height: 36rpx;
+	font-size: 34rpx;
+}
+
+.uni-card-media-text-bottom {
+	line-height: 30rpx;
+	font-size: 28rpx;
+	color: #8f8f94;
+}
+
+.uni-card-link {
+	color: #007AFF;
+}
+
+/* 列表 */
+.uni-list {
+	background-color: #FFFFFF;
+	position: relative;
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+}
+
+.uni-list:after {
+	position: absolute;
+	z-index: 10;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+/* .uni-list::before {
+	position: absolute;
+	z-index: 10;
+	right: 0;
+	top: 0;
+	left: 0;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+} */
+.uni-list-cell {
+	position: relative;
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.uni-list-cell-hover {
+	background-color: #eee;
+}
+
+.uni-list-cell-pd {
+	padding: 22rpx 30rpx;
+}
+
+.uni-list-cell-left {
+	white-space: nowrap;
+	font-size: 28rpx;
+	padding: 0 30rpx;
+}
+
+.uni-list-cell-db,
+.uni-list-cell-right {
+	flex: 1;
+}
+
+.uni-list-cell::after {
+	position: absolute;
+	z-index: 3;
+	right: 0;
+	bottom: 0;
+	left: 30rpx;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-list .uni-list-cell:last-child::after {
+	height: 0rpx;
+}
+
+.uni-list-cell-last.uni-list-cell::after {
+	height: 0rpx;
+}
+
+.uni-list-cell-divider {
+	position: relative;
+	display: flex;
+	color: #999;
+	background-color: #f7f7f7;
+	padding: 15rpx 20rpx;
+}
+
+.uni-list-cell-divider::before {
+	position: absolute;
+	right: 0;
+	top: 0;
+	left: 0;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-list-cell-divider::after {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	left: 0rpx;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-list-cell-navigate {
+	font-size: 30rpx;
+	padding: 22rpx 30rpx;
+	line-height: 48rpx;
+	position: relative;
+	display: flex;
+	box-sizing: border-box;
+	width: 100%;
+	flex: 1;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.uni-list-cell-navigate {
+	padding-right: 36rpx;
+}
+
+.uni-navigate-badge {
+	padding-right: 50rpx;
+}
+
+.uni-list-cell-navigate.uni-navigate-right:after {
+	font-family: uniicons;
+	content: '\e583';
+	position: absolute;
+	right: 24rpx;
+	top: 50%;
+	color: #bbb;
+	-webkit-transform: translateY(-50%);
+	transform: translateY(-50%);
+}
+
+.uni-list-cell-navigate.uni-navigate-bottom:after {
+	font-family: uniicons;
+	content: '\e581';
+	position: absolute;
+	right: 24rpx;
+	top: 50%;
+	color: #bbb;
+	-webkit-transform: translateY(-50%);
+	transform: translateY(-50%);
+}
+
+.uni-list-cell-navigate.uni-navigate-bottom.uni-active::after {
+	font-family: uniicons;
+	content: '\e580';
+	position: absolute;
+	right: 24rpx;
+	top: 50%;
+	color: #bbb;
+	-webkit-transform: translateY(-50%);
+	transform: translateY(-50%);
+}
+
+.uni-collapse.uni-list-cell {
+	flex-direction: column;
+}
+
+.uni-list-cell-navigate.uni-active {
+	background: #eee;
+}
+
+.uni-list.uni-collapse {
+	box-sizing: border-box;
+	height: 0;
+	overflow: hidden;
+}
+
+.uni-collapse .uni-list-cell {
+	padding-left: 20rpx;
+}
+
+.uni-collapse .uni-list-cell::after {
+	left: 52rpx;
+}
+
+.uni-list.uni-active {
+	height: auto;
+}
+
+/* 三行列表 */
+.uni-triplex-row {
+	display: flex;
+	flex: 1;
+	width: 100%;
+	box-sizing: border-box;
+	flex-direction: row;
+	padding: 22rpx 30rpx;
+}
+
+.uni-triplex-right,
+.uni-triplex-left {
+	display: flex;
+	flex-direction: column;
+}
+
+.uni-triplex-left {
+	width: 84%;
+}
+
+.uni-triplex-left .uni-title {
+	padding: 8rpx 0;
+}
+
+.uni-triplex-left .uni-text,
+.uni-triplex-left .uni-text-small {
+	color: #999999;
+}
+
+.uni-triplex-right {
+	width: 16%;
+	text-align: right;
+}
+
+/* 图文列表 */
+.uni-media-list {
+	padding: 22rpx 30rpx;
+	box-sizing: border-box;
+	display: flex;
+	width: 100%;
+	flex-direction: row;
+}
+
+.uni-navigate-right.uni-media-list {
+	padding-right: 74rpx;
+}
+
+.uni-pull-right {
+	flex-direction: row-reverse;
+}
+
+.uni-pull-right>.uni-media-list-logo {
+	margin-right: 0rpx;
+	margin-left: 20rpx;
+}
+
+.uni-media-list-logo {
+	height: 84rpx;
+	width: 84rpx;
+	margin-right: 20rpx;
+}
+
+.uni-media-list-logo image {
+	height: 100%;
+	width: 100%;
+}
+
+.uni-media-list-body {
+	height: 84rpx;
+	display: flex;
+	flex: 1;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: flex-start;
+	overflow: hidden;
+}
+
+.uni-media-list-text-top {
+	width: 100%;
+	line-height: 36rpx;
+	font-size: 30rpx;
+}
+
+.uni-media-list-text-bottom {
+	width: 100%;
+	line-height: 30rpx;
+	font-size: 26rpx;
+	color: #8f8f94;
+}
+
+/* 九宫格 */
+.uni-grid-9 {
+	background: #f2f2f2;
+	width: 750rpx;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	border-top: 2rpx solid #eee;
+}
+
+.uni-grid-9-item {
+	width: 250rpx;
+	height: 200rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	border-bottom: 2rpx solid;
+	border-right: 2rpx solid;
+	border-color: #eee;
+	box-sizing: border-box;
+}
+
+.no-border-right {
+	border-right: none;
+}
+
+.uni-grid-9-image {
+	width: 100rpx;
+	height: 100rpx;
+}
+
+.uni-grid-9-text {
+	width: 250rpx;
+	line-height: 4rpx;
+	height: 40rpx;
+	text-align: center;
+	font-size: 30rpx;
+}
+
+.uni-grid-9-item-hover {
+	background: rgba(0, 0, 0, 0.1);
+}
+
+/* 上传 */
+.uni-uploader {
+	flex: 1;
+	flex-direction: column;
+}
+
+.uni-uploader-head {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+}
+
+.uni-uploader-info {
+	color: #B2B2B2;
+}
+
+.uni-uploader-body {
+	margin-top: 16rpx;
+}
+
+.uni-uploader__files {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+}
+
+.uni-uploader__file {
+	margin: 10rpx;
+	width: 210rpx;
+	height: 210rpx;
+}
+
+.uni-uploader__img {
+	display: block;
+	width: 210rpx;
+	height: 210rpx;
+}
+
+.uni-uploader__input-box {
+	position: relative;
+	margin: 10rpx;
+	width: 208rpx;
+	height: 208rpx;
+	border: 2rpx solid #D9D9D9;
+}
+
+.uni-uploader__input-box:before,
+.uni-uploader__input-box:after {
+	content: " ";
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	-webkit-transform: translate(-50%, -50%);
+	transform: translate(-50%, -50%);
+	background-color: #D9D9D9;
+}
+
+.uni-uploader__input-box:before {
+	width: 4rpx;
+	height: 79rpx;
+}
+
+.uni-uploader__input-box:after {
+	width: 79rpx;
+	height: 4rpx;
+}
+
+.uni-uploader__input-box:active {
+	border-color: #999999;
+}
+
+.uni-uploader__input-box:active:before,
+.uni-uploader__input-box:active:after {
+	background-color: #999999;
+}
+
+.uni-uploader__input {
+	position: absolute;
+	z-index: 1;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	opacity: 0;
+}
+
+/*问题反馈*/
+.feedback-title {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	padding: 20rpx;
+	color: #8f8f94;
+	font-size: 28rpx;
+}
+
+.feedback-star-view.feedback-title {
+	justify-content: flex-start;
+	margin: 0;
+}
+
+.feedback-quick {
+	position: relative;
+	padding-right: 40rpx;
+}
+
+.feedback-quick:after {
+	font-family: uniicons;
+	font-size: 40rpx;
+	content: '\e581';
+	position: absolute;
+	right: 0;
+	top: 50%;
+	color: #bbb;
+	-webkit-transform: translateY(-50%);
+	transform: translateY(-50%);
+}
+
+.feedback-body {
+	background: #fff;
+}
+
+.feedback-textare {
+	height: 200rpx;
+	font-size: 34rpx;
+	line-height: 50rpx;
+	width: 100%;
+	box-sizing: border-box;
+	padding: 20rpx 30rpx 0;
+}
+
+.feedback-input {
+	font-size: 34rpx;
+	height: 50rpx;
+	min-height: 50rpx;
+	padding: 15rpx 20rpx;
+	line-height: 50rpx;
+}
+
+.feedback-uploader {
+	padding: 22rpx 20rpx;
+}
+
+.feedback-star {
+	font-family: uniicons;
+	font-size: 40rpx;
+	margin-left: 6rpx;
+}
+
+.feedback-star-view {
+	margin-left: 20rpx;
+}
+
+.feedback-star:after {
+	content: '\e408';
+}
+
+.feedback-star.active {
+	color: #FFB400;
+}
+
+.feedback-star.active:after {
+	content: '\e438';
+}
+
+.feedback-submit {
+	background: #007AFF;
+	color: #FFFFFF;
+	margin: 20rpx;
+}
+
+/* input group */
+.uni-input-group {
+	position: relative;
+	padding: 0;
+	border: 0;
+	background-color: #fff;
+}
+
+.uni-input-group:before {
+	position: absolute;
+	top: 0;
+	right: 0;
+	left: 0;
+	height: 2rpx;
+	content: '';
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-input-group:after {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	height: 2rpx;
+	content: '';
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-input-row {
+	position: relative;
+	display: flex;
+	flex-direction: row;
+	font-size: 28rpx;
+	padding: 22rpx 30rpx;
+	justify-content: space-between;
+}
+
+.uni-input-group .uni-input-row:after {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	left: 30rpx;
+	height: 2rpx;
+	content: '';
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-input-row label {
+	line-height: 70rpx;
+}
+
+/* textarea */
+.uni-textarea {
+	width: 100%;
+	background: #FFF;
+}
+
+.uni-textarea textarea {
+	width: 96%;
+	padding: 18rpx 2%;
+	line-height: 1.6;
+	font-size: 28rpx;
+	height: 150rpx;
+}
+
+/* tab bar */
+.uni-tab-bar {
+	display: flex;
+	flex: 1;
+	flex-direction: column;
+	overflow: hidden;
+	height: 100%;
+}
+
+.uni-tab-bar .list {
+	width: 750rpx;
+	height: 100%;
+}
+
+.uni-swiper-tab {
+	width: 100%;
+	white-space: nowrap;
+	line-height: 100rpx;
+	height: 100rpx;
+	border-bottom: 1px solid #c8c7cc;
+}
+
+.swiper-tab-list {
+	font-size: 30rpx;
+	width: 150rpx;
+	display: inline-block;
+	text-align: center;
+	color: #555;
+}
+
+.uni-tab-bar .active {
+	color: #007AFF;
+}
+
+.uni-tab-bar .swiper-box {
+	flex: 1;
+	width: 100%;
+	height: calc(100% - 100rpx);
+}
+
+.uni-tab-bar-loading {
+	padding: 20rpx 0;
+}
+
+/* comment */
+.uni-comment {
+	padding: 5rpx 0;
+	display: flex;
+	flex-grow: 1;
+	flex-direction: column;
+}
+
+.uni-comment-list {
+	flex-wrap: nowrap;
+	padding: 10rpx 0;
+	margin: 10rpx 0;
+	width: 100%;
+	display: flex;
+}
+
+.uni-comment-face {
+	width: 70rpx;
+	height: 70rpx;
+	border-radius: 100%;
+	margin-right: 20rpx;
+	flex-shrink: 0;
+	overflow: hidden;
+}
+
+.uni-comment-face image {
+	width: 100%;
+	border-radius: 100%;
+}
+
+.uni-comment-body {
+	width: 100%;
+}
+
+.uni-comment-top {
+	line-height: 1.5em;
+	justify-content: space-between;
+}
+
+.uni-comment-top text {
+	color: #0A98D5;
+	font-size: 24rpx;
+}
+
+.uni-comment-date {
+	line-height: 38rpx;
+	flex-direction: row;
+	justify-content: space-between;
+	display: flex !important;
+	flex-grow: 1;
+}
+
+.uni-comment-date view {
+	color: #666666;
+	font-size: 24rpx;
+	line-height: 38rpx;
+}
+
+.uni-comment-content {
+	line-height: 1.6em;
+	font-size: 28rpx;
+	padding: 8rpx 0;
+}
+
+.uni-comment-replay-btn {
+	background: #FFF;
+	font-size: 24rpx;
+	line-height: 28rpx;
+	padding: 5rpx 20rpx;
+	border-radius: 30rpx;
+	color: #333 !important;
+	margin: 0 10rpx;
+}
+
+/* swiper msg */
+.uni-swiper-msg {
+	width: 100%;
+	padding: 12rpx 0;
+	flex-wrap: nowrap;
+	display: flex;
+}
+
+.uni-swiper-msg-icon {
+	width: 50rpx;
+	margin-right: 20rpx;
+}
+
+.uni-swiper-msg-icon image {
+	width: 100%;
+	flex-shrink: 0;
+}
+
+.uni-swiper-msg swiper {
+	width: 100%;
+	height: 50rpx;
+}
+
+.uni-swiper-msg swiper-item {
+	line-height: 50rpx;
+}
+
+/* product */
+.uni-product-list {
+	display: flex;
+	width: 100%;
+	flex-wrap: wrap;
+	flex-direction: row;
+}
+
+.uni-product {
+	padding: 20rpx;
+	display: flex;
+	flex-direction: column;
+}
+
+.image-view {
+	height: 330rpx;
+	width: 330rpx;
+	margin: 12rpx 0;
+}
+
+.uni-product-image {
+	height: 330rpx;
+	width: 330rpx;
+}
+
+.uni-product-title {
+	width: 300rpx;
+	word-break: break-all;
+	display: -webkit-box;
+	overflow: hidden;
+	line-height: 1.5;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+}
+
+.uni-product-price {
+	margin-top: 10rpx;
+	font-size: 28rpx;
+	line-height: 1.5;
+	position: relative;
+}
+
+.uni-product-price-original {
+	color: #e80080;
+}
+
+.uni-product-price-favour {
+	color: #888888;
+	text-decoration: line-through;
+	margin-left: 10rpx;
+}
+
+.uni-product-tip {
+	position: absolute;
+	right: 10rpx;
+	background-color: #ff3333;
+	color: #ffffff;
+	padding: 0 10rpx;
+	border-radius: 5rpx;
+}
+
+/* timeline */
+.uni-timeline {
+	margin: 35rpx 0;
+	display: flex;
+	flex-direction: column;
+	position: relative;
+}
+
+
+.uni-timeline-item {
+	display: flex;
+	flex-direction: row;
+	position: relative;
+	padding-bottom: 20rpx;
+	box-sizing: border-box;
+	overflow: hidden;
+
+}
+
+.uni-timeline-item .uni-timeline-item-keynode {
+	width: 160rpx;
+	flex-shrink: 0;
+	box-sizing: border-box;
+	padding-right: 20rpx;
+	text-align: right;
+	line-height: 65rpx;
+}
+
+.uni-timeline-item .uni-timeline-item-divider {
+	flex-shrink: 0;
+	position: relative;
+	width: 30rpx;
+	height: 30rpx;
+	top: 15rpx;
+	border-radius: 50%;
+	background-color: #bbb;
+}
+
+
+
+.uni-timeline-item-divider::before,
+.uni-timeline-item-divider::after {
+	position: absolute;
+	left: 15rpx;
+	width: 1rpx;
+	height: 100vh;
+	content: '';
+	background: inherit;
+}
+
+.uni-timeline-item-divider::before {
+	bottom: 100%;
+}
+
+.uni-timeline-item-divider::after {
+	top: 100%;
+}
+
+
+.uni-timeline-last-item .uni-timeline-item-divider:after {
+	display: none;
+}
+
+.uni-timeline-first-item .uni-timeline-item-divider:before {
+	display: none;
+}
+
+.uni-timeline-item .uni-timeline-item-content {
+	padding-left: 20rpx;
+}
+
+.uni-timeline-last-item .bottom-border::after {
+	display: none;
+}
+
+.uni-timeline-item-content .datetime {
+	color: #CCCCCC;
+}
+
+/* 自定义节点颜色 */
+.uni-timeline-last-item .uni-timeline-item-divider {
+	background-color: #1AAD19;
+}
+
+
+/* uni-icon */
+
+.uni-icon {
+	font-family: uniicons;
+	font-size: 24px;
+	font-weight: normal;
+	font-style: normal;
+	line-height: 1;
+	display: inline-block;
+	text-decoration: none;
+	-webkit-font-smoothing: antialiased;
+}
+
+.uni-icon.uni-active {
+	color: #007aff;
+}
+
+.uni-icon-contact:before {
+	content: '\e100';
+}
+
+.uni-icon-person:before {
+	content: '\e101';
+}
+
+.uni-icon-personadd:before {
+	content: '\e102';
+}
+
+.uni-icon-contact-filled:before {
+	content: '\e130';
+}
+
+.uni-icon-person-filled:before {
+	content: '\e131';
+}
+
+.uni-icon-personadd-filled:before {
+	content: '\e132';
+}
+
+.uni-icon-phone:before {
+	content: '\e200';
+}
+
+.uni-icon-email:before {
+	content: '\e201';
+}
+
+.uni-icon-chatbubble:before {
+	content: '\e202';
+}
+
+.uni-icon-chatboxes:before {
+	content: '\e203';
+}
+
+.uni-icon-phone-filled:before {
+	content: '\e230';
+}
+
+.uni-icon-email-filled:before {
+	content: '\e231';
+}
+
+.uni-icon-chatbubble-filled:before {
+	content: '\e232';
+}
+
+.uni-icon-chatboxes-filled:before {
+	content: '\e233';
+}
+
+.uni-icon-weibo:before {
+	content: '\e260';
+}
+
+.uni-icon-weixin:before {
+	content: '\e261';
+}
+
+.uni-icon-pengyouquan:before {
+	content: '\e262';
+}
+
+.uni-icon-chat:before {
+	content: '\e263';
+}
+
+.uni-icon-qq:before {
+	content: '\e264';
+}
+
+.uni-icon-videocam:before {
+	content: '\e300';
+}
+
+.uni-icon-camera:before {
+	content: '\e301';
+}
+
+.uni-icon-mic:before {
+	content: '\e302';
+}
+
+.uni-icon-location:before {
+	content: '\e303';
+}
+
+.uni-icon-mic-filled:before,
+.uni-icon-speech:before {
+	content: '\e332';
+}
+
+.uni-icon-location-filled:before {
+	content: '\e333';
+}
+
+.uni-icon-micoff:before {
+	content: '\e360';
+}
+
+.uni-icon-image:before {
+	content: '\e363';
+}
+
+.uni-icon-map:before {
+	content: '\e364';
+}
+
+.uni-icon-compose:before {
+	content: '\e400';
+}
+
+.uni-icon-trash:before {
+	content: '\e401';
+}
+
+.uni-icon-upload:before {
+	content: '\e402';
+}
+
+.uni-icon-download:before {
+	content: '\e403';
+}
+
+.uni-icon-close:before {
+	content: '\e404';
+}
+
+.uni-icon-redo:before {
+	content: '\e405';
+}
+
+.uni-icon-undo:before {
+	content: '\e406';
+}
+
+.uni-icon-refresh:before {
+	content: '\e407';
+}
+
+.uni-icon-star:before {
+	content: '\e408';
+}
+
+.uni-icon-plus:before {
+	content: '\e409';
+}
+
+.uni-icon-minus:before {
+	content: '\e410';
+}
+
+.uni-icon-circle:before,
+.uni-icon-checkbox:before {
+	content: '\e411';
+}
+
+.uni-icon-close-filled:before,
+.uni-icon-clear:before {
+	content: '\e434';
+}
+
+.uni-icon-refresh-filled:before {
+	content: '\e437';
+}
+
+.uni-icon-star-filled:before {
+	content: '\e438';
+}
+
+.uni-icon-plus-filled:before {
+	content: '\e439';
+}
+
+.uni-icon-minus-filled:before {
+	content: '\e440';
+}
+
+.uni-icon-circle-filled:before {
+	content: '\e441';
+}
+
+.uni-icon-checkbox-filled:before {
+	content: '\e442';
+}
+
+.uni-icon-closeempty:before {
+	content: '\e460';
+}
+
+.uni-icon-refreshempty:before {
+	content: '\e461';
+}
+
+.uni-icon-reload:before {
+	content: '\e462';
+}
+
+.uni-icon-starhalf:before {
+	content: '\e463';
+}
+
+.uni-icon-spinner:before {
+	content: '\e464';
+}
+
+.uni-icon-spinner-cycle:before {
+	content: '\e465';
+}
+
+.uni-icon-search:before {
+	content: '\e466';
+}
+
+.uni-icon-plusempty:before {
+	content: '\e468';
+}
+
+.uni-icon-forward:before {
+	content: '\e470';
+}
+
+.uni-icon-back:before,
+.uni-icon-left-nav:before {
+	content: '\e471';
+}
+
+.uni-icon-checkmarkempty:before {
+	content: '\e472';
+}
+
+.uni-icon-home:before {
+	content: '\e500';
+}
+
+.uni-icon-navigate:before {
+	content: '\e501';
+}
+
+.uni-icon-gear:before {
+	content: '\e502';
+}
+
+.uni-icon-paperplane:before {
+	content: '\e503';
+}
+
+.uni-icon-info:before {
+	content: '\e504';
+}
+
+.uni-icon-help:before {
+	content: '\e505';
+}
+
+.uni-icon-locked:before {
+	content: '\e506';
+}
+
+.uni-icon-more:before {
+	content: '\e507';
+}
+
+.uni-icon-flag:before {
+	content: '\e508';
+}
+
+.uni-icon-home-filled:before {
+	content: '\e530';
+}
+
+.uni-icon-gear-filled:before {
+	content: '\e532';
+}
+
+.uni-icon-info-filled:before {
+	content: '\e534';
+}
+
+.uni-icon-help-filled:before {
+	content: '\e535';
+}
+
+.uni-icon-more-filled:before {
+	content: '\e537';
+}
+
+.uni-icon-settings:before {
+	content: '\e560';
+}
+
+.uni-icon-list:before {
+	content: '\e562';
+}
+
+.uni-icon-bars:before {
+	content: '\e563';
+}
+
+.uni-icon-loop:before {
+	content: '\e565';
+}
+
+.uni-icon-paperclip:before {
+	content: '\e567';
+}
+
+.uni-icon-eye:before {
+	content: '\e568';
+}
+
+.uni-icon-arrowup:before {
+	content: '\e580';
+}
+
+.uni-icon-arrowdown:before {
+	content: '\e581';
+}
+
+.uni-icon-arrowleft:before {
+	content: '\e582';
+}
+
+.uni-icon-arrowright:before {
+	content: '\e583';
+}
+
+.uni-icon-arrowthinup:before {
+	content: '\e584';
+}
+
+.uni-icon-arrowthindown:before {
+	content: '\e585';
+}
+
+.uni-icon-arrowthinleft:before {
+	content: '\e586';
+}
+
+.uni-icon-arrowthinright:before {
+	content: '\e587';
+}
+
+.uni-icon-pulldown:before {
+	content: '\e588';
+}
+
+.uni-icon-scan:before {
+	content: "\e612";
+}
+
+/* 分界线 */
+.uni-divider {
+	height: 110rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	position: relative;
+}
+
+.uni-divider__content {
+	font-size: 28rpx;
+	color: #999;
+	padding: 0 20rpx;
+	position: relative;
+	z-index: 101;
+	background: #F4F5F6;
+}
+
+.uni-divider__line {
+	background-color: #CCCCCC;
+	height: 1px;
+	width: 100%;
+	position: absolute;
+	z-index: 100;
+	top: 50%;
+	left: 0;
+	transform: translateY(50%);
+}
+
+/* view{
+	font-size:28rpx;
+	line-height:1.8;
+} */
+progress,
+checkbox-group {
+	width: 100%;
+}
+
+form {
+	width: 100%;
+}
+
+.uni-flex {
+	display: flex;
+	flex-direction: row;
+}
+
+.uni-flex-item {
+	flex: 1;
+}
+
+.uni-row {
+	flex-direction: row;
+}
+
+.uni-column {
+	flex-direction: column;
+}
+
+.uni-link {
+	color: #576B95;
+	font-size: 26rpx;
+}
+
+.uni-center {
+	text-align: center;
+}
+
+.uni-inline-item {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+}
+
+.uni-inline-item text {
+	margin-right: 20rpx;
+}
+
+.uni-inline-item text:last-child {
+	margin-right: 0rpx;
+	margin-left: 20rpx;
+}
+
+/* page */
+.common-page-head {
+	padding: 35rpx;
+	text-align: center;
+}
+
+.common-page-head-title {
+	display: inline-block;
+	padding: 0 40rpx;
+	font-size: 30rpx;
+	height: 88rpx;
+	line-height: 88rpx;
+	color: #BEBEBE;
+	box-sizing: border-box;
+	border-bottom: 2rpx solid #D8D8D8;
+}
+
+.uni-padding-wrap {
+	/* width:690rpx; */
+	padding: 0 30rpx;
+}
+
+.uni-word {
+	text-align: center;
+	padding: 200rpx 100rpx;
+}
+
+.uni-title {
+	font-size: 30rpx;
+	font-weight: 500;
+	padding: 20rpx 0;
+	line-height: 1.5;
+}
+
+.uni-text {
+	font-size: 28rpx;
+}
+
+.uni-title text {
+	font-size: 24rpx;
+	color: #888;
+}
+
+.uni-text-gray {
+	color: #ccc;
+}
+
+.uni-text-small {
+	font-size: 24rpx;
+}
+
+.uni-common-mb {
+	margin-bottom: 30rpx;
+}
+
+.uni-common-pb {
+	padding-bottom: 30rpx;
+}
+
+.uni-common-pl {
+	padding-left: 30rpx;
+}
+
+.uni-common-mt {
+	margin-top: 30rpx;
+}
+
+/* 背景色 */
+.uni-bg-red {
+	background: #F76260;
+	color: #FFF;
+}
+
+.uni-bg-green {
+	background: #09BB07;
+	color: #FFF;
+}
+
+.uni-bg-blue {
+	background: #007AFF;
+	color: #FFF;
+}
+
+/* 标题 */
+.uni-h1 {
+	font-size: 80rpx;
+	font-weight: 700;
+}
+
+.uni-h2 {
+	font-size: 60rpx;
+	font-weight: 700;
+}
+
+.uni-h3 {
+	font-size: 48rpx;
+	font-weight: 700;
+}
+
+.uni-h4 {
+	font-size: 36rpx;
+	font-weight: 700;
+}
+
+.uni-h5 {
+	font-size: 28rpx;
+	color: #8f8f94;
+}
+
+.uni-h6 {
+	font-size: 24rpx;
+	color: #8f8f94;
+}
+
+.uni-bold {
+	font-weight: bold;
+}
+
+/* 文本溢出隐藏 */
+.uni-ellipsis {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+/* 竖向百分百按钮 */
+.uni-btn-v {
+	padding: 10rpx 0;
+}
+
+.uni-btn-v button {
+	margin: 20rpx 0;
+}
+
+/* 表单 */
+.uni-form-item {
+	display: flex;
+	width: 100%;
+	padding: 10rpx 0;
+}
+
+.uni-form-item .title {
+	padding: 10rpx 25rpx;
+}
+
+.uni-label {
+	width: 210rpx;
+	word-wrap: break-word;
+	word-break: break-all;
+	text-indent: 20rpx;
+}
+
+.uni-input {
+	height: 50rpx;
+	padding: 15rpx 25rpx;
+	line-height: 50rpx;
+	font-size: 28rpx;
+	background: #FFF;
+	flex: 1;
+}
+
+radio-group,
+checkbox-group {
+	width: 100%;
+}
+
+radio-group label,
+checkbox-group label {
+	padding-right: 20rpx;
+}
+
+.uni-form-item .with-fun {
+	display: flex;
+	flex-wrap: nowrap;
+	background: #FFFFFF;
+}
+
+.uni-form-item .with-fun .uni-icon {
+	width: 40px;
+	height: 80rpx;
+	line-height: 80rpx;
+	flex-shrink: 0;
+}
+
+/* loadmore */
+.uni-loadmore {
+	height: 80rpx;
+	line-height: 80rpx;
+	text-align: center;
+	padding-bottom: 30rpx;
+}
+
+/*数字角标*/
+/* .uni-badge,
+.uni-badge-default {
+	font-family: 'Helvetica Neue', Helvetica, sans-serif;
+	font-size: 12px;
+	line-height: 1;
+	display: inline-block;
+	padding: 3px 6px;
+	color: #333;
+	border-radius: 100px;
+	background-color: rgba(0, 0, 0, .15);
+} */
+.uni-badge.uni-badge-inverted {
+	padding: 0 5px 0 0;
+	color: #929292;
+	background-color: transparent
+}
+
+.uni-badge-primary {
+	color: #fff;
+	background-color: #007aff
+}
+
+.uni-badge-blue.uni-badge-inverted,
+.uni-badge-primary.uni-badge-inverted {
+	color: #007aff;
+	background-color: transparent
+}
+
+.uni-badge-green,
+.uni-badge-success {
+	color: #fff;
+	background-color: #4cd964;
+}
+
+.uni-badge-green.uni-badge-inverted,
+.uni-badge-success.uni-badge-inverted {
+	color: #4cd964;
+	background-color: transparent
+}
+
+.uni-badge-warning,
+.uni-badge-yellow {
+	color: #fff;
+	background-color: #f0ad4e
+}
+
+.uni-badge-warning.uni-badge-inverted,
+.uni-badge-yellow.uni-badge-inverted {
+	color: #f0ad4e;
+	background-color: transparent
+}
+
+.uni-badge-danger,
+.uni-badge-red {
+	color: #fff;
+	background-color: #dd524d
+}
+
+.uni-badge-danger.uni-badge-inverted,
+.uni-badge-red.uni-badge-inverted {
+	color: #dd524d;
+	background-color: transparent
+}
+
+.uni-badge-purple,
+.uni-badge-royal {
+	color: #fff;
+	background-color: #8a6de9
+}
+
+.uni-badge-purple.uni-badge-inverted,
+.uni-badge-royal.uni-badge-inverted {
+	color: #8a6de9;
+	background-color: transparent
+}
+
+/*折叠面板 */
+.uni-collapse-content {
+	height: 0;
+	width: 100%;
+	overflow: hidden;
+}
+
+.uni-collapse-content.uni-active {
+	height: auto;
+}
+
+/*卡片视图 */
+.uni-card {
+	background: #fff;
+	border-radius: 8rpx;
+	margin: 20rpx 0;
+	position: relative;
+	/* box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, .3); */
+}
+
+.uni-card-content {
+	font-size: 30rpx;
+}
+
+.uni-card-content.image-view {
+	width: 100%;
+	margin: 0;
+}
+
+.uni-card-content-inner {
+	position: relative;
+	padding: 30rpx;
+}
+
+.uni-card-footer,
+.uni-card-header {
+	position: relative;
+	display: flex;
+	min-height: 50rpx;
+	padding: 20rpx 30rpx;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.uni-card-header {
+	font-size: 36rpx;
+}
+
+.uni-card-footer {
+	color: #6d6d72;
+}
+
+.uni-card-footer:before,
+.uni-card-header:after {
+	position: absolute;
+	top: 0;
+	right: 0;
+	left: 0;
+	height: 2rpx;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-card-header:after {
+	top: auto;
+	bottom: 0;
+}
+
+.uni-card-media {
+	justify-content: flex-start;
+}
+
+.uni-card-media-logo {
+	height: 84rpx;
+	width: 84rpx;
+	margin-right: 20rpx;
+}
+
+.uni-card-media-body {
+	height: 84rpx;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: flex-start;
+}
+
+.uni-card-media-text-top {
+	line-height: 36rpx;
+	font-size: 34rpx;
+}
+
+.uni-card-media-text-bottom {
+	line-height: 30rpx;
+	font-size: 28rpx;
+	color: #8f8f94;
+}
+
+.uni-card-link {
+	color: #007AFF;
+}
+
+/* 列表 */
+.uni-list {
+	background-color: #FFFFFF;
+	position: relative;
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+}
+
+.uni-list:after {
+	position: absolute;
+	z-index: 10;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+/* .uni-list::before {
+	position: absolute;
+	z-index: 10;
+	right: 0;
+	top: 0;
+	left: 0;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+} */
+.uni-list-cell {
+	position: relative;
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.uni-list-cell-hover {
+	background-color: #eee;
+}
+
+.uni-list-cell-pd {
+	padding: 22rpx 30rpx;
+}
+
+.uni-list-cell-left {
+	white-space: nowrap;
+	font-size: 28rpx;
+	padding: 0 30rpx;
+}
+
+.uni-list-cell-db,
+.uni-list-cell-right {
+	flex: 1;
+}
+
+.uni-list-cell::after {
+	position: absolute;
+	z-index: 3;
+	right: 0;
+	bottom: 0;
+	left: 30rpx;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-list .uni-list-cell:last-child::after {
+	height: 0rpx;
+}
+
+.uni-list-cell-last.uni-list-cell::after {
+	height: 0rpx;
+}
+
+.uni-list-cell-divider {
+	position: relative;
+	display: flex;
+	color: #999;
+	background-color: #f7f7f7;
+	padding: 15rpx 20rpx;
+}
+
+.uni-list-cell-divider::before {
+	position: absolute;
+	right: 0;
+	top: 0;
+	left: 0;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-list-cell-divider::after {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	left: 0rpx;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-list-cell-navigate {
+	font-size: 30rpx;
+	padding: 22rpx 30rpx;
+	line-height: 48rpx;
+	position: relative;
+	display: flex;
+	box-sizing: border-box;
+	width: 100%;
+	flex: 1;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.uni-list-cell-navigate {
+	padding-right: 36rpx;
+}
+
+.uni-navigate-badge {
+	padding-right: 50rpx;
+}
+
+.uni-list-cell-navigate.uni-navigate-right:after {
+	font-family: uniicons;
+	content: '\e583';
+	position: absolute;
+	right: 24rpx;
+	top: 50%;
+	color: #bbb;
+	-webkit-transform: translateY(-50%);
+	transform: translateY(-50%);
+}
+
+.uni-list-cell-navigate.uni-navigate-bottom:after {
+	font-family: uniicons;
+	content: '\e581';
+	position: absolute;
+	right: 24rpx;
+	top: 50%;
+	color: #bbb;
+	-webkit-transform: translateY(-50%);
+	transform: translateY(-50%);
+}
+
+.uni-list-cell-navigate.uni-navigate-bottom.uni-active::after {
+	font-family: uniicons;
+	content: '\e580';
+	position: absolute;
+	right: 24rpx;
+	top: 50%;
+	color: #bbb;
+	-webkit-transform: translateY(-50%);
+	transform: translateY(-50%);
+}
+
+.uni-collapse.uni-list-cell {
+	flex-direction: column;
+}
+
+.uni-list-cell-navigate.uni-active {
+	background: #eee;
+}
+
+.uni-list.uni-collapse {
+	box-sizing: border-box;
+	height: 0;
+	overflow: hidden;
+}
+
+.uni-collapse .uni-list-cell {
+	padding-left: 20rpx;
+}
+
+.uni-collapse .uni-list-cell::after {
+	left: 52rpx;
+}
+
+.uni-list.uni-active {
+	height: auto;
+}
+
+/* 三行列表 */
+.uni-triplex-row {
+	display: flex;
+	flex: 1;
+	width: 100%;
+	box-sizing: border-box;
+	flex-direction: row;
+	padding: 22rpx 30rpx;
+}
+
+.uni-triplex-right,
+.uni-triplex-left {
+	display: flex;
+	flex-direction: column;
+}
+
+.uni-triplex-left {
+	width: 84%;
+}
+
+.uni-triplex-left .uni-title {
+	padding: 8rpx 0;
+}
+
+.uni-triplex-left .uni-text,
+.uni-triplex-left .uni-text-small {
+	color: #999999;
+}
+
+.uni-triplex-right {
+	width: 16%;
+	text-align: right;
+}
+
+/* 图文列表 */
+.uni-media-list {
+	padding: 22rpx 30rpx;
+	box-sizing: border-box;
+	display: flex;
+	width: 100%;
+	flex-direction: row;
+}
+
+.uni-navigate-right.uni-media-list {
+	padding-right: 74rpx;
+}
+
+.uni-pull-right {
+	flex-direction: row-reverse;
+}
+
+.uni-pull-right>.uni-media-list-logo {
+	margin-right: 0rpx;
+	margin-left: 20rpx;
+}
+
+.uni-media-list-logo {
+	height: 84rpx;
+	width: 84rpx;
+	margin-right: 20rpx;
+}
+
+.uni-media-list-logo image {
+	height: 100%;
+	width: 100%;
+}
+
+.uni-media-list-body {
+	height: 84rpx;
+	display: flex;
+	flex: 1;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: flex-start;
+	overflow: hidden;
+}
+
+.uni-media-list-text-top {
+	width: 100%;
+	line-height: 36rpx;
+	font-size: 30rpx;
+}
+
+.uni-media-list-text-bottom {
+	width: 100%;
+	line-height: 30rpx;
+	font-size: 26rpx;
+	color: #8f8f94;
+}
+
+/* 九宫格 */
+.uni-grid-9 {
+	background: #f2f2f2;
+	width: 750rpx;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	border-top: 2rpx solid #eee;
+}
+
+.uni-grid-9-item {
+	width: 250rpx;
+	height: 200rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	border-bottom: 2rpx solid;
+	border-right: 2rpx solid;
+	border-color: #eee;
+	box-sizing: border-box;
+}
+
+.no-border-right {
+	border-right: none;
+}
+
+.uni-grid-9-image {
+	width: 100rpx;
+	height: 100rpx;
+}
+
+.uni-grid-9-text {
+	width: 250rpx;
+	line-height: 4rpx;
+	height: 40rpx;
+	text-align: center;
+	font-size: 30rpx;
+}
+
+.uni-grid-9-item-hover {
+	background: rgba(0, 0, 0, 0.1);
+}
+
+/* 上传 */
+.uni-uploader {
+	flex: 1;
+	flex-direction: column;
+}
+
+.uni-uploader-head {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+}
+
+.uni-uploader-info {
+	color: #B2B2B2;
+}
+
+.uni-uploader-body {
+	margin-top: 16rpx;
+}
+
+.uni-uploader__files {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+}
+
+.uni-uploader__file {
+	margin: 10rpx;
+	width: 210rpx;
+	height: 210rpx;
+}
+
+.uni-uploader__img {
+	display: block;
+	width: 210rpx;
+	height: 210rpx;
+}
+
+.uni-uploader__input-box {
+	position: relative;
+	margin: 10rpx;
+	width: 208rpx;
+	height: 208rpx;
+	border: 2rpx solid #D9D9D9;
+}
+
+.uni-uploader__input-box:before,
+.uni-uploader__input-box:after {
+	content: " ";
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	-webkit-transform: translate(-50%, -50%);
+	transform: translate(-50%, -50%);
+	background-color: #D9D9D9;
+}
+
+.uni-uploader__input-box:before {
+	width: 4rpx;
+	height: 79rpx;
+}
+
+.uni-uploader__input-box:after {
+	width: 79rpx;
+	height: 4rpx;
+}
+
+.uni-uploader__input-box:active {
+	border-color: #999999;
+}
+
+.uni-uploader__input-box:active:before,
+.uni-uploader__input-box:active:after {
+	background-color: #999999;
+}
+
+.uni-uploader__input {
+	position: absolute;
+	z-index: 1;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	opacity: 0;
+}
+
+/*问题反馈*/
+.feedback-title {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	padding: 20rpx;
+	color: #8f8f94;
+	font-size: 28rpx;
+}
+
+.feedback-star-view.feedback-title {
+	justify-content: flex-start;
+	margin: 0;
+}
+
+.feedback-quick {
+	position: relative;
+	padding-right: 40rpx;
+}
+
+.feedback-quick:after {
+	font-family: uniicons;
+	font-size: 40rpx;
+	content: '\e581';
+	position: absolute;
+	right: 0;
+	top: 50%;
+	color: #bbb;
+	-webkit-transform: translateY(-50%);
+	transform: translateY(-50%);
+}
+
+.feedback-body {
+	background: #fff;
+}
+
+.feedback-textare {
+	height: 200rpx;
+	font-size: 34rpx;
+	line-height: 50rpx;
+	width: 100%;
+	box-sizing: border-box;
+	padding: 20rpx 30rpx 0;
+}
+
+.feedback-input {
+	font-size: 34rpx;
+	height: 50rpx;
+	min-height: 50rpx;
+	padding: 15rpx 20rpx;
+	line-height: 50rpx;
+}
+
+.feedback-uploader {
+	padding: 22rpx 20rpx;
+}
+
+.feedback-star {
+	font-family: uniicons;
+	font-size: 40rpx;
+	margin-left: 6rpx;
+}
+
+.feedback-star-view {
+	margin-left: 20rpx;
+}
+
+.feedback-star:after {
+	content: '\e408';
+}
+
+.feedback-star.active {
+	color: #FFB400;
+}
+
+.feedback-star.active:after {
+	content: '\e438';
+}
+
+.feedback-submit {
+	background: #007AFF;
+	color: #FFFFFF;
+	margin: 20rpx;
+}
+
+/* input group */
+.uni-input-group {
+	position: relative;
+	padding: 0;
+	border: 0;
+	background-color: #fff;
+}
+
+.uni-input-group:before {
+	position: absolute;
+	top: 0;
+	right: 0;
+	left: 0;
+	height: 2rpx;
+	content: '';
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-input-group:after {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	height: 2rpx;
+	content: '';
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-input-row {
+	position: relative;
+	display: flex;
+	flex-direction: row;
+	font-size: 28rpx;
+	padding: 22rpx 30rpx;
+	justify-content: space-between;
+}
+
+.uni-input-group .uni-input-row:after {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	left: 30rpx;
+	height: 2rpx;
+	content: '';
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-input-row label {
+	line-height: 70rpx;
+}
+
+/* textarea */
+.uni-textarea {
+	width: 100%;
+	background: #FFF;
+}
+
+.uni-textarea textarea {
+	width: 96%;
+	padding: 18rpx 2%;
+	line-height: 1.6;
+	font-size: 28rpx;
+	height: 150rpx;
+}
+
+/* tab bar */
+.uni-tab-bar {
+	display: flex;
+	flex: 1;
+	flex-direction: column;
+	overflow: hidden;
+	height: 100%;
+}
+
+.uni-tab-bar .list {
+	width: 750rpx;
+	height: 100%;
+}
+
+.uni-swiper-tab {
+	width: 100%;
+	white-space: nowrap;
+	line-height: 100rpx;
+	height: 100rpx;
+	border-bottom: 1px solid #c8c7cc;
+}
+
+.swiper-tab-list {
+	font-size: 30rpx;
+	width: 150rpx;
+	display: inline-block;
+	text-align: center;
+	color: #555;
+}
+
+.uni-tab-bar .active {
+	color: #007AFF;
+}
+
+.uni-tab-bar .swiper-box {
+	flex: 1;
+	width: 100%;
+	height: calc(100% - 100rpx);
+}
+
+.uni-tab-bar-loading {
+	padding: 20rpx 0;
+}
+
+/* comment */
+.uni-comment {
+	padding: 5rpx 0;
+	display: flex;
+	flex-grow: 1;
+	flex-direction: column;
+}
+
+.uni-comment-list {
+	flex-wrap: nowrap;
+	padding: 10rpx 0;
+	margin: 10rpx 0;
+	width: 100%;
+	display: flex;
+}
+
+.uni-comment-face {
+	width: 70rpx;
+	height: 70rpx;
+	border-radius: 100%;
+	margin-right: 20rpx;
+	flex-shrink: 0;
+	overflow: hidden;
+}
+
+.uni-comment-face image {
+	width: 100%;
+	border-radius: 100%;
+}
+
+.uni-comment-body {
+	width: 100%;
+}
+
+.uni-comment-top {
+	line-height: 1.5em;
+	justify-content: space-between;
+}
+
+.uni-comment-top text {
+	color: #0A98D5;
+	font-size: 24rpx;
+}
+
+.uni-comment-date {
+	line-height: 38rpx;
+	flex-direction: row;
+	justify-content: space-between;
+	display: flex !important;
+	flex-grow: 1;
+}
+
+.uni-comment-date view {
+	color: #666666;
+	font-size: 24rpx;
+	line-height: 38rpx;
+}
+
+.uni-comment-content {
+	line-height: 1.6em;
+	font-size: 28rpx;
+	padding: 8rpx 0;
+}
+
+.uni-comment-replay-btn {
+	background: #FFF;
+	font-size: 24rpx;
+	line-height: 28rpx;
+	padding: 5rpx 20rpx;
+	border-radius: 30rpx;
+	color: #333 !important;
+	margin: 0 10rpx;
+}
+
+/* swiper msg */
+.uni-swiper-msg {
+	width: 100%;
+	padding: 12rpx 0;
+	flex-wrap: nowrap;
+	display: flex;
+}
+
+.uni-swiper-msg-icon {
+	width: 50rpx;
+	margin-right: 20rpx;
+}
+
+.uni-swiper-msg-icon image {
+	width: 100%;
+	flex-shrink: 0;
+}
+
+.uni-swiper-msg swiper {
+	width: 100%;
+	height: 50rpx;
+}
+
+.uni-swiper-msg swiper-item {
+	line-height: 50rpx;
+}
+
+/* product */
+.uni-product-list {
+	display: flex;
+	width: 100%;
+	flex-wrap: wrap;
+	flex-direction: row;
+}
+
+.uni-product {
+	padding: 20rpx;
+	display: flex;
+	flex-direction: column;
+}
+
+.image-view {
+	height: 330rpx;
+	width: 330rpx;
+	margin: 12rpx 0;
+}
+
+.uni-product-image {
+	height: 330rpx;
+	width: 330rpx;
+}
+
+.uni-product-title {
+	width: 300rpx;
+	word-break: break-all;
+	display: -webkit-box;
+	overflow: hidden;
+	line-height: 1.5;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+}
+
+.uni-product-price {
+	margin-top: 10rpx;
+	font-size: 28rpx;
+	line-height: 1.5;
+	position: relative;
+}
+
+.uni-product-price-original {
+	color: #e80080;
+}
+
+.uni-product-price-favour {
+	color: #888888;
+	text-decoration: line-through;
+	margin-left: 10rpx;
+}
+
+.uni-product-tip {
+	position: absolute;
+	right: 10rpx;
+	background-color: #ff3333;
+	color: #ffffff;
+	padding: 0 10rpx;
+	border-radius: 5rpx;
+}
+
+/* timeline */
+.uni-timeline {
+	margin: 35rpx 0;
+	display: flex;
+	flex-direction: column;
+	position: relative;
+}
+
+
+.uni-timeline-item {
+	display: flex;
+	flex-direction: row;
+	position: relative;
+	padding-bottom: 20rpx;
+	box-sizing: border-box;
+	overflow: hidden;
+
+}
+
+.uni-timeline-item .uni-timeline-item-keynode {
+	width: 160rpx;
+	flex-shrink: 0;
+	box-sizing: border-box;
+	padding-right: 20rpx;
+	text-align: right;
+	line-height: 65rpx;
+}
+
+.uni-timeline-item .uni-timeline-item-divider {
+	flex-shrink: 0;
+	position: relative;
+	width: 30rpx;
+	height: 30rpx;
+	top: 15rpx;
+	border-radius: 50%;
+	background-color: #bbb;
+}
+
+
+
+.uni-timeline-item-divider::before,
+.uni-timeline-item-divider::after {
+	position: absolute;
+	left: 15rpx;
+	width: 1rpx;
+	height: 100vh;
+	content: '';
+	background: inherit;
+}
+
+.uni-timeline-item-divider::before {
+	bottom: 100%;
+}
+
+.uni-timeline-item-divider::after {
+	top: 100%;
+}
+
+
+.uni-timeline-last-item .uni-timeline-item-divider:after {
+	display: none;
+}
+
+.uni-timeline-first-item .uni-timeline-item-divider:before {
+	display: none;
+}
+
+.uni-timeline-item .uni-timeline-item-content {
+	padding-left: 20rpx;
+}
+
+.uni-timeline-last-item .bottom-border::after {
+	display: none;
+}
+
+.uni-timeline-item-content .datetime {
+	color: #CCCCCC;
+}
+
+/* 自定义节点颜色 */
+.uni-timeline-last-item .uni-timeline-item-divider {
+	background-color: #1AAD19;
+}
+
+
+/* uni-icon */
+
+.uni-icon {
+	font-family: uniicons;
+	font-size: 24px;
+	font-weight: normal;
+	font-style: normal;
+	line-height: 1;
+	display: inline-block;
+	text-decoration: none;
+	-webkit-font-smoothing: antialiased;
+}
+
+.uni-icon.uni-active {
+	color: #007aff;
+}
+
+.uni-icon-contact:before {
+	content: '\e100';
+}
+
+.uni-icon-person:before {
+	content: '\e101';
+}
+
+.uni-icon-personadd:before {
+	content: '\e102';
+}
+
+.uni-icon-contact-filled:before {
+	content: '\e130';
+}
+
+.uni-icon-person-filled:before {
+	content: '\e131';
+}
+
+.uni-icon-personadd-filled:before {
+	content: '\e132';
+}
+
+.uni-icon-phone:before {
+	content: '\e200';
+}
+
+.uni-icon-email:before {
+	content: '\e201';
+}
+
+.uni-icon-chatbubble:before {
+	content: '\e202';
+}
+
+.uni-icon-chatboxes:before {
+	content: '\e203';
+}
+
+.uni-icon-phone-filled:before {
+	content: '\e230';
+}
+
+.uni-icon-email-filled:before {
+	content: '\e231';
+}
+
+.uni-icon-chatbubble-filled:before {
+	content: '\e232';
+}
+
+.uni-icon-chatboxes-filled:before {
+	content: '\e233';
+}
+
+.uni-icon-weibo:before {
+	content: '\e260';
+}
+
+.uni-icon-weixin:before {
+	content: '\e261';
+}
+
+.uni-icon-pengyouquan:before {
+	content: '\e262';
+}
+
+.uni-icon-chat:before {
+	content: '\e263';
+}
+
+.uni-icon-qq:before {
+	content: '\e264';
+}
+
+.uni-icon-videocam:before {
+	content: '\e300';
+}
+
+.uni-icon-camera:before {
+	content: '\e301';
+}
+
+.uni-icon-mic:before {
+	content: '\e302';
+}
+
+.uni-icon-location:before {
+	content: '\e303';
+}
+
+.uni-icon-mic-filled:before,
+.uni-icon-speech:before {
+	content: '\e332';
+}
+
+.uni-icon-location-filled:before {
+	content: '\e333';
+}
+
+.uni-icon-micoff:before {
+	content: '\e360';
+}
+
+.uni-icon-image:before {
+	content: '\e363';
+}
+
+.uni-icon-map:before {
+	content: '\e364';
+}
+
+.uni-icon-compose:before {
+	content: '\e400';
+}
+
+.uni-icon-trash:before {
+	content: '\e401';
+}
+
+.uni-icon-upload:before {
+	content: '\e402';
+}
+
+.uni-icon-download:before {
+	content: '\e403';
+}
+
+.uni-icon-close:before {
+	content: '\e404';
+}
+
+.uni-icon-redo:before {
+	content: '\e405';
+}
+
+.uni-icon-undo:before {
+	content: '\e406';
+}
+
+.uni-icon-refresh:before {
+	content: '\e407';
+}
+
+.uni-icon-star:before {
+	content: '\e408';
+}
+
+.uni-icon-plus:before {
+	content: '\e409';
+}
+
+.uni-icon-minus:before {
+	content: '\e410';
+}
+
+.uni-icon-circle:before,
+.uni-icon-checkbox:before {
+	content: '\e411';
+}
+
+.uni-icon-close-filled:before,
+.uni-icon-clear:before {
+	content: '\e434';
+}
+
+.uni-icon-refresh-filled:before {
+	content: '\e437';
+}
+
+.uni-icon-star-filled:before {
+	content: '\e438';
+}
+
+.uni-icon-plus-filled:before {
+	content: '\e439';
+}
+
+.uni-icon-minus-filled:before {
+	content: '\e440';
+}
+
+.uni-icon-circle-filled:before {
+	content: '\e441';
+}
+
+.uni-icon-checkbox-filled:before {
+	content: '\e442';
+}
+
+.uni-icon-closeempty:before {
+	content: '\e460';
+}
+
+.uni-icon-refreshempty:before {
+	content: '\e461';
+}
+
+.uni-icon-reload:before {
+	content: '\e462';
+}
+
+.uni-icon-starhalf:before {
+	content: '\e463';
+}
+
+.uni-icon-spinner:before {
+	content: '\e464';
+}
+
+.uni-icon-spinner-cycle:before {
+	content: '\e465';
+}
+
+.uni-icon-search:before {
+	content: '\e466';
+}
+
+.uni-icon-plusempty:before {
+	content: '\e468';
+}
+
+.uni-icon-forward:before {
+	content: '\e470';
+}
+
+.uni-icon-back:before,
+.uni-icon-left-nav:before {
+	content: '\e471';
+}
+
+.uni-icon-checkmarkempty:before {
+	content: '\e472';
+}
+
+.uni-icon-home:before {
+	content: '\e500';
+}
+
+.uni-icon-navigate:before {
+	content: '\e501';
+}
+
+.uni-icon-gear:before {
+	content: '\e502';
+}
+
+.uni-icon-paperplane:before {
+	content: '\e503';
+}
+
+.uni-icon-info:before {
+	content: '\e504';
+}
+
+.uni-icon-help:before {
+	content: '\e505';
+}
+
+.uni-icon-locked:before {
+	content: '\e506';
+}
+
+.uni-icon-more:before {
+	content: '\e507';
+}
+
+.uni-icon-flag:before {
+	content: '\e508';
+}
+
+.uni-icon-home-filled:before {
+	content: '\e530';
+}
+
+.uni-icon-gear-filled:before {
+	content: '\e532';
+}
+
+.uni-icon-info-filled:before {
+	content: '\e534';
+}
+
+.uni-icon-help-filled:before {
+	content: '\e535';
+}
+
+.uni-icon-more-filled:before {
+	content: '\e537';
+}
+
+.uni-icon-settings:before {
+	content: '\e560';
+}
+
+.uni-icon-list:before {
+	content: '\e562';
+}
+
+.uni-icon-bars:before {
+	content: '\e563';
+}
+
+.uni-icon-loop:before {
+	content: '\e565';
+}
+
+.uni-icon-paperclip:before {
+	content: '\e567';
+}
+
+.uni-icon-eye:before {
+	content: '\e568';
+}
+
+.uni-icon-arrowup:before {
+	content: '\e580';
+}
+
+.uni-icon-arrowdown:before {
+	content: '\e581';
+}
+
+.uni-icon-arrowleft:before {
+	content: '\e582';
+}
+
+.uni-icon-arrowright:before {
+	content: '\e583';
+}
+
+.uni-icon-arrowthinup:before {
+	content: '\e584';
+}
+
+.uni-icon-arrowthindown:before {
+	content: '\e585';
+}
+
+.uni-icon-arrowthinleft:before {
+	content: '\e586';
+}
+
+.uni-icon-arrowthinright:before {
+	content: '\e587';
+}
+
+.uni-icon-pulldown:before {
+	content: '\e588';
+}
+
+.uni-icon-scan:before {
+	content: "\e612";
+}
+
+/* 分界线 */
+.uni-divider {
+	height: 110rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	position: relative;
+}
+
+.uni-divider__content {
+	font-size: 28rpx;
+	color: #999;
+	padding: 0 20rpx;
+	position: relative;
+	z-index: 101;
+	background: #F4F5F6;
+}
+
+.uni-divider__line {
+	background-color: #CCCCCC;
+	height: 1px;
+	width: 100%;
+	position: absolute;
+	z-index: 100;
+	top: 50%;
+	left: 0;
+	transform: translateY(50%);
+}
+
+.left-win-active text {
+	color: #007AFF !important;
+}
diff --git a/common/utils/auth.js b/common/utils/auth.js
new file mode 100644
index 0000000..57eeb28
--- /dev/null
+++ b/common/utils/auth.js
@@ -0,0 +1,21 @@
+const AccessTokenKey = 'ACCESS_TOKEN'
+const RefreshTokenKey = 'REFRESH_TOKEN'
+
+// ========== Token 相关 ==========
+export function getAccessToken() {
+  return uni.getStorageSync(AccessTokenKey)
+}
+
+export function getRefreshToken() {
+  return uni.getStorageSync(RefreshTokenKey)
+}
+
+export function setToken(token) {
+  uni.setStorageSync(AccessTokenKey, token.accessToken)
+  uni.setStorageSync(RefreshTokenKey, token.refreshToken)
+}
+
+export function removeToken() {
+  uni.removeStorageSync(AccessTokenKey)
+  uni.removeStorageSync(RefreshTokenKey)
+}
diff --git a/common/utils/common.js b/common/utils/common.js
new file mode 100644
index 0000000..00d4137
--- /dev/null
+++ b/common/utils/common.js
@@ -0,0 +1,54 @@
+/**
+* 显示消息提示框
+* @param content 提示的标题
+*/
+export function toast(content) {
+  uni.showToast({
+    icon: 'none',
+    title: content
+  })
+}
+
+/**
+* 显示模态弹窗
+* @param content 提示的标题
+*/
+export function showConfirm(content) {
+  return new Promise((resolve, reject) => {
+    uni.showModal({
+      title: '提示',
+      content: content,
+      cancelText: '取消',
+      confirmText: '确定',
+      success: function(res) {
+        resolve(res)
+      }
+    })
+  })
+}
+
+/**
+* 参数处理
+* @param params 参数
+*/
+export function tansParams(params) {
+  let result = ''
+  for (const propName of Object.keys(params)) {
+    const value = params[propName]
+    var part = encodeURIComponent(propName) + "="
+    if (value !== null && value !== "" && typeof (value) !== "undefined") {
+      if (typeof value === 'object') {
+        for (const key of Object.keys(value)) {
+          if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
+            let params = propName + '[' + key + ']'
+            var subPart = encodeURIComponent(params) + "="
+            result += subPart + encodeURIComponent(value[key]) + "&"
+          }
+        }
+      } else {
+        result += part + encodeURIComponent(value) + "&"
+      }
+    }
+  }
+  return result
+}
\ No newline at end of file
diff --git a/common/utils/constant.js b/common/utils/constant.js
new file mode 100644
index 0000000..89e54ca
--- /dev/null
+++ b/common/utils/constant.js
@@ -0,0 +1,9 @@
+const constant = {
+   avatar: 'vuex_avatar',
+   name: 'vuex_name',
+   roles: 'vuex_roles',
+   permissions: 'vuex_permissions',
+   tenantId:'vuex_tenantId'
+ }
+
+ export default constant
diff --git a/common/utils/errorCode.js b/common/utils/errorCode.js
new file mode 100644
index 0000000..d2111ee
--- /dev/null
+++ b/common/utils/errorCode.js
@@ -0,0 +1,6 @@
+export default {
+  '401': '认证失败，无法访问系统资源',
+  '403': '当前操作没有权限',
+  '404': '访问资源不存在',
+  'default': '系统未知错误，请反馈给管理员'
+}
diff --git a/common/utils/permission.js b/common/utils/permission.js
new file mode 100644
index 0000000..17969f2
--- /dev/null
+++ b/common/utils/permission.js
@@ -0,0 +1,51 @@
+import store from '@/store'
+
+/**
+ * 字符权限校验
+ * @param {Array} value 校验值
+ * @returns {Boolean}
+ */
+export function checkPermi(value) {
+  if (value && value instanceof Array && value.length > 0) {
+    const permissions = store.getters && store.getters.permissions
+    const permissionDatas = value
+    const all_permission = "*:*:*"
+
+    const hasPermission = permissions.some(permission => {
+      return all_permission === permission || permissionDatas.includes(permission)
+    })
+
+    if (!hasPermission) {
+      return false
+    }
+    return true
+  } else {
+    console.error(`need roles! Like checkPermi="['system:user:add','system:user:edit']"`)
+    return false
+  }
+}
+
+/**
+ * 角色权限校验
+ * @param {Array} value 校验值
+ * @returns {Boolean}
+ */
+export function checkRole(value) {
+  if (value && value instanceof Array && value.length > 0) {
+    const roles = store.getters && store.getters.roles
+    const permissionRoles = value
+    const super_admin = "admin"
+
+    const hasRole = roles.some(role => {
+      return super_admin === role || permissionRoles.includes(role)
+    })
+
+    if (!hasRole) {
+      return false
+    }
+    return true
+  } else {
+    console.error(`need roles! Like checkRole="['admin','editor']"`)
+    return false
+  }
+}
\ No newline at end of file
diff --git a/common/utils/ruoyi.js b/common/utils/ruoyi.js
new file mode 100644
index 0000000..fb60217
--- /dev/null
+++ b/common/utils/ruoyi.js
@@ -0,0 +1,47 @@
+/**
+ * 通用js方法封装处理
+ * Copyright (c) 2019 ruoyi
+ */
+
+// 日期格式化
+export function parseTime(time, pattern) {
+  if (arguments.length === 0 || !time) {
+    return null
+  }
+  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+      time = parseInt(time)
+    } else if (typeof time === 'string') {
+      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm),'');
+    }
+    if ((typeof time === 'number') && (time.toString().length === 10)) {
+      time = time * 1000
+    }
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  }
+  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    let value = formatObj[key]
+    // Note: getDay() returns 0 on Sunday
+    if (key === 'a') {
+      return ['日', '一', '二', '三', '四', '五', '六'][value]
+    }
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return time_str
+}
diff --git a/common/utils/storage.js b/common/utils/storage.js
new file mode 100644
index 0000000..515d413
--- /dev/null
+++ b/common/utils/storage.js
@@ -0,0 +1,37 @@
+// 获取本地存储对应key
+const getStorage = (key)=>{
+  return uni.getStorageSync( key );
+}
+
+// 设置本地存储对应key
+const setStorage = (key,value)=>{
+  return uni.setStorageSync( key,value );
+}
+
+// 清除全部本地存储
+const clearStorage = ()=>{
+  uni.clearStorageSync();
+}
+
+// 清除指定key本地存储
+const removeStorage = ( key )=>{
+  uni.removeStorageSync( key );
+}
+
+const constant = {
+   id:"id",
+   token:"token",
+   avatar: 'avatar',
+   name: 'name',
+   roles: 'roles',
+   permissions: 'permissions'
+ }
+
+
+export default {
+	getStorage,
+	setStorage,
+	clearStorage,
+	removeStorage,	
+	constant
+}
\ No newline at end of file
diff --git a/components/amap-wx/js/util.js b/components/amap-wx/js/util.js
new file mode 100644
index 0000000..65779df
--- /dev/null
+++ b/components/amap-wx/js/util.js
@@ -0,0 +1,181 @@
+import amap from '@/components/amap-wx/lib/amap-wx.js';
+// 地铁颜色图
+const line = {
+	'1号线': '#C43B33',
+	'2号线': '#016299',
+	'4号线/大兴线': '#008E9C',
+	'5号线': '#A42380',
+	'6号线': '#D09900',
+	'7号线': '#F2C172',
+	'8号线': '#009D6A',
+	'9号线': '#8FC41E',
+	'10号线': '#009DBE',
+	'13号线': '#F9E701',
+	'14号线东段': '#D4A7A2',
+	'14号线西段': '#D4A7A2',
+	'15号线': '#5D2D69',
+	'八通线': '#C33A32',
+	'昌平线': '#DE82B1',
+	'亦庄线': '#E40177',
+	'房山线': '#E66021',
+	'机场线': '#A29BBC',
+}
+
+// 150500:地铁站 ,150700:公交站 , 190700:地名地址
+const typecode = [{
+	id: '150500',
+	icon: 'icon-ditie'
+}, {
+	id: '150700',
+	icon: 'icon-gongjiao'
+}, {
+	id: '190700',
+	icon: 'icon-gonglu'
+}];
+
+const util = {
+	key:'b526b09b86cd2996e7732be8ab8c4430',
+	/**
+	 * 初始化高德地图api
+	 */
+	mapInit() {
+		return new amap.AMapWX({
+			key: this.key
+		});
+	},
+	// 服务状态吗
+	typecode,
+	/**
+	 * 获取地图颜色
+	 */
+	lineColor(name) {
+		if (line[name]) {
+			return line[name];
+		} else {
+			return '#ccc';
+		}
+	},
+	/**
+	 * 关键字颜色变化
+	 */
+	serachNmme(val, name) {
+		let namestr = new RegExp(val);
+		let nameresult =
+			`<div style="font-size: 14px;color: #333;line-height: 1.5;">
+		    ${name.replace(namestr, "<span style='color:#66ccff;'>" + val + '</span>')}
+		    </div>`
+			.trim();
+
+		return nameresult;
+	},
+	/**
+	 *  地址转地铁线路
+	 */
+	addressToLine(address, type) {
+		let addr = address.split(';');
+		let dt = '';
+		addr.forEach(elm => {
+			let color = '#cccccc';
+			if (type === typecode[0].id) {
+				color = this.lineColor(elm)
+			} else if (type === typecode[1].id) {
+				color = '#4075cb'
+			}
+			let style = 'margin:5px 0;margin-right:5px;padding:0 5px;background:' + color +
+				';font-size:12px;color:#fff;border-radius:3px;';
+			dt += `<div style=\'${style}\'>${elm}</div>`;
+
+		});
+		return `<div style="display:flex;flex-wrap: wrap;">${dt}</div>`;
+	},
+	/**
+	 * 数据处理
+	 */
+	dataHandle(item, val) {
+		// 改变字体颜色
+		if (val) {
+			item.nameNodes = util.serachNmme(val, item.name);
+		} else {
+			item.nameNodes = `<div style="font-size: 14px;color: #333;line-height: 1.5;">${item.name}</div>`;
+
+		}
+		// 地址解析 地铁
+		if (
+			item.typecode === util.typecode[0].id ||
+			item.typecode === util.typecode[1].id
+		) {
+			item.addressNodes = util.addressToLine(item.address, item.typecode);
+			if (item.typecode === util.typecode[0].id) {
+				item.icon = util.typecode[0].icon;
+			} else if (item.typecode === util.typecode[1].id) {
+				item.icon = util.typecode[1].icon;
+			}
+		} else {
+			item.addressNodes = `<span>${item.district}${
+				item.address.length > 0 ? '·' + item.address : ''
+			}</span>`.trim();
+			item.icon = 'icon-weizhi';
+		}
+
+		if (item.location && item.location.length === 0) {
+			item.icon = 'icon-sousuo';
+		}
+
+		return item;
+	},
+	/**
+	 * 存储历史数据
+	 * val [string | object]需要存储的内容
+	 */
+	setHistory(val) {
+		let searchHistory = uni.getStorageSync('search:history');
+		if (!searchHistory) searchHistory = [];
+		let serachData = {};
+		if (typeof(val) === 'string') {
+			serachData = {
+				adcode: [],
+				address: [],
+				city: [],
+				district: [],
+				id: [],
+				location: [],
+				name: val,
+				typecode: []
+			};
+		} else {
+			serachData = val
+		}
+
+		// 判断数组是否存在，如果存在，那么将放到最前面
+		for (var i = 0; i < searchHistory.length; i++) {
+			if (searchHistory[i].name === serachData.name) {
+				searchHistory.splice(i, 1);
+				break;
+			}
+		}
+
+		searchHistory.unshift(util.dataHandle(serachData));
+		uni.setStorage({
+			key: 'search:history',
+			data: searchHistory,
+			success: function() {
+				// console.log('success');
+			}
+		});
+	},
+	getHistory() {
+
+	},
+	removeHistory() {
+		uni.removeStorage({
+			key: 'search:history',
+			success: function(res) {
+				console.log('success');
+			}
+		});
+		return []
+	}
+
+}
+
+export default util;
diff --git a/components/amap-wx/lib/amap-wx.js b/components/amap-wx/lib/amap-wx.js
new file mode 100644
index 0000000..e1ef2b2
--- /dev/null
+++ b/components/amap-wx/lib/amap-wx.js
@@ -0,0 +1 @@
+function AMapWX(a){this.key=a.key,this.requestConfig={key:a.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"}}AMapWX.prototype.getWxLocation=function(a,b){wx.getLocation({type:"gcj02",success:function(a){var c=a.longitude+","+a.latitude;wx.setStorage({key:"userLocation",data:c}),b(c)},fail:function(c){wx.getStorage({key:"userLocation",success:function(a){a.data&&b(a.data)}}),a.fail({errCode:"0",errMsg:c.errMsg||""})}})},AMapWX.prototype.getRegeo=function(a){function c(c){var d=b.requestConfig;wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:b.key,location:c,extensions:"all",s:d.s,platform:d.platform,appname:b.key,sdkversion:d.sdkversion,logversion:d.logversion},method:"GET",header:{"content-type":"application/json"},success:function(b){var d,e,f,g,h,i,j,k,l;b.data.status&&"1"==b.data.status?(d=b.data.regeocode,e=d.addressComponent,f=[],g="",d&&d.roads[0]&&d.roads[0].name&&(g=d.roads[0].name+"附近"),h=c.split(",")[0],i=c.split(",")[1],d.pois&&d.pois[0]&&(g=d.pois[0].name+"附近",j=d.pois[0].location,j&&(h=parseFloat(j.split(",")[0]),i=parseFloat(j.split(",")[1]))),e.provice&&f.push(e.provice),e.city&&f.push(e.city),e.district&&f.push(e.district),e.streetNumber&&e.streetNumber.street&&e.streetNumber.number?(f.push(e.streetNumber.street),f.push(e.streetNumber.number)):(k="",d&&d.roads[0]&&d.roads[0].name&&(k=d.roads[0].name),f.push(k)),f=f.join(""),l=[{iconPath:a.iconPath,width:a.iconWidth,height:a.iconHeight,name:f,desc:g,longitude:h,latitude:i,id:0,regeocodeData:d}],a.success(l)):a.fail({errCode:b.data.infocode,errMsg:b.data.info})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})}var b=this;a.location?c(a.location):b.getWxLocation(a,function(a){c(a)})},AMapWX.prototype.getWeather=function(a){function d(d){var e="base";a.type&&"forecast"==a.type&&(e="all"),wx.request({url:"https://restapi.amap.com/v3/weather/weatherInfo",data:{key:b.key,city:d,extensions:e,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion},method:"GET",header:{"content-type":"application/json"},success:function(b){function c(a){var b={city:{text:"城市",data:a.city},weather:{text:"天气",data:a.weather},temperature:{text:"温度",data:a.temperature},winddirection:{text:"风向",data:a.winddirection+"风"},windpower:{text:"风力",data:a.windpower+"级"},humidity:{text:"湿度",data:a.humidity+"%"}};return b}var d,e;b.data.status&&"1"==b.data.status?b.data.lives?(d=b.data.lives,d&&d.length>0&&(d=d[0],e=c(d),e["liveData"]=d,a.success(e))):b.data.forecasts&&b.data.forecasts[0]&&a.success({forecast:b.data.forecasts[0]}):a.fail({errCode:b.data.infocode,errMsg:b.data.info})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})}function e(e){wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:b.key,location:e,extensions:"all",s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion},method:"GET",header:{"content-type":"application/json"},success:function(b){var c,e;b.data.status&&"1"==b.data.status?(e=b.data.regeocode,e.addressComponent?c=e.addressComponent.adcode:e.aois&&e.aois.length>0&&(c=e.aois[0].adcode),d(c)):a.fail({errCode:b.data.infocode,errMsg:b.data.info})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})}var b=this,c=b.requestConfig;a.city?d(a.city):b.getWxLocation(a,function(a){e(a)})},AMapWX.prototype.getPoiAround=function(a){function d(d){var e={key:b.key,location:d,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.querytypes&&(e["types"]=a.querytypes),a.querykeywords&&(e["keywords"]=a.querykeywords),wx.request({url:"https://restapi.amap.com/v3/place/around",data:e,method:"GET",header:{"content-type":"application/json"},success:function(b){var c,d,e,f;if(b.data.status&&"1"==b.data.status){if(b=b.data,b&&b.pois){for(c=[],d=0;d<b.pois.length;d++)e=0==d?a.iconPathSelected:a.iconPath,c.push({latitude:parseFloat(b.pois[d].location.split(",")[1]),longitude:parseFloat(b.pois[d].location.split(",")[0]),iconPath:e,width:22,height:32,id:d,name:b.pois[d].name,address:b.pois[d].address});f={markers:c,poisData:b.pois},a.success(f)}}else a.fail({errCode:b.data.infocode,errMsg:b.data.info})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})}var b=this,c=b.requestConfig;a.location?d(a.location):b.getWxLocation(a,function(a){d(a)})},AMapWX.prototype.getStaticmap=function(a){function f(b){c.push("location="+b),a.zoom&&c.push("zoom="+a.zoom),a.size&&c.push("size="+a.size),a.scale&&c.push("scale="+a.scale),a.markers&&c.push("markers="+a.markers),a.labels&&c.push("labels="+a.labels),a.paths&&c.push("paths="+a.paths),a.traffic&&c.push("traffic="+a.traffic);var e=d+c.join("&");a.success({url:e})}var e,b=this,c=[],d="https://restapi.amap.com/v3/staticmap?";c.push("key="+b.key),e=b.requestConfig,c.push("s="+e.s),c.push("platform="+e.platform),c.push("appname="+e.appname),c.push("sdkversion="+e.sdkversion),c.push("logversion="+e.logversion),a.location?f(a.location):b.getWxLocation(a,function(a){f(a)})},AMapWX.prototype.getInputtips=function(a){var b=this,c=b.requestConfig,d={key:b.key,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.location&&(d["location"]=a.location),a.keywords&&(d["keywords"]=a.keywords),a.type&&(d["type"]=a.type),a.city&&(d["city"]=a.city),a.citylimit&&(d["citylimit"]=a.citylimit),wx.request({url:"https://restapi.amap.com/v3/assistant/inputtips",data:d,method:"GET",header:{"content-type":"application/json"},success:function(b){b&&b.data&&b.data.tips&&a.success({tips:b.data.tips})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})},AMapWX.prototype.getDrivingRoute=function(a){var b=this,c=b.requestConfig,d={key:b.key,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.origin&&(d["origin"]=a.origin),a.destination&&(d["destination"]=a.destination),a.strategy&&(d["strategy"]=a.strategy),a.waypoints&&(d["waypoints"]=a.waypoints),a.avoidpolygons&&(d["avoidpolygons"]=a.avoidpolygons),a.avoidroad&&(d["avoidroad"]=a.avoidroad),wx.request({url:"https://restapi.amap.com/v3/direction/driving",data:d,method:"GET",header:{"content-type":"application/json"},success:function(b){b&&b.data&&b.data.route&&a.success({paths:b.data.route.paths,taxi_cost:b.data.route.taxi_cost||""})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})},AMapWX.prototype.getWalkingRoute=function(a){var b=this,c=b.requestConfig,d={key:b.key,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.origin&&(d["origin"]=a.origin),a.destination&&(d["destination"]=a.destination),wx.request({url:"https://restapi.amap.com/v3/direction/walking",data:d,method:"GET",header:{"content-type":"application/json"},success:function(b){b&&b.data&&b.data.route&&a.success({paths:b.data.route.paths})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})},AMapWX.prototype.getTransitRoute=function(a){var b=this,c=b.requestConfig,d={key:b.key,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.origin&&(d["origin"]=a.origin),a.destination&&(d["destination"]=a.destination),a.strategy&&(d["strategy"]=a.strategy),a.city&&(d["city"]=a.city),a.cityd&&(d["cityd"]=a.cityd),wx.request({url:"https://restapi.amap.com/v3/direction/transit/integrated",data:d,method:"GET",header:{"content-type":"application/json"},success:function(b){if(b&&b.data&&b.data.route){var c=b.data.route;a.success({distance:c.distance||"",taxi_cost:c.taxi_cost||"",transits:c.transits})}},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})},AMapWX.prototype.getRidingRoute=function(a){var b=this,c=b.requestConfig,d={key:b.key,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.origin&&(d["origin"]=a.origin),a.destination&&(d["destination"]=a.destination),wx.request({url:"https://restapi.amap.com/v4/direction/bicycling",data:d,method:"GET",header:{"content-type":"application/json"},success:function(b){b&&b.data&&b.data.data&&a.success({paths:b.data.data.paths})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})};export default {AMapWX};
diff --git a/components/custom-nomore/custom-nomore.vue b/components/custom-nomore/custom-nomore.vue
new file mode 100644
index 0000000..17c2cff
--- /dev/null
+++ b/components/custom-nomore/custom-nomore.vue
@@ -0,0 +1,39 @@
+<!-- z-paging自定义的没有更多数据view -->
+<template>
+	<view class="nomore">
+		<!-- 这里的图片请换成自己项目的图片 -->
+		<image class="nomore-image" mode="aspectFit" src="@/static/no_more.png"></image>
+		<text class="nomore-text">已经到达宇宙尽头啦~</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+	
+</script>
+
+<style scoped>
+	.nomore{
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		padding: 20rpx 0px;
+	}
+	.nomore-image{
+		width: 200rpx;
+		height: 130rpx;
+	}
+	.nomore-text{
+		margin-top: 10rpx;
+		font-size: 24rpx;
+		color: #222963;
+	}
+</style>
diff --git a/components/custom-refresher/custom-refresher.vue b/components/custom-refresher/custom-refresher.vue
new file mode 100644
index 0000000..1a7f6f1
--- /dev/null
+++ b/components/custom-refresher/custom-refresher.vue
@@ -0,0 +1,58 @@
+<!-- z-paging自定义的下拉刷新view -->
+<template>
+	<view class="refresher-container">
+		<!-- 这里的图片请换成自己项目的图片 -->
+		<image class="refresher-image" mode="aspectFit" src="@/static/refresher_loading.gif"></image>
+		<text class="refresher-text">{{statusText}}</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		computed: {
+			statusText() {
+				// 这里可以做i18n国际化相关操作，可以通过uni.getLocale()获取当前语言(具体操作见i18n-demo.vue);
+				// 获取到当前语言之后，就可以自定义不同语言下的展示内容了
+				const statusTextArr = ['哎呀，用点力继续下拉！', '拉疼我啦，松手刷新~~', '正在努力刷新中...', '刷新成功啦~'];
+				return statusTextArr[this.status];
+			}
+		},
+		props: {
+			status: {
+				type: Number,
+				default: function() {
+					return 0;
+				},
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.refresher-container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		height: 150rpx;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.refresher-image {
+		margin-top: 10rpx;
+		height: 45px;
+		width: 45px;
+	}
+
+	.refresher-text {
+		margin-top: 10rpx;
+		font-size: 24rpx;
+		color: #666666;
+	}
+</style>
diff --git a/components/marked/index.js b/components/marked/index.js
new file mode 100644
index 0000000..33e56c3
--- /dev/null
+++ b/components/marked/index.js
@@ -0,0 +1 @@
+export default './lib/marked'
diff --git a/components/marked/lib/marked.js b/components/marked/lib/marked.js
new file mode 100644
index 0000000..6a71e92
--- /dev/null
+++ b/components/marked/lib/marked.js
@@ -0,0 +1,1573 @@
+/**
+ * marked - a markdown parser
+ * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed)
+ * https://github.com/markedjs/marked
+ */
+
+;(function(root) {
+'use strict';
+
+/**
+ * Block-Level Grammar
+ */
+
+var block = {
+  newline: /^\n+/,
+  code: /^( {4}[^\n]+\n*)+/,
+  fences: noop,
+  hr: /^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,
+  heading: /^ *(#{1,6}) *([^\n]+?) *(?:#+ *)?(?:\n+|$)/,
+  nptable: noop,
+  blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
+  list: /^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
+  html: '^ {0,3}(?:' // optional indentation
+    + '<(script|pre|style)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)' // (1)
+    + '|comment[^\\n]*(\\n+|$)' // (2)
+    + '|<\\?[\\s\\S]*?\\?>\\n*' // (3)
+    + '|<![A-Z][\\s\\S]*?>\\n*' // (4)
+    + '|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>\\n*' // (5)
+    + '|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:\\n{2,}|$)' // (6)
+    + '|<(?!script|pre|style)([a-z][\\w-]*)(?:attribute)*? */?>(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$)' // (7) open tag
+    + '|</(?!script|pre|style)[a-z][\\w-]*\\s*>(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$)' // (7) closing tag
+    + ')',
+  def: /^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,
+  table: noop,
+  lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
+  paragraph: /^([^\n]+(?:\n(?!hr|heading|lheading| {0,3}>|<\/?(?:tag)(?: +|\n|\/?>)|<(?:script|pre|style|!--))[^\n]+)*)/,
+  text: /^[^\n]+/
+};
+
+block._label = /(?!\s*\])(?:\\[\[\]]|[^\[\]])+/;
+block._title = /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/;
+block.def = edit(block.def)
+  .replace('label', block._label)
+  .replace('title', block._title)
+  .getRegex();
+
+block.bullet = /(?:[*+-]|\d+\.)/;
+block.item = /^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;
+block.item = edit(block.item, 'gm')
+  .replace(/bull/g, block.bullet)
+  .getRegex();
+
+block.list = edit(block.list)
+  .replace(/bull/g, block.bullet)
+  .replace('hr', '\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))')
+  .replace('def', '\\n+(?=' + block.def.source + ')')
+  .getRegex();
+
+block._tag = 'address|article|aside|base|basefont|blockquote|body|caption'
+  + '|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption'
+  + '|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe'
+  + '|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option'
+  + '|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr'
+  + '|track|ul';
+block._comment = /<!--(?!-?>)[\s\S]*?-->/;
+block.html = edit(block.html, 'i')
+  .replace('comment', block._comment)
+  .replace('tag', block._tag)
+  .replace('attribute', / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/)
+  .getRegex();
+
+block.paragraph = edit(block.paragraph)
+  .replace('hr', block.hr)
+  .replace('heading', block.heading)
+  .replace('lheading', block.lheading)
+  .replace('tag', block._tag) // pars can be interrupted by type (6) html blocks
+  .getRegex();
+
+block.blockquote = edit(block.blockquote)
+  .replace('paragraph', block.paragraph)
+  .getRegex();
+
+/**
+ * Normal Block Grammar
+ */
+
+block.normal = merge({}, block);
+
+/**
+ * GFM Block Grammar
+ */
+
+block.gfm = merge({}, block.normal, {
+  fences: /^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\n? *\1 *(?:\n+|$)/,
+  paragraph: /^/,
+  heading: /^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/
+});
+
+block.gfm.paragraph = edit(block.paragraph)
+  .replace('(?!', '(?!'
+    + block.gfm.fences.source.replace('\\1', '\\2') + '|'
+    + block.list.source.replace('\\1', '\\3') + '|')
+  .getRegex();
+
+/**
+ * GFM + Tables Block Grammar
+ */
+
+block.tables = merge({}, block.gfm, {
+  nptable: /^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/,
+  table: /^ *\|(.+)\n *\|?( *[-:]+[-| :]*)(?:\n((?: *[^>\n ].*(?:\n|$))*)\n*|$)/
+});
+
+/**
+ * Pedantic grammar
+ */
+
+block.pedantic = merge({}, block.normal, {
+  html: edit(
+    '^ *(?:comment *(?:\\n|\\s*$)'
+    + '|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)' // closed tag
+    + '|<tag(?:"[^"]*"|\'[^\']*\'|\\s[^\'"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))')
+    .replace('comment', block._comment)
+    .replace(/tag/g, '(?!(?:'
+      + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub'
+      + '|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)'
+      + '\\b)\\w+(?!:|[^\\w\\s@]*@)\\b')
+    .getRegex(),
+  def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/
+});
+
+/**
+ * Block Lexer
+ */
+
+function Lexer(options) {
+  this.tokens = [];
+  this.tokens.links = Object.create(null);
+  this.options = options || marked.defaults;
+  this.rules = block.normal;
+
+  if (this.options.pedantic) {
+    this.rules = block.pedantic;
+  } else if (this.options.gfm) {
+    if (this.options.tables) {
+      this.rules = block.tables;
+    } else {
+      this.rules = block.gfm;
+    }
+  }
+}
+
+/**
+ * Expose Block Rules
+ */
+
+Lexer.rules = block;
+
+/**
+ * Static Lex Method
+ */
+
+Lexer.lex = function(src, options) {
+  var lexer = new Lexer(options);
+  return lexer.lex(src);
+};
+
+/**
+ * Preprocessing
+ */
+
+Lexer.prototype.lex = function(src) {
+  src = src
+    .replace(/\r\n|\r/g, '\n')
+    .replace(/\t/g, '    ')
+    .replace(/\u00a0/g, ' ')
+    .replace(/\u2424/g, '\n');
+
+  return this.token(src, true);
+};
+
+/**
+ * Lexing
+ */
+
+Lexer.prototype.token = function(src, top) {
+  src = src.replace(/^ +$/gm, '');
+  var next,
+      loose,
+      cap,
+      bull,
+      b,
+      item,
+      listStart,
+      listItems,
+      t,
+      space,
+      i,
+      tag,
+      l,
+      isordered,
+      istask,
+      ischecked;
+
+  while (src) {
+    // newline
+    if (cap = this.rules.newline.exec(src)) {
+      src = src.substring(cap[0].length);
+      if (cap[0].length > 1) {
+        this.tokens.push({
+          type: 'space'
+        });
+      }
+    }
+
+    // code
+    if (cap = this.rules.code.exec(src)) {
+      src = src.substring(cap[0].length);
+      cap = cap[0].replace(/^ {4}/gm, '');
+      this.tokens.push({
+        type: 'code',
+        text: !this.options.pedantic
+          ? rtrim(cap, '\n')
+          : cap
+      });
+      continue;
+    }
+
+    // fences (gfm)
+    if (cap = this.rules.fences.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'code',
+        lang: cap[2],
+        text: cap[3] || ''
+      });
+      continue;
+    }
+
+    // heading
+    if (cap = this.rules.heading.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'heading',
+        depth: cap[1].length,
+        text: cap[2]
+      });
+      continue;
+    }
+
+    // table no leading pipe (gfm)
+    if (top && (cap = this.rules.nptable.exec(src))) {
+      item = {
+        type: 'table',
+        header: splitCells(cap[1].replace(/^ *| *\| *$/g, '')),
+        align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
+        cells: cap[3] ? cap[3].replace(/\n$/, '').split('\n') : []
+      };
+
+      if (item.header.length === item.align.length) {
+        src = src.substring(cap[0].length);
+
+        for (i = 0; i < item.align.length; i++) {
+          if (/^ *-+: *$/.test(item.align[i])) {
+            item.align[i] = 'right';
+          } else if (/^ *:-+: *$/.test(item.align[i])) {
+            item.align[i] = 'center';
+          } else if (/^ *:-+ *$/.test(item.align[i])) {
+            item.align[i] = 'left';
+          } else {
+            item.align[i] = null;
+          }
+        }
+
+        for (i = 0; i < item.cells.length; i++) {
+          item.cells[i] = splitCells(item.cells[i], item.header.length);
+        }
+
+        this.tokens.push(item);
+
+        continue;
+      }
+    }
+
+    // hr
+    if (cap = this.rules.hr.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'hr'
+      });
+      continue;
+    }
+
+    // blockquote
+    if (cap = this.rules.blockquote.exec(src)) {
+      src = src.substring(cap[0].length);
+
+      this.tokens.push({
+        type: 'blockquote_start'
+      });
+
+      cap = cap[0].replace(/^ *> ?/gm, '');
+
+      // Pass `top` to keep the current
+      // "toplevel" state. This is exactly
+      // how markdown.pl works.
+      this.token(cap, top);
+
+      this.tokens.push({
+        type: 'blockquote_end'
+      });
+
+      continue;
+    }
+
+    // list
+    if (cap = this.rules.list.exec(src)) {
+      src = src.substring(cap[0].length);
+      bull = cap[2];
+      isordered = bull.length > 1;
+
+      listStart = {
+        type: 'list_start',
+        ordered: isordered,
+        start: isordered ? +bull : '',
+        loose: false
+      };
+
+      this.tokens.push(listStart);
+
+      // Get each top-level item.
+      cap = cap[0].match(this.rules.item);
+
+      listItems = [];
+      next = false;
+      l = cap.length;
+      i = 0;
+
+      for (; i < l; i++) {
+        item = cap[i];
+
+        // Remove the list item's bullet
+        // so it is seen as the next token.
+        space = item.length;
+        item = item.replace(/^ *([*+-]|\d+\.) +/, '');
+
+        // Outdent whatever the
+        // list item contains. Hacky.
+        if (~item.indexOf('\n ')) {
+          space -= item.length;
+          item = !this.options.pedantic
+            ? item.replace(new RegExp('^ {1,' + space + '}', 'gm'), '')
+            : item.replace(/^ {1,4}/gm, '');
+        }
+
+        // Determine whether the next list item belongs here.
+        // Backpedal if it does not belong in this list.
+        if (this.options.smartLists && i !== l - 1) {
+          b = block.bullet.exec(cap[i + 1])[0];
+          if (bull !== b && !(bull.length > 1 && b.length > 1)) {
+            src = cap.slice(i + 1).join('\n') + src;
+            i = l - 1;
+          }
+        }
+
+        // Determine whether item is loose or not.
+        // Use: /(^|\n)(?! )[^\n]+\n\n(?!\s*$)/
+        // for discount behavior.
+        loose = next || /\n\n(?!\s*$)/.test(item);
+        if (i !== l - 1) {
+          next = item.charAt(item.length - 1) === '\n';
+          if (!loose) loose = next;
+        }
+
+        if (loose) {
+          listStart.loose = true;
+        }
+
+        // Check for task list items
+        istask = /^\[[ xX]\] /.test(item);
+        ischecked = undefined;
+        if (istask) {
+          ischecked = item[1] !== ' ';
+          item = item.replace(/^\[[ xX]\] +/, '');
+        }
+
+        t = {
+          type: 'list_item_start',
+          task: istask,
+          checked: ischecked,
+          loose: loose
+        };
+
+        listItems.push(t);
+        this.tokens.push(t);
+
+        // Recurse.
+        this.token(item, false);
+
+        this.tokens.push({
+          type: 'list_item_end'
+        });
+      }
+
+      if (listStart.loose) {
+        l = listItems.length;
+        i = 0;
+        for (; i < l; i++) {
+          listItems[i].loose = true;
+        }
+      }
+
+      this.tokens.push({
+        type: 'list_end'
+      });
+
+      continue;
+    }
+
+    // html
+    if (cap = this.rules.html.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: this.options.sanitize
+          ? 'paragraph'
+          : 'html',
+        pre: !this.options.sanitizer
+          && (cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style'),
+        text: cap[0]
+      });
+      continue;
+    }
+
+    // def
+    if (top && (cap = this.rules.def.exec(src))) {
+      src = src.substring(cap[0].length);
+      if (cap[3]) cap[3] = cap[3].substring(1, cap[3].length - 1);
+      tag = cap[1].toLowerCase().replace(/\s+/g, ' ');
+      if (!this.tokens.links[tag]) {
+        this.tokens.links[tag] = {
+          href: cap[2],
+          title: cap[3]
+        };
+      }
+      continue;
+    }
+
+    // table (gfm)
+    if (top && (cap = this.rules.table.exec(src))) {
+      item = {
+        type: 'table',
+        header: splitCells(cap[1].replace(/^ *| *\| *$/g, '')),
+        align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
+        cells: cap[3] ? cap[3].replace(/(?: *\| *)?\n$/, '').split('\n') : []
+      };
+
+      if (item.header.length === item.align.length) {
+        src = src.substring(cap[0].length);
+
+        for (i = 0; i < item.align.length; i++) {
+          if (/^ *-+: *$/.test(item.align[i])) {
+            item.align[i] = 'right';
+          } else if (/^ *:-+: *$/.test(item.align[i])) {
+            item.align[i] = 'center';
+          } else if (/^ *:-+ *$/.test(item.align[i])) {
+            item.align[i] = 'left';
+          } else {
+            item.align[i] = null;
+          }
+        }
+
+        for (i = 0; i < item.cells.length; i++) {
+          item.cells[i] = splitCells(
+            item.cells[i].replace(/^ *\| *| *\| *$/g, ''),
+            item.header.length);
+        }
+
+        this.tokens.push(item);
+
+        continue;
+      }
+    }
+
+    // lheading
+    if (cap = this.rules.lheading.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'heading',
+        depth: cap[2] === '=' ? 1 : 2,
+        text: cap[1]
+      });
+      continue;
+    }
+
+    // top-level paragraph
+    if (top && (cap = this.rules.paragraph.exec(src))) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'paragraph',
+        text: cap[1].charAt(cap[1].length - 1) === '\n'
+          ? cap[1].slice(0, -1)
+          : cap[1]
+      });
+      continue;
+    }
+
+    // text
+    if (cap = this.rules.text.exec(src)) {
+      // Top-level should never reach here.
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'text',
+        text: cap[0]
+      });
+      continue;
+    }
+
+    if (src) {
+      throw new Error('Infinite loop on byte: ' + src.charCodeAt(0));
+    }
+  }
+
+  return this.tokens;
+};
+
+/**
+ * Inline-Level Grammar
+ */
+
+var inline = {
+  escape: /^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,
+  autolink: /^<(scheme:[^\s\x00-\x1f<>]*|email)>/,
+  url: noop,
+  tag: '^comment'
+    + '|^</[a-zA-Z][\\w:-]*\\s*>' // self-closing tag
+    + '|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>' // open tag
+    + '|^<\\?[\\s\\S]*?\\?>' // processing instruction, e.g. <?php ?>
+    + '|^<![a-zA-Z]+\\s[\\s\\S]*?>' // declaration, e.g. <!DOCTYPE html>
+    + '|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>', // CDATA section
+  link: /^!?\[(label)\]\(href(?:\s+(title))?\s*\)/,
+  reflink: /^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/,
+  nolink: /^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/,
+  strong: /^__([^\s])__(?!_)|^\*\*([^\s])\*\*(?!\*)|^__([^\s][\s\S]*?[^\s])__(?!_)|^\*\*([^\s][\s\S]*?[^\s])\*\*(?!\*)/,
+  em: /^_([^\s_])_(?!_)|^\*([^\s*"<\[])\*(?!\*)|^_([^\s][\s\S]*?[^\s_])_(?!_)|^_([^\s_][\s\S]*?[^\s])_(?!_)|^\*([^\s"<\[][\s\S]*?[^\s*])\*(?!\*)|^\*([^\s*"<\[][\s\S]*?[^\s])\*(?!\*)/,
+  code: /^(`+)\s*([\s\S]*?[^`]?)\s*\1(?!`)/,
+  br: /^( {2,}|\\)\n(?!\s*$)/,
+  del: noop,
+  text: /^[\s\S]+?(?=[\\<!\[`*]|\b_| {2,}\n|$)/
+};
+
+inline._escapes = /\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g;
+
+inline._scheme = /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/;
+inline._email = /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/;
+inline.autolink = edit(inline.autolink)
+  .replace('scheme', inline._scheme)
+  .replace('email', inline._email)
+  .getRegex();
+
+inline._attribute = /\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/;
+
+inline.tag = edit(inline.tag)
+  .replace('comment', block._comment)
+  .replace('attribute', inline._attribute)
+  .getRegex();
+
+inline._label = /(?:\[[^\[\]]*\]|\\[\[\]]?|`[^`]*`|[^\[\]\\])*?/;
+inline._href = /\s*(<(?:\\[<>]?|[^\s<>\\])*>|(?:\\[()]?|\([^\s\x00-\x1f\\]*\)|[^\s\x00-\x1f()\\])*?)/;
+inline._title = /"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/;
+
+inline.link = edit(inline.link)
+  .replace('label', inline._label)
+  .replace('href', inline._href)
+  .replace('title', inline._title)
+  .getRegex();
+
+inline.reflink = edit(inline.reflink)
+  .replace('label', inline._label)
+  .getRegex();
+
+/**
+ * Normal Inline Grammar
+ */
+
+inline.normal = merge({}, inline);
+
+/**
+ * Pedantic Inline Grammar
+ */
+
+inline.pedantic = merge({}, inline.normal, {
+  strong: /^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,
+  em: /^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/,
+  link: edit(/^!?\[(label)\]\((.*?)\)/)
+    .replace('label', inline._label)
+    .getRegex(),
+  reflink: edit(/^!?\[(label)\]\s*\[([^\]]*)\]/)
+    .replace('label', inline._label)
+    .getRegex()
+});
+
+/**
+ * GFM Inline Grammar
+ */
+
+inline.gfm = merge({}, inline.normal, {
+  escape: edit(inline.escape).replace('])', '~|])').getRegex(),
+  url: edit(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/)
+    .replace('email', inline._email)
+    .getRegex(),
+  _backpedal: /(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,
+  del: /^~+(?=\S)([\s\S]*?\S)~+/,
+  text: edit(inline.text)
+    .replace(']|', '~]|')
+    .replace('|', '|https?://|ftp://|www\\.|[a-zA-Z0-9.!#$%&\'*+/=?^_`{\\|}~-]+@|')
+    .getRegex()
+});
+
+/**
+ * GFM + Line Breaks Inline Grammar
+ */
+
+inline.breaks = merge({}, inline.gfm, {
+  br: edit(inline.br).replace('{2,}', '*').getRegex(),
+  text: edit(inline.gfm.text).replace('{2,}', '*').getRegex()
+});
+
+/**
+ * Inline Lexer & Compiler
+ */
+
+function InlineLexer(links, options) {
+  this.options = options || marked.defaults;
+  this.links = links;
+  this.rules = inline.normal;
+  this.renderer = this.options.renderer || new Renderer();
+  this.renderer.options = this.options;
+
+  if (!this.links) {
+    throw new Error('Tokens array requires a `links` property.');
+  }
+
+  if (this.options.pedantic) {
+    this.rules = inline.pedantic;
+  } else if (this.options.gfm) {
+    if (this.options.breaks) {
+      this.rules = inline.breaks;
+    } else {
+      this.rules = inline.gfm;
+    }
+  }
+}
+
+/**
+ * Expose Inline Rules
+ */
+
+InlineLexer.rules = inline;
+
+/**
+ * Static Lexing/Compiling Method
+ */
+
+InlineLexer.output = function(src, links, options) {
+  var inline = new InlineLexer(links, options);
+  return inline.output(src);
+};
+
+/**
+ * Lexing/Compiling
+ */
+
+InlineLexer.prototype.output = function(src) {
+  var out = '',
+      link,
+      text,
+      href,
+      title,
+      cap,
+      prevCapZero;
+
+  while (src) {
+    // escape
+    if (cap = this.rules.escape.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += cap[1];
+      continue;
+    }
+
+    // autolink
+    if (cap = this.rules.autolink.exec(src)) {
+      src = src.substring(cap[0].length);
+      if (cap[2] === '@') {
+        text = escape(this.mangle(cap[1]));
+        href = 'mailto:' + text;
+      } else {
+        text = escape(cap[1]);
+        href = text;
+      }
+      out += this.renderer.link(href, null, text);
+      continue;
+    }
+
+    // url (gfm)
+    if (!this.inLink && (cap = this.rules.url.exec(src))) {
+      do {
+        prevCapZero = cap[0];
+        cap[0] = this.rules._backpedal.exec(cap[0])[0];
+      } while (prevCapZero !== cap[0]);
+      src = src.substring(cap[0].length);
+      if (cap[2] === '@') {
+        text = escape(cap[0]);
+        href = 'mailto:' + text;
+      } else {
+        text = escape(cap[0]);
+        if (cap[1] === 'www.') {
+          href = 'http://' + text;
+        } else {
+          href = text;
+        }
+      }
+      out += this.renderer.link(href, null, text);
+      continue;
+    }
+
+    // tag
+    if (cap = this.rules.tag.exec(src)) {
+      if (!this.inLink && /^<a /i.test(cap[0])) {
+        this.inLink = true;
+      } else if (this.inLink && /^<\/a>/i.test(cap[0])) {
+        this.inLink = false;
+      }
+      src = src.substring(cap[0].length);
+      out += this.options.sanitize
+        ? this.options.sanitizer
+          ? this.options.sanitizer(cap[0])
+          : escape(cap[0])
+        : cap[0]
+      continue;
+    }
+
+    // link
+    if (cap = this.rules.link.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.inLink = true;
+      href = cap[2];
+      if (this.options.pedantic) {
+        link = /^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(href);
+
+        if (link) {
+          href = link[1];
+          title = link[3];
+        } else {
+          title = '';
+        }
+      } else {
+        title = cap[3] ? cap[3].slice(1, -1) : '';
+      }
+      href = href.trim().replace(/^<([\s\S]*)>$/, '$1');
+      out += this.outputLink(cap, {
+        href: InlineLexer.escapes(href),
+        title: InlineLexer.escapes(title)
+      });
+      this.inLink = false;
+      continue;
+    }
+
+    // reflink, nolink
+    if ((cap = this.rules.reflink.exec(src))
+        || (cap = this.rules.nolink.exec(src))) {
+      src = src.substring(cap[0].length);
+      link = (cap[2] || cap[1]).replace(/\s+/g, ' ');
+      link = this.links[link.toLowerCase()];
+      if (!link || !link.href) {
+        out += cap[0].charAt(0);
+        src = cap[0].substring(1) + src;
+        continue;
+      }
+      this.inLink = true;
+      out += this.outputLink(cap, link);
+      this.inLink = false;
+      continue;
+    }
+
+    // strong
+    if (cap = this.rules.strong.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += this.renderer.strong(this.output(cap[4] || cap[3] || cap[2] || cap[1]));
+      continue;
+    }
+
+    // em
+    if (cap = this.rules.em.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += this.renderer.em(this.output(cap[6] || cap[5] || cap[4] || cap[3] || cap[2] || cap[1]));
+      continue;
+    }
+
+    // code
+    if (cap = this.rules.code.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += this.renderer.codespan(escape(cap[2].trim(), true));
+      continue;
+    }
+
+    // br
+    if (cap = this.rules.br.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += this.renderer.br();
+      continue;
+    }
+
+    // del (gfm)
+    if (cap = this.rules.del.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += this.renderer.del(this.output(cap[1]));
+      continue;
+    }
+
+    // text
+    if (cap = this.rules.text.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += this.renderer.text(escape(this.smartypants(cap[0])));
+      continue;
+    }
+
+    if (src) {
+      throw new Error('Infinite loop on byte: ' + src.charCodeAt(0));
+    }
+  }
+
+  return out;
+};
+
+InlineLexer.escapes = function(text) {
+  return text ? text.replace(InlineLexer.rules._escapes, '$1') : text;
+}
+
+/**
+ * Compile Link
+ */
+
+InlineLexer.prototype.outputLink = function(cap, link) {
+  var href = link.href,
+      title = link.title ? escape(link.title) : null;
+
+  return cap[0].charAt(0) !== '!'
+    ? this.renderer.link(href, title, this.output(cap[1]))
+    : this.renderer.image(href, title, escape(cap[1]));
+};
+
+/**
+ * Smartypants Transformations
+ */
+
+InlineLexer.prototype.smartypants = function(text) {
+  if (!this.options.smartypants) return text;
+  return text
+    // em-dashes
+    .replace(/---/g, '\u2014')
+    // en-dashes
+    .replace(/--/g, '\u2013')
+    // opening singles
+    .replace(/(^|[-\u2014/(\[{"\s])'/g, '$1\u2018')
+    // closing singles & apostrophes
+    .replace(/'/g, '\u2019')
+    // opening doubles
+    .replace(/(^|[-\u2014/(\[{\u2018\s])"/g, '$1\u201c')
+    // closing doubles
+    .replace(/"/g, '\u201d')
+    // ellipses
+    .replace(/\.{3}/g, '\u2026');
+};
+
+/**
+ * Mangle Links
+ */
+
+InlineLexer.prototype.mangle = function(text) {
+  if (!this.options.mangle) return text;
+  var out = '',
+      l = text.length,
+      i = 0,
+      ch;
+
+  for (; i < l; i++) {
+    ch = text.charCodeAt(i);
+    if (Math.random() > 0.5) {
+      ch = 'x' + ch.toString(16);
+    }
+    out += '&#' + ch + ';';
+  }
+
+  return out;
+};
+
+/**
+ * Renderer
+ */
+
+function Renderer(options) {
+  this.options = options || marked.defaults;
+}
+
+Renderer.prototype.code = function(code, lang, escaped) {
+  if (this.options.highlight) {
+    var out = this.options.highlight(code, lang);
+    if (out != null && out !== code) {
+      escaped = true;
+      code = out;
+    }
+  }
+
+  if (!lang) {
+    return '<pre><code>'
+      + (escaped ? code : escape(code, true))
+      + '</code></pre>';
+  }
+
+  return '<pre><code class="'
+    + this.options.langPrefix
+    + escape(lang, true)
+    + '">'
+    + (escaped ? code : escape(code, true))
+    + '</code></pre>\n';
+};
+
+Renderer.prototype.blockquote = function(quote) {
+  return '<blockquote>\n' + quote + '</blockquote>\n';
+};
+
+Renderer.prototype.html = function(html) {
+  return html;
+};
+
+Renderer.prototype.heading = function(text, level, raw) {
+  if (this.options.headerIds) {
+    return '<h'
+      + level
+      + ' id="'
+      + this.options.headerPrefix
+      + raw.toLowerCase().replace(/[^\w]+/g, '-')
+      + '">'
+      + text
+      + '</h'
+      + level
+      + '>\n';
+  }
+  // ignore IDs
+  return '<h' + level + '>' + text + '</h' + level + '>\n';
+};
+
+Renderer.prototype.hr = function() {
+  return this.options.xhtml ? '<hr/>\n' : '<hr>\n';
+};
+
+Renderer.prototype.list = function(body, ordered, start) {
+  var type = ordered ? 'ol' : 'ul',
+      startatt = (ordered && start !== 1) ? (' start="' + start + '"') : '';
+  return '<' + type + startatt + '>\n' + body + '</' + type + '>\n';
+};
+
+Renderer.prototype.listitem = function(text) {
+  return '<li>' + text + '</li>\n';
+};
+
+Renderer.prototype.checkbox = function(checked) {
+  return '<input '
+    + (checked ? 'checked="" ' : '')
+    + 'disabled="" type="checkbox"'
+    + (this.options.xhtml ? ' /' : '')
+    + '> ';
+}
+
+Renderer.prototype.paragraph = function(text) {
+  return '<p>' + text + '</p>\n';
+};
+
+Renderer.prototype.table = function(header, body) {
+  if (body) body = '<tbody>' + body + '</tbody>';
+
+  return '<table>\n'
+    + '<thead>\n'
+    + header
+    + '</thead>\n'
+    + body
+    + '</table>\n';
+};
+
+Renderer.prototype.tablerow = function(content) {
+  return '<tr>\n' + content + '</tr>\n';
+};
+
+Renderer.prototype.tablecell = function(content, flags) {
+  var type = flags.header ? 'th' : 'td';
+  var tag = flags.align
+    ? '<' + type + ' align="' + flags.align + '">'
+    : '<' + type + '>';
+  return tag + content + '</' + type + '>\n';
+};
+
+// span level renderer
+Renderer.prototype.strong = function(text) {
+  return '<strong>' + text + '</strong>';
+};
+
+Renderer.prototype.em = function(text) {
+  return '<em>' + text + '</em>';
+};
+
+Renderer.prototype.codespan = function(text) {
+  return '<code>' + text + '</code>';
+};
+
+Renderer.prototype.br = function() {
+  return this.options.xhtml ? '<br/>' : '<br>';
+};
+
+Renderer.prototype.del = function(text) {
+  return '<del>' + text + '</del>';
+};
+
+Renderer.prototype.link = function(href, title, text) {
+  if (this.options.sanitize) {
+    try {
+      var prot = decodeURIComponent(unescape(href))
+        .replace(/[^\w:]/g, '')
+        .toLowerCase();
+    } catch (e) {
+      return text;
+    }
+    if (prot.indexOf('javascript:') === 0 || prot.indexOf('vbscript:') === 0 || prot.indexOf('data:') === 0) {
+      return text;
+    }
+  }
+  if (this.options.baseUrl && !originIndependentUrl.test(href)) {
+    href = resolveUrl(this.options.baseUrl, href);
+  }
+  try {
+    href = encodeURI(href).replace(/%25/g, '%');
+  } catch (e) {
+    return text;
+  }
+  var out = '<a href="' + escape(href) + '"';
+  if (title) {
+    out += ' title="' + title + '"';
+  }
+  out += '>' + text + '</a>';
+  return out;
+};
+
+Renderer.prototype.image = function(href, title, text) {
+  if (this.options.baseUrl && !originIndependentUrl.test(href)) {
+    href = resolveUrl(this.options.baseUrl, href);
+  }
+  var out = '<img src="' + href + '" alt="' + text + '"';
+  if (title) {
+    out += ' title="' + title + '"';
+  }
+  out += this.options.xhtml ? '/>' : '>';
+  return out;
+};
+
+Renderer.prototype.text = function(text) {
+  return text;
+};
+
+/**
+ * TextRenderer
+ * returns only the textual part of the token
+ */
+
+function TextRenderer() {}
+
+// no need for block level renderers
+
+TextRenderer.prototype.strong =
+TextRenderer.prototype.em =
+TextRenderer.prototype.codespan =
+TextRenderer.prototype.del =
+TextRenderer.prototype.text = function (text) {
+  return text;
+}
+
+TextRenderer.prototype.link =
+TextRenderer.prototype.image = function(href, title, text) {
+  return '' + text;
+}
+
+TextRenderer.prototype.br = function() {
+  return '';
+}
+
+/**
+ * Parsing & Compiling
+ */
+
+function Parser(options) {
+  this.tokens = [];
+  this.token = null;
+  this.options = options || marked.defaults;
+  this.options.renderer = this.options.renderer || new Renderer();
+  this.renderer = this.options.renderer;
+  this.renderer.options = this.options;
+}
+
+/**
+ * Static Parse Method
+ */
+
+Parser.parse = function(src, options) {
+  var parser = new Parser(options);
+  return parser.parse(src);
+};
+
+/**
+ * Parse Loop
+ */
+
+Parser.prototype.parse = function(src) {
+  this.inline = new InlineLexer(src.links, this.options);
+  // use an InlineLexer with a TextRenderer to extract pure text
+  this.inlineText = new InlineLexer(
+    src.links,
+    merge({}, this.options, {renderer: new TextRenderer()})
+  );
+  this.tokens = src.reverse();
+
+  var out = '';
+  while (this.next()) {
+    out += this.tok();
+  }
+
+  return out;
+};
+
+/**
+ * Next Token
+ */
+
+Parser.prototype.next = function() {
+  return this.token = this.tokens.pop();
+};
+
+/**
+ * Preview Next Token
+ */
+
+Parser.prototype.peek = function() {
+  return this.tokens[this.tokens.length - 1] || 0;
+};
+
+/**
+ * Parse Text Tokens
+ */
+
+Parser.prototype.parseText = function() {
+  var body = this.token.text;
+
+  while (this.peek().type === 'text') {
+    body += '\n' + this.next().text;
+  }
+
+  return this.inline.output(body);
+};
+
+/**
+ * Parse Current Token
+ */
+
+Parser.prototype.tok = function() {
+  switch (this.token.type) {
+    case 'space': {
+      return '';
+    }
+    case 'hr': {
+      return this.renderer.hr();
+    }
+    case 'heading': {
+      return this.renderer.heading(
+        this.inline.output(this.token.text),
+        this.token.depth,
+        unescape(this.inlineText.output(this.token.text)));
+    }
+    case 'code': {
+      return this.renderer.code(this.token.text,
+        this.token.lang,
+        this.token.escaped);
+    }
+    case 'table': {
+      var header = '',
+          body = '',
+          i,
+          row,
+          cell,
+          j;
+
+      // header
+      cell = '';
+      for (i = 0; i < this.token.header.length; i++) {
+        cell += this.renderer.tablecell(
+          this.inline.output(this.token.header[i]),
+          { header: true, align: this.token.align[i] }
+        );
+      }
+      header += this.renderer.tablerow(cell);
+
+      for (i = 0; i < this.token.cells.length; i++) {
+        row = this.token.cells[i];
+
+        cell = '';
+        for (j = 0; j < row.length; j++) {
+          cell += this.renderer.tablecell(
+            this.inline.output(row[j]),
+            { header: false, align: this.token.align[j] }
+          );
+        }
+
+        body += this.renderer.tablerow(cell);
+      }
+      return this.renderer.table(header, body);
+    }
+    case 'blockquote_start': {
+      body = '';
+
+      while (this.next().type !== 'blockquote_end') {
+        body += this.tok();
+      }
+
+      return this.renderer.blockquote(body);
+    }
+    case 'list_start': {
+      body = '';
+      var ordered = this.token.ordered,
+          start = this.token.start;
+
+      while (this.next().type !== 'list_end') {
+        body += this.tok();
+      }
+
+      return this.renderer.list(body, ordered, start);
+    }
+    case 'list_item_start': {
+      body = '';
+      var loose = this.token.loose;
+
+      if (this.token.task) {
+        body += this.renderer.checkbox(this.token.checked);
+      }
+
+      while (this.next().type !== 'list_item_end') {
+        body += !loose && this.token.type === 'text'
+          ? this.parseText()
+          : this.tok();
+      }
+
+      return this.renderer.listitem(body);
+    }
+    case 'html': {
+      // TODO parse inline content if parameter markdown=1
+      return this.renderer.html(this.token.text);
+    }
+    case 'paragraph': {
+      return this.renderer.paragraph(this.inline.output(this.token.text));
+    }
+    case 'text': {
+      return this.renderer.paragraph(this.parseText());
+    }
+  }
+};
+
+/**
+ * Helpers
+ */
+
+function escape(html, encode) {
+  return html
+    .replace(!encode ? /&(?!#?\w+;)/g : /&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#39;');
+}
+
+function unescape(html) {
+  // explicitly match decimal, hex, and named HTML entities
+  return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig, function(_, n) {
+    n = n.toLowerCase();
+    if (n === 'colon') return ':';
+    if (n.charAt(0) === '#') {
+      return n.charAt(1) === 'x'
+        ? String.fromCharCode(parseInt(n.substring(2), 16))
+        : String.fromCharCode(+n.substring(1));
+    }
+    return '';
+  });
+}
+
+function edit(regex, opt) {
+  regex = regex.source || regex;
+  opt = opt || '';
+  return {
+    replace: function(name, val) {
+      val = val.source || val;
+      val = val.replace(/(^|[^\[])\^/g, '$1');
+      regex = regex.replace(name, val);
+      return this;
+    },
+    getRegex: function() {
+      return new RegExp(regex, opt);
+    }
+  };
+}
+
+function resolveUrl(base, href) {
+  if (!baseUrls[' ' + base]) {
+    // we can ignore everything in base after the last slash of its path component,
+    // but we might need to add _that_
+    // https://tools.ietf.org/html/rfc3986#section-3
+    if (/^[^:]+:\/*[^/]*$/.test(base)) {
+      baseUrls[' ' + base] = base + '/';
+    } else {
+      baseUrls[' ' + base] = rtrim(base, '/', true);
+    }
+  }
+  base = baseUrls[' ' + base];
+
+  if (href.slice(0, 2) === '//') {
+    return base.replace(/:[\s\S]*/, ':') + href;
+  } else if (href.charAt(0) === '/') {
+    return base.replace(/(:\/*[^/]*)[\s\S]*/, '$1') + href;
+  } else {
+    return base + href;
+  }
+}
+var baseUrls = {};
+var originIndependentUrl = /^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;
+
+function noop() {}
+noop.exec = noop;
+
+function merge(obj) {
+  var i = 1,
+      target,
+      key;
+
+  for (; i < arguments.length; i++) {
+    target = arguments[i];
+    for (key in target) {
+      if (Object.prototype.hasOwnProperty.call(target, key)) {
+        obj[key] = target[key];
+      }
+    }
+  }
+
+  return obj;
+}
+
+function splitCells(tableRow, count) {
+  // ensure that every cell-delimiting pipe has a space
+  // before it to distinguish it from an escaped pipe
+  var row = tableRow.replace(/\|/g, function (match, offset, str) {
+        var escaped = false,
+            curr = offset;
+        while (--curr >= 0 && str[curr] === '\\') escaped = !escaped;
+        if (escaped) {
+          // odd number of slashes means | is escaped
+          // so we leave it alone
+          return '|';
+        } else {
+          // add space before unescaped |
+          return ' |';
+        }
+      }),
+      cells = row.split(/ \|/),
+      i = 0;
+
+  if (cells.length > count) {
+    cells.splice(count);
+  } else {
+    while (cells.length < count) cells.push('');
+  }
+
+  for (; i < cells.length; i++) {
+    // leading or trailing whitespace is ignored per the gfm spec
+    cells[i] = cells[i].trim().replace(/\\\|/g, '|');
+  }
+  return cells;
+}
+
+// Remove trailing 'c's. Equivalent to str.replace(/c*$/, '').
+// /c*$/ is vulnerable to REDOS.
+// invert: Remove suffix of non-c chars instead. Default falsey.
+function rtrim(str, c, invert) {
+  if (str.length === 0) {
+    return '';
+  }
+
+  // Length of suffix matching the invert condition.
+  var suffLen = 0;
+
+  // Step left until we fail to match the invert condition.
+  while (suffLen < str.length) {
+    var currChar = str.charAt(str.length - suffLen - 1);
+    if (currChar === c && !invert) {
+      suffLen++;
+    } else if (currChar !== c && invert) {
+      suffLen++;
+    } else {
+      break;
+    }
+  }
+
+  return str.substr(0, str.length - suffLen);
+}
+
+/**
+ * Marked
+ */
+
+function marked(src, opt, callback) {
+  // throw error in case of non string input
+  if (typeof src === 'undefined' || src === null) {
+    throw new Error('marked(): input parameter is undefined or null');
+  }
+  if (typeof src !== 'string') {
+    throw new Error('marked(): input parameter is of type '
+      + Object.prototype.toString.call(src) + ', string expected');
+  }
+
+  if (callback || typeof opt === 'function') {
+    if (!callback) {
+      callback = opt;
+      opt = null;
+    }
+
+    opt = merge({}, marked.defaults, opt || {});
+
+    var highlight = opt.highlight,
+        tokens,
+        pending,
+        i = 0;
+
+    try {
+      tokens = Lexer.lex(src, opt)
+    } catch (e) {
+      return callback(e);
+    }
+
+    pending = tokens.length;
+
+    var done = function(err) {
+      if (err) {
+        opt.highlight = highlight;
+        return callback(err);
+      }
+
+      var out;
+
+      try {
+        out = Parser.parse(tokens, opt);
+      } catch (e) {
+        err = e;
+      }
+
+      opt.highlight = highlight;
+
+      return err
+        ? callback(err)
+        : callback(null, out);
+    };
+
+    if (!highlight || highlight.length < 3) {
+      return done();
+    }
+
+    delete opt.highlight;
+
+    if (!pending) return done();
+
+    for (; i < tokens.length; i++) {
+      (function(token) {
+        if (token.type !== 'code') {
+          return --pending || done();
+        }
+        return highlight(token.text, token.lang, function(err, code) {
+          if (err) return done(err);
+          if (code == null || code === token.text) {
+            return --pending || done();
+          }
+          token.text = code;
+          token.escaped = true;
+          --pending || done();
+        });
+      })(tokens[i]);
+    }
+
+    return;
+  }
+  try {
+    if (opt) opt = merge({}, marked.defaults, opt);
+    return Parser.parse(Lexer.lex(src, opt), opt);
+  } catch (e) {
+    e.message += '\nPlease report this to https://github.com/markedjs/marked.';
+    if ((opt || marked.defaults).silent) {
+      return '<p>An error occurred:</p><pre>'
+        + escape(e.message + '', true)
+        + '</pre>';
+    }
+    throw e;
+  }
+}
+
+/**
+ * Options
+ */
+
+marked.options =
+marked.setOptions = function(opt) {
+  merge(marked.defaults, opt);
+  return marked;
+};
+
+marked.getDefaults = function () {
+  return {
+    baseUrl: null,
+    breaks: false,
+    gfm: true,
+    headerIds: true,
+    headerPrefix: '',
+    highlight: null,
+    langPrefix: 'language-',
+    mangle: true,
+    pedantic: false,
+    renderer: new Renderer(),
+    sanitize: false,
+    sanitizer: null,
+    silent: false,
+    smartLists: false,
+    smartypants: false,
+    tables: true,
+    xhtml: false
+  };
+}
+
+marked.defaults = marked.getDefaults();
+
+/**
+ * Expose
+ */
+
+marked.Parser = Parser;
+marked.parser = Parser.parse;
+
+marked.Renderer = Renderer;
+marked.TextRenderer = TextRenderer;
+
+marked.Lexer = Lexer;
+marked.lexer = Lexer.lex;
+
+marked.InlineLexer = InlineLexer;
+marked.inlineLexer = InlineLexer.output;
+
+marked.parse = marked;
+
+if (typeof module !== 'undefined' && typeof exports === 'object') {
+  module.exports = marked;
+} else if (typeof define === 'function' && define.amd) {
+  define(function() { return marked; });
+} else {
+  root.marked = marked;
+}
+})(this || (typeof window !== 'undefined' ? window : global));
diff --git a/components/mpvue-citypicker/city-data/area.js b/components/mpvue-citypicker/city-data/area.js
new file mode 100644
index 0000000..92dfc30
--- /dev/null
+++ b/components/mpvue-citypicker/city-data/area.js
@@ -0,0 +1,12542 @@
+/* eslint-disable */
+var areaData = [
+  [
+    [{
+        "label": "东城区",
+        "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": "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": "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": "130171"
+      },
+      {
+        "label": "石家庄循环化工园区",
+        "value": "130172"
+      },
+      {
+        "label": "辛集市",
+        "value": "130181"
+      },
+      {
+        "label": "晋州市",
+        "value": "130183"
+      },
+      {
+        "label": "新乐市",
+        "value": "130184"
+      }
+    ],
+    [{
+        "label": "路南区",
+        "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": "130271"
+      },
+      {
+        "label": "唐山市汉沽管理区",
+        "value": "130272"
+      },
+      {
+        "label": "唐山高新技术产业开发区",
+        "value": "130273"
+      },
+      {
+        "label": "河北唐山海港经济开发区",
+        "value": "130274"
+      },
+      {
+        "label": "遵化市",
+        "value": "130281"
+      },
+      {
+        "label": "迁安市",
+        "value": "130283"
+      }
+    ],
+    [{
+        "label": "海港区",
+        "value": "130302"
+      },
+      {
+        "label": "山海关区",
+        "value": "130303"
+      },
+      {
+        "label": "北戴河区",
+        "value": "130304"
+      },
+      {
+        "label": "抚宁区",
+        "value": "130306"
+      },
+      {
+        "label": "青龙满族自治县",
+        "value": "130321"
+      },
+      {
+        "label": "昌黎县",
+        "value": "130322"
+      },
+      {
+        "label": "卢龙县",
+        "value": "130324"
+      },
+      {
+        "label": "秦皇岛市经济技术开发区",
+        "value": "130371"
+      },
+      {
+        "label": "北戴河新区",
+        "value": "130372"
+      }
+    ],
+    [{
+        "label": "邯山区",
+        "value": "130402"
+      },
+      {
+        "label": "丛台区",
+        "value": "130403"
+      },
+      {
+        "label": "复兴区",
+        "value": "130404"
+      },
+      {
+        "label": "峰峰矿区",
+        "value": "130406"
+      },
+      {
+        "label": "肥乡区",
+        "value": "130407"
+      },
+      {
+        "label": "永年区",
+        "value": "130408"
+      },
+      {
+        "label": "临漳县",
+        "value": "130423"
+      },
+      {
+        "label": "成安县",
+        "value": "130424"
+      },
+      {
+        "label": "大名县",
+        "value": "130425"
+      },
+      {
+        "label": "涉县",
+        "value": "130426"
+      },
+      {
+        "label": "磁县",
+        "value": "130427"
+      },
+      {
+        "label": "邱县",
+        "value": "130430"
+      },
+      {
+        "label": "鸡泽县",
+        "value": "130431"
+      },
+      {
+        "label": "广平县",
+        "value": "130432"
+      },
+      {
+        "label": "馆陶县",
+        "value": "130433"
+      },
+      {
+        "label": "魏县",
+        "value": "130434"
+      },
+      {
+        "label": "曲周县",
+        "value": "130435"
+      },
+      {
+        "label": "邯郸经济技术开发区",
+        "value": "130471"
+      },
+      {
+        "label": "邯郸冀南新区",
+        "value": "130473"
+      },
+      {
+        "label": "武安市",
+        "value": "130481"
+      }
+    ],
+    [{
+        "label": "桥东区",
+        "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": "130571"
+      },
+      {
+        "label": "南宫市",
+        "value": "130581"
+      },
+      {
+        "label": "沙河市",
+        "value": "130582"
+      }
+    ],
+    [{
+        "label": "竞秀区",
+        "value": "130602"
+      },
+      {
+        "label": "莲池区",
+        "value": "130606"
+      },
+      {
+        "label": "满城区",
+        "value": "130607"
+      },
+      {
+        "label": "清苑区",
+        "value": "130608"
+      },
+      {
+        "label": "徐水区",
+        "value": "130609"
+      },
+      {
+        "label": "涞水县",
+        "value": "130623"
+      },
+      {
+        "label": "阜平县",
+        "value": "130624"
+      },
+      {
+        "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": "130671"
+      },
+      {
+        "label": "保定白沟新城",
+        "value": "130672"
+      },
+      {
+        "label": "涿州市",
+        "value": "130681"
+      },
+      {
+        "label": "定州市",
+        "value": "130682"
+      },
+      {
+        "label": "安国市",
+        "value": "130683"
+      },
+      {
+        "label": "高碑店市",
+        "value": "130684"
+      }
+    ],
+    [{
+        "label": "桥东区",
+        "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": "130771"
+      },
+      {
+        "label": "张家口市察北管理区",
+        "value": "130772"
+      },
+      {
+        "label": "张家口市塞北管理区",
+        "value": "130773"
+      }
+    ],
+    [{
+        "label": "双桥区",
+        "value": "130802"
+      },
+      {
+        "label": "双滦区",
+        "value": "130803"
+      },
+      {
+        "label": "鹰手营子矿区",
+        "value": "130804"
+      },
+      {
+        "label": "承德县",
+        "value": "130821"
+      },
+      {
+        "label": "兴隆县",
+        "value": "130822"
+      },
+      {
+        "label": "滦平县",
+        "value": "130824"
+      },
+      {
+        "label": "隆化县",
+        "value": "130825"
+      },
+      {
+        "label": "丰宁满族自治县",
+        "value": "130826"
+      },
+      {
+        "label": "宽城满族自治县",
+        "value": "130827"
+      },
+      {
+        "label": "围场满族蒙古族自治县",
+        "value": "130828"
+      },
+      {
+        "label": "承德高新技术产业开发区",
+        "value": "130871"
+      },
+      {
+        "label": "平泉市",
+        "value": "130881"
+      }
+    ],
+    [{
+        "label": "新华区",
+        "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": "130971"
+      },
+      {
+        "label": "沧州高新技术产业开发区",
+        "value": "130972"
+      },
+      {
+        "label": "沧州渤海新区",
+        "value": "130973"
+      },
+      {
+        "label": "泊头市",
+        "value": "130981"
+      },
+      {
+        "label": "任丘市",
+        "value": "130982"
+      },
+      {
+        "label": "黄骅市",
+        "value": "130983"
+      },
+      {
+        "label": "河间市",
+        "value": "130984"
+      }
+    ],
+    [{
+        "label": "安次区",
+        "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": "131102"
+      },
+      {
+        "label": "冀州区",
+        "value": "131103"
+      },
+      {
+        "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": "131171"
+      },
+      {
+        "label": "衡水滨湖新区",
+        "value": "131172"
+      },
+      {
+        "label": "深州市",
+        "value": "131182"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "小店区",
+        "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": "140171"
+      },
+      {
+        "label": "古交市",
+        "value": "140181"
+      }
+    ],
+    [{
+        "label": "城区",
+        "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": "140302"
+      },
+      {
+        "label": "矿区",
+        "value": "140303"
+      },
+      {
+        "label": "郊区",
+        "value": "140311"
+      },
+      {
+        "label": "平定县",
+        "value": "140321"
+      },
+      {
+        "label": "盂县",
+        "value": "140322"
+      },
+      {
+        "label": "山西阳泉经济开发区",
+        "value": "140371"
+      }
+    ],
+    [{
+        "label": "城区",
+        "value": "140402"
+      },
+      {
+        "label": "郊区",
+        "value": "140411"
+      },
+      {
+        "label": "长治县",
+        "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": "140471"
+      },
+      {
+        "label": "潞城市",
+        "value": "140481"
+      }
+    ],
+    [{
+        "label": "城区",
+        "value": "140502"
+      },
+      {
+        "label": "沁水县",
+        "value": "140521"
+      },
+      {
+        "label": "阳城县",
+        "value": "140522"
+      },
+      {
+        "label": "陵川县",
+        "value": "140524"
+      },
+      {
+        "label": "泽州县",
+        "value": "140525"
+      },
+      {
+        "label": "高平市",
+        "value": "140581"
+      }
+    ],
+    [{
+        "label": "朔城区",
+        "value": "140602"
+      },
+      {
+        "label": "平鲁区",
+        "value": "140603"
+      },
+      {
+        "label": "山阴县",
+        "value": "140621"
+      },
+      {
+        "label": "应县",
+        "value": "140622"
+      },
+      {
+        "label": "右玉县",
+        "value": "140623"
+      },
+      {
+        "label": "怀仁县",
+        "value": "140624"
+      },
+      {
+        "label": "山西朔州经济开发区",
+        "value": "140671"
+      }
+    ],
+    [{
+        "label": "榆次区",
+        "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": "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": "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": "140971"
+      },
+      {
+        "label": "原平市",
+        "value": "140981"
+      }
+    ],
+    [{
+        "label": "尧都区",
+        "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": "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": "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": "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": "150302"
+      },
+      {
+        "label": "海南区",
+        "value": "150303"
+      },
+      {
+        "label": "乌达区",
+        "value": "150304"
+      }
+    ],
+    [{
+        "label": "红山区",
+        "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": "150502"
+      },
+      {
+        "label": "科尔沁左翼中旗",
+        "value": "150521"
+      },
+      {
+        "label": "科尔沁左翼后旗",
+        "value": "150522"
+      },
+      {
+        "label": "开鲁县",
+        "value": "150523"
+      },
+      {
+        "label": "库伦旗",
+        "value": "150524"
+      },
+      {
+        "label": "奈曼旗",
+        "value": "150525"
+      },
+      {
+        "label": "扎鲁特旗",
+        "value": "150526"
+      },
+      {
+        "label": "通辽经济技术开发区",
+        "value": "150571"
+      },
+      {
+        "label": "霍林郭勒市",
+        "value": "150581"
+      }
+    ],
+    [{
+        "label": "东胜区",
+        "value": "150602"
+      },
+      {
+        "label": "康巴什区",
+        "value": "150603"
+      },
+      {
+        "label": "达拉特旗",
+        "value": "150621"
+      },
+      {
+        "label": "准格尔旗",
+        "value": "150622"
+      },
+      {
+        "label": "鄂托克前旗",
+        "value": "150623"
+      },
+      {
+        "label": "鄂托克旗",
+        "value": "150624"
+      },
+      {
+        "label": "杭锦旗",
+        "value": "150625"
+      },
+      {
+        "label": "乌审旗",
+        "value": "150626"
+      },
+      {
+        "label": "伊金霍洛旗",
+        "value": "150627"
+      }
+    ],
+    [{
+        "label": "海拉尔区",
+        "value": "150702"
+      },
+      {
+        "label": "扎赉诺尔区",
+        "value": "150703"
+      },
+      {
+        "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": "150802"
+      },
+      {
+        "label": "五原县",
+        "value": "150821"
+      },
+      {
+        "label": "磴口县",
+        "value": "150822"
+      },
+      {
+        "label": "乌拉特前旗",
+        "value": "150823"
+      },
+      {
+        "label": "乌拉特中旗",
+        "value": "150824"
+      },
+      {
+        "label": "乌拉特后旗",
+        "value": "150825"
+      },
+      {
+        "label": "杭锦后旗",
+        "value": "150826"
+      }
+    ],
+    [{
+        "label": "集宁区",
+        "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": "152201"
+      },
+      {
+        "label": "阿尔山市",
+        "value": "152202"
+      },
+      {
+        "label": "科尔沁右翼前旗",
+        "value": "152221"
+      },
+      {
+        "label": "科尔沁右翼中旗",
+        "value": "152222"
+      },
+      {
+        "label": "扎赉特旗",
+        "value": "152223"
+      },
+      {
+        "label": "突泉县",
+        "value": "152224"
+      }
+    ],
+    [{
+        "label": "二连浩特市",
+        "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": "152921"
+      },
+      {
+        "label": "阿拉善右旗",
+        "value": "152922"
+      },
+      {
+        "label": "额济纳旗",
+        "value": "152923"
+      },
+      {
+        "label": "内蒙古阿拉善经济开发区",
+        "value": "152971"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "和平区",
+        "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": "210202"
+      },
+      {
+        "label": "西岗区",
+        "value": "210203"
+      },
+      {
+        "label": "沙河口区",
+        "value": "210204"
+      },
+      {
+        "label": "甘井子区",
+        "value": "210211"
+      },
+      {
+        "label": "旅顺口区",
+        "value": "210212"
+      },
+      {
+        "label": "金州区",
+        "value": "210213"
+      },
+      {
+        "label": "普兰店区",
+        "value": "210214"
+      },
+      {
+        "label": "长海县",
+        "value": "210224"
+      },
+      {
+        "label": "瓦房店市",
+        "value": "210281"
+      },
+      {
+        "label": "庄河市",
+        "value": "210283"
+      }
+    ],
+    [{
+        "label": "铁东区",
+        "value": "210302"
+      },
+      {
+        "label": "铁西区",
+        "value": "210303"
+      },
+      {
+        "label": "立山区",
+        "value": "210304"
+      },
+      {
+        "label": "千山区",
+        "value": "210311"
+      },
+      {
+        "label": "台安县",
+        "value": "210321"
+      },
+      {
+        "label": "岫岩满族自治县",
+        "value": "210323"
+      },
+      {
+        "label": "海城市",
+        "value": "210381"
+      }
+    ],
+    [{
+        "label": "新抚区",
+        "value": "210402"
+      },
+      {
+        "label": "东洲区",
+        "value": "210403"
+      },
+      {
+        "label": "望花区",
+        "value": "210404"
+      },
+      {
+        "label": "顺城区",
+        "value": "210411"
+      },
+      {
+        "label": "抚顺县",
+        "value": "210421"
+      },
+      {
+        "label": "新宾满族自治县",
+        "value": "210422"
+      },
+      {
+        "label": "清原满族自治县",
+        "value": "210423"
+      }
+    ],
+    [{
+        "label": "平山区",
+        "value": "210502"
+      },
+      {
+        "label": "溪湖区",
+        "value": "210503"
+      },
+      {
+        "label": "明山区",
+        "value": "210504"
+      },
+      {
+        "label": "南芬区",
+        "value": "210505"
+      },
+      {
+        "label": "本溪满族自治县",
+        "value": "210521"
+      },
+      {
+        "label": "桓仁满族自治县",
+        "value": "210522"
+      }
+    ],
+    [{
+        "label": "元宝区",
+        "value": "210602"
+      },
+      {
+        "label": "振兴区",
+        "value": "210603"
+      },
+      {
+        "label": "振安区",
+        "value": "210604"
+      },
+      {
+        "label": "宽甸满族自治县",
+        "value": "210624"
+      },
+      {
+        "label": "东港市",
+        "value": "210681"
+      },
+      {
+        "label": "凤城市",
+        "value": "210682"
+      }
+    ],
+    [{
+        "label": "古塔区",
+        "value": "210702"
+      },
+      {
+        "label": "凌河区",
+        "value": "210703"
+      },
+      {
+        "label": "太和区",
+        "value": "210711"
+      },
+      {
+        "label": "黑山县",
+        "value": "210726"
+      },
+      {
+        "label": "义县",
+        "value": "210727"
+      },
+      {
+        "label": "凌海市",
+        "value": "210781"
+      },
+      {
+        "label": "北镇市",
+        "value": "210782"
+      }
+    ],
+    [{
+        "label": "站前区",
+        "value": "210802"
+      },
+      {
+        "label": "西市区",
+        "value": "210803"
+      },
+      {
+        "label": "鲅鱼圈区",
+        "value": "210804"
+      },
+      {
+        "label": "老边区",
+        "value": "210811"
+      },
+      {
+        "label": "盖州市",
+        "value": "210881"
+      },
+      {
+        "label": "大石桥市",
+        "value": "210882"
+      }
+    ],
+    [{
+        "label": "海州区",
+        "value": "210902"
+      },
+      {
+        "label": "新邱区",
+        "value": "210903"
+      },
+      {
+        "label": "太平区",
+        "value": "210904"
+      },
+      {
+        "label": "清河门区",
+        "value": "210905"
+      },
+      {
+        "label": "细河区",
+        "value": "210911"
+      },
+      {
+        "label": "阜新蒙古族自治县",
+        "value": "210921"
+      },
+      {
+        "label": "彰武县",
+        "value": "210922"
+      }
+    ],
+    [{
+        "label": "白塔区",
+        "value": "211002"
+      },
+      {
+        "label": "文圣区",
+        "value": "211003"
+      },
+      {
+        "label": "宏伟区",
+        "value": "211004"
+      },
+      {
+        "label": "弓长岭区",
+        "value": "211005"
+      },
+      {
+        "label": "太子河区",
+        "value": "211011"
+      },
+      {
+        "label": "辽阳县",
+        "value": "211021"
+      },
+      {
+        "label": "灯塔市",
+        "value": "211081"
+      }
+    ],
+    [{
+        "label": "双台子区",
+        "value": "211102"
+      },
+      {
+        "label": "兴隆台区",
+        "value": "211103"
+      },
+      {
+        "label": "大洼区",
+        "value": "211104"
+      },
+      {
+        "label": "盘山县",
+        "value": "211122"
+      }
+    ],
+    [{
+        "label": "银州区",
+        "value": "211202"
+      },
+      {
+        "label": "清河区",
+        "value": "211204"
+      },
+      {
+        "label": "铁岭县",
+        "value": "211221"
+      },
+      {
+        "label": "西丰县",
+        "value": "211223"
+      },
+      {
+        "label": "昌图县",
+        "value": "211224"
+      },
+      {
+        "label": "调兵山市",
+        "value": "211281"
+      },
+      {
+        "label": "开原市",
+        "value": "211282"
+      }
+    ],
+    [{
+        "label": "双塔区",
+        "value": "211302"
+      },
+      {
+        "label": "龙城区",
+        "value": "211303"
+      },
+      {
+        "label": "朝阳县",
+        "value": "211321"
+      },
+      {
+        "label": "建平县",
+        "value": "211322"
+      },
+      {
+        "label": "喀喇沁左翼蒙古族自治县",
+        "value": "211324"
+      },
+      {
+        "label": "北票市",
+        "value": "211381"
+      },
+      {
+        "label": "凌源市",
+        "value": "211382"
+      }
+    ],
+    [{
+        "label": "连山区",
+        "value": "211402"
+      },
+      {
+        "label": "龙港区",
+        "value": "211403"
+      },
+      {
+        "label": "南票区",
+        "value": "211404"
+      },
+      {
+        "label": "绥中县",
+        "value": "211421"
+      },
+      {
+        "label": "建昌县",
+        "value": "211422"
+      },
+      {
+        "label": "兴城市",
+        "value": "211481"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "南关区",
+        "value": "220102"
+      },
+      {
+        "label": "宽城区",
+        "value": "220103"
+      },
+      {
+        "label": "朝阳区",
+        "value": "220104"
+      },
+      {
+        "label": "二道区",
+        "value": "220105"
+      },
+      {
+        "label": "绿园区",
+        "value": "220106"
+      },
+      {
+        "label": "双阳区",
+        "value": "220112"
+      },
+      {
+        "label": "九台区",
+        "value": "220113"
+      },
+      {
+        "label": "农安县",
+        "value": "220122"
+      },
+      {
+        "label": "长春经济技术开发区",
+        "value": "220171"
+      },
+      {
+        "label": "长春净月高新技术产业开发区",
+        "value": "220172"
+      },
+      {
+        "label": "长春高新技术产业开发区",
+        "value": "220173"
+      },
+      {
+        "label": "长春汽车经济技术开发区",
+        "value": "220174"
+      },
+      {
+        "label": "榆树市",
+        "value": "220182"
+      },
+      {
+        "label": "德惠市",
+        "value": "220183"
+      }
+    ],
+    [{
+        "label": "昌邑区",
+        "value": "220202"
+      },
+      {
+        "label": "龙潭区",
+        "value": "220203"
+      },
+      {
+        "label": "船营区",
+        "value": "220204"
+      },
+      {
+        "label": "丰满区",
+        "value": "220211"
+      },
+      {
+        "label": "永吉县",
+        "value": "220221"
+      },
+      {
+        "label": "吉林经济开发区",
+        "value": "220271"
+      },
+      {
+        "label": "吉林高新技术产业开发区",
+        "value": "220272"
+      },
+      {
+        "label": "吉林中国新加坡食品区",
+        "value": "220273"
+      },
+      {
+        "label": "蛟河市",
+        "value": "220281"
+      },
+      {
+        "label": "桦甸市",
+        "value": "220282"
+      },
+      {
+        "label": "舒兰市",
+        "value": "220283"
+      },
+      {
+        "label": "磐石市",
+        "value": "220284"
+      }
+    ],
+    [{
+        "label": "铁西区",
+        "value": "220302"
+      },
+      {
+        "label": "铁东区",
+        "value": "220303"
+      },
+      {
+        "label": "梨树县",
+        "value": "220322"
+      },
+      {
+        "label": "伊通满族自治县",
+        "value": "220323"
+      },
+      {
+        "label": "公主岭市",
+        "value": "220381"
+      },
+      {
+        "label": "双辽市",
+        "value": "220382"
+      }
+    ],
+    [{
+        "label": "龙山区",
+        "value": "220402"
+      },
+      {
+        "label": "西安区",
+        "value": "220403"
+      },
+      {
+        "label": "东丰县",
+        "value": "220421"
+      },
+      {
+        "label": "东辽县",
+        "value": "220422"
+      }
+    ],
+    [{
+        "label": "东昌区",
+        "value": "220502"
+      },
+      {
+        "label": "二道江区",
+        "value": "220503"
+      },
+      {
+        "label": "通化县",
+        "value": "220521"
+      },
+      {
+        "label": "辉南县",
+        "value": "220523"
+      },
+      {
+        "label": "柳河县",
+        "value": "220524"
+      },
+      {
+        "label": "梅河口市",
+        "value": "220581"
+      },
+      {
+        "label": "集安市",
+        "value": "220582"
+      }
+    ],
+    [{
+        "label": "浑江区",
+        "value": "220602"
+      },
+      {
+        "label": "江源区",
+        "value": "220605"
+      },
+      {
+        "label": "抚松县",
+        "value": "220621"
+      },
+      {
+        "label": "靖宇县",
+        "value": "220622"
+      },
+      {
+        "label": "长白朝鲜族自治县",
+        "value": "220623"
+      },
+      {
+        "label": "临江市",
+        "value": "220681"
+      }
+    ],
+    [{
+        "label": "宁江区",
+        "value": "220702"
+      },
+      {
+        "label": "前郭尔罗斯蒙古族自治县",
+        "value": "220721"
+      },
+      {
+        "label": "长岭县",
+        "value": "220722"
+      },
+      {
+        "label": "乾安县",
+        "value": "220723"
+      },
+      {
+        "label": "吉林松原经济开发区",
+        "value": "220771"
+      },
+      {
+        "label": "扶余市",
+        "value": "220781"
+      }
+    ],
+    [{
+        "label": "洮北区",
+        "value": "220802"
+      },
+      {
+        "label": "镇赉县",
+        "value": "220821"
+      },
+      {
+        "label": "通榆县",
+        "value": "220822"
+      },
+      {
+        "label": "吉林白城经济开发区",
+        "value": "220871"
+      },
+      {
+        "label": "洮南市",
+        "value": "220881"
+      },
+      {
+        "label": "大安市",
+        "value": "220882"
+      }
+    ],
+    [{
+        "label": "延吉市",
+        "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": "230102"
+      },
+      {
+        "label": "南岗区",
+        "value": "230103"
+      },
+      {
+        "label": "道外区",
+        "value": "230104"
+      },
+      {
+        "label": "平房区",
+        "value": "230108"
+      },
+      {
+        "label": "松北区",
+        "value": "230109"
+      },
+      {
+        "label": "香坊区",
+        "value": "230110"
+      },
+      {
+        "label": "呼兰区",
+        "value": "230111"
+      },
+      {
+        "label": "阿城区",
+        "value": "230112"
+      },
+      {
+        "label": "双城区",
+        "value": "230113"
+      },
+      {
+        "label": "依兰县",
+        "value": "230123"
+      },
+      {
+        "label": "方正县",
+        "value": "230124"
+      },
+      {
+        "label": "宾县",
+        "value": "230125"
+      },
+      {
+        "label": "巴彦县",
+        "value": "230126"
+      },
+      {
+        "label": "木兰县",
+        "value": "230127"
+      },
+      {
+        "label": "通河县",
+        "value": "230128"
+      },
+      {
+        "label": "延寿县",
+        "value": "230129"
+      },
+      {
+        "label": "尚志市",
+        "value": "230183"
+      },
+      {
+        "label": "五常市",
+        "value": "230184"
+      }
+    ],
+    [{
+        "label": "龙沙区",
+        "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": "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": "230402"
+      },
+      {
+        "label": "工农区",
+        "value": "230403"
+      },
+      {
+        "label": "南山区",
+        "value": "230404"
+      },
+      {
+        "label": "兴安区",
+        "value": "230405"
+      },
+      {
+        "label": "东山区",
+        "value": "230406"
+      },
+      {
+        "label": "兴山区",
+        "value": "230407"
+      },
+      {
+        "label": "萝北县",
+        "value": "230421"
+      },
+      {
+        "label": "绥滨县",
+        "value": "230422"
+      }
+    ],
+    [{
+        "label": "尖山区",
+        "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": "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": "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": "230803"
+      },
+      {
+        "label": "前进区",
+        "value": "230804"
+      },
+      {
+        "label": "东风区",
+        "value": "230805"
+      },
+      {
+        "label": "郊区",
+        "value": "230811"
+      },
+      {
+        "label": "桦南县",
+        "value": "230822"
+      },
+      {
+        "label": "桦川县",
+        "value": "230826"
+      },
+      {
+        "label": "汤原县",
+        "value": "230828"
+      },
+      {
+        "label": "同江市",
+        "value": "230881"
+      },
+      {
+        "label": "富锦市",
+        "value": "230882"
+      },
+      {
+        "label": "抚远市",
+        "value": "230883"
+      }
+    ],
+    [{
+        "label": "新兴区",
+        "value": "230902"
+      },
+      {
+        "label": "桃山区",
+        "value": "230903"
+      },
+      {
+        "label": "茄子河区",
+        "value": "230904"
+      },
+      {
+        "label": "勃利县",
+        "value": "230921"
+      }
+    ],
+    [{
+        "label": "东安区",
+        "value": "231002"
+      },
+      {
+        "label": "阳明区",
+        "value": "231003"
+      },
+      {
+        "label": "爱民区",
+        "value": "231004"
+      },
+      {
+        "label": "西安区",
+        "value": "231005"
+      },
+      {
+        "label": "林口县",
+        "value": "231025"
+      },
+      {
+        "label": "牡丹江经济技术开发区",
+        "value": "231071"
+      },
+      {
+        "label": "绥芬河市",
+        "value": "231081"
+      },
+      {
+        "label": "海林市",
+        "value": "231083"
+      },
+      {
+        "label": "宁安市",
+        "value": "231084"
+      },
+      {
+        "label": "穆棱市",
+        "value": "231085"
+      },
+      {
+        "label": "东宁市",
+        "value": "231086"
+      }
+    ],
+    [{
+        "label": "爱辉区",
+        "value": "231102"
+      },
+      {
+        "label": "嫩江县",
+        "value": "231121"
+      },
+      {
+        "label": "逊克县",
+        "value": "231123"
+      },
+      {
+        "label": "孙吴县",
+        "value": "231124"
+      },
+      {
+        "label": "北安市",
+        "value": "231181"
+      },
+      {
+        "label": "五大连池市",
+        "value": "231182"
+      }
+    ],
+    [{
+        "label": "北林区",
+        "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": "232701"
+      },
+      {
+        "label": "松岭区",
+        "value": "232702"
+      },
+      {
+        "label": "新林区",
+        "value": "232703"
+      },
+      {
+        "label": "呼中区",
+        "value": "232704"
+      },
+      {
+        "label": "呼玛县",
+        "value": "232721"
+      },
+      {
+        "label": "塔河县",
+        "value": "232722"
+      },
+      {
+        "label": "漠河县",
+        "value": "232723"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "黄浦区",
+        "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": "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": "320205"
+      },
+      {
+        "label": "惠山区",
+        "value": "320206"
+      },
+      {
+        "label": "滨湖区",
+        "value": "320211"
+      },
+      {
+        "label": "梁溪区",
+        "value": "320213"
+      },
+      {
+        "label": "新吴区",
+        "value": "320214"
+      },
+      {
+        "label": "江阴市",
+        "value": "320281"
+      },
+      {
+        "label": "宜兴市",
+        "value": "320282"
+      }
+    ],
+    [{
+        "label": "鼓楼区",
+        "value": "320302"
+      },
+      {
+        "label": "云龙区",
+        "value": "320303"
+      },
+      {
+        "label": "贾汪区",
+        "value": "320305"
+      },
+      {
+        "label": "泉山区",
+        "value": "320311"
+      },
+      {
+        "label": "铜山区",
+        "value": "320312"
+      },
+      {
+        "label": "丰县",
+        "value": "320321"
+      },
+      {
+        "label": "沛县",
+        "value": "320322"
+      },
+      {
+        "label": "睢宁县",
+        "value": "320324"
+      },
+      {
+        "label": "徐州经济技术开发区",
+        "value": "320371"
+      },
+      {
+        "label": "新沂市",
+        "value": "320381"
+      },
+      {
+        "label": "邳州市",
+        "value": "320382"
+      }
+    ],
+    [{
+        "label": "天宁区",
+        "value": "320402"
+      },
+      {
+        "label": "钟楼区",
+        "value": "320404"
+      },
+      {
+        "label": "新北区",
+        "value": "320411"
+      },
+      {
+        "label": "武进区",
+        "value": "320412"
+      },
+      {
+        "label": "金坛区",
+        "value": "320413"
+      },
+      {
+        "label": "溧阳市",
+        "value": "320481"
+      }
+    ],
+    [{
+        "label": "虎丘区",
+        "value": "320505"
+      },
+      {
+        "label": "吴中区",
+        "value": "320506"
+      },
+      {
+        "label": "相城区",
+        "value": "320507"
+      },
+      {
+        "label": "姑苏区",
+        "value": "320508"
+      },
+      {
+        "label": "吴江区",
+        "value": "320509"
+      },
+      {
+        "label": "苏州工业园区",
+        "value": "320571"
+      },
+      {
+        "label": "常熟市",
+        "value": "320581"
+      },
+      {
+        "label": "张家港市",
+        "value": "320582"
+      },
+      {
+        "label": "昆山市",
+        "value": "320583"
+      },
+      {
+        "label": "太仓市",
+        "value": "320585"
+      }
+    ],
+    [{
+        "label": "崇川区",
+        "value": "320602"
+      },
+      {
+        "label": "港闸区",
+        "value": "320611"
+      },
+      {
+        "label": "通州区",
+        "value": "320612"
+      },
+      {
+        "label": "海安县",
+        "value": "320621"
+      },
+      {
+        "label": "如东县",
+        "value": "320623"
+      },
+      {
+        "label": "南通经济技术开发区",
+        "value": "320671"
+      },
+      {
+        "label": "启东市",
+        "value": "320681"
+      },
+      {
+        "label": "如皋市",
+        "value": "320682"
+      },
+      {
+        "label": "海门市",
+        "value": "320684"
+      }
+    ],
+    [{
+        "label": "连云区",
+        "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": "320803"
+      },
+      {
+        "label": "淮阴区",
+        "value": "320804"
+      },
+      {
+        "label": "清江浦区",
+        "value": "320812"
+      },
+      {
+        "label": "洪泽区",
+        "value": "320813"
+      },
+      {
+        "label": "涟水县",
+        "value": "320826"
+      },
+      {
+        "label": "盱眙县",
+        "value": "320830"
+      },
+      {
+        "label": "金湖县",
+        "value": "320831"
+      },
+      {
+        "label": "淮安经济技术开发区",
+        "value": "320871"
+      }
+    ],
+    [{
+        "label": "亭湖区",
+        "value": "320902"
+      },
+      {
+        "label": "盐都区",
+        "value": "320903"
+      },
+      {
+        "label": "大丰区",
+        "value": "320904"
+      },
+      {
+        "label": "响水县",
+        "value": "320921"
+      },
+      {
+        "label": "滨海县",
+        "value": "320922"
+      },
+      {
+        "label": "阜宁县",
+        "value": "320923"
+      },
+      {
+        "label": "射阳县",
+        "value": "320924"
+      },
+      {
+        "label": "建湖县",
+        "value": "320925"
+      },
+      {
+        "label": "盐城经济技术开发区",
+        "value": "320971"
+      },
+      {
+        "label": "东台市",
+        "value": "320981"
+      }
+    ],
+    [{
+        "label": "广陵区",
+        "value": "321002"
+      },
+      {
+        "label": "邗江区",
+        "value": "321003"
+      },
+      {
+        "label": "江都区",
+        "value": "321012"
+      },
+      {
+        "label": "宝应县",
+        "value": "321023"
+      },
+      {
+        "label": "扬州经济技术开发区",
+        "value": "321071"
+      },
+      {
+        "label": "仪征市",
+        "value": "321081"
+      },
+      {
+        "label": "高邮市",
+        "value": "321084"
+      }
+    ],
+    [{
+        "label": "京口区",
+        "value": "321102"
+      },
+      {
+        "label": "润州区",
+        "value": "321111"
+      },
+      {
+        "label": "丹徒区",
+        "value": "321112"
+      },
+      {
+        "label": "镇江新区",
+        "value": "321171"
+      },
+      {
+        "label": "丹阳市",
+        "value": "321181"
+      },
+      {
+        "label": "扬中市",
+        "value": "321182"
+      },
+      {
+        "label": "句容市",
+        "value": "321183"
+      }
+    ],
+    [{
+        "label": "海陵区",
+        "value": "321202"
+      },
+      {
+        "label": "高港区",
+        "value": "321203"
+      },
+      {
+        "label": "姜堰区",
+        "value": "321204"
+      },
+      {
+        "label": "泰州医药高新技术产业开发区",
+        "value": "321271"
+      },
+      {
+        "label": "兴化市",
+        "value": "321281"
+      },
+      {
+        "label": "靖江市",
+        "value": "321282"
+      },
+      {
+        "label": "泰兴市",
+        "value": "321283"
+      }
+    ],
+    [{
+        "label": "宿城区",
+        "value": "321302"
+      },
+      {
+        "label": "宿豫区",
+        "value": "321311"
+      },
+      {
+        "label": "沭阳县",
+        "value": "321322"
+      },
+      {
+        "label": "泗阳县",
+        "value": "321323"
+      },
+      {
+        "label": "泗洪县",
+        "value": "321324"
+      },
+      {
+        "label": "宿迁经济技术开发区",
+        "value": "321371"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "上城区",
+        "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": "330111"
+      },
+      {
+        "label": "临安区",
+        "value": "330112"
+      },
+      {
+        "label": "桐庐县",
+        "value": "330122"
+      },
+      {
+        "label": "淳安县",
+        "value": "330127"
+      },
+      {
+        "label": "建德市",
+        "value": "330182"
+      }
+    ],
+    [{
+        "label": "海曙区",
+        "value": "330203"
+      },
+      {
+        "label": "江北区",
+        "value": "330205"
+      },
+      {
+        "label": "北仑区",
+        "value": "330206"
+      },
+      {
+        "label": "镇海区",
+        "value": "330211"
+      },
+      {
+        "label": "鄞州区",
+        "value": "330212"
+      },
+      {
+        "label": "奉化区",
+        "value": "330213"
+      },
+      {
+        "label": "象山县",
+        "value": "330225"
+      },
+      {
+        "label": "宁海县",
+        "value": "330226"
+      },
+      {
+        "label": "余姚市",
+        "value": "330281"
+      },
+      {
+        "label": "慈溪市",
+        "value": "330282"
+      }
+    ],
+    [{
+        "label": "鹿城区",
+        "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": "330371"
+      },
+      {
+        "label": "瑞安市",
+        "value": "330381"
+      },
+      {
+        "label": "乐清市",
+        "value": "330382"
+      }
+    ],
+    [{
+        "label": "南湖区",
+        "value": "330402"
+      },
+      {
+        "label": "秀洲区",
+        "value": "330411"
+      },
+      {
+        "label": "嘉善县",
+        "value": "330421"
+      },
+      {
+        "label": "海盐县",
+        "value": "330424"
+      },
+      {
+        "label": "海宁市",
+        "value": "330481"
+      },
+      {
+        "label": "平湖市",
+        "value": "330482"
+      },
+      {
+        "label": "桐乡市",
+        "value": "330483"
+      }
+    ],
+    [{
+        "label": "吴兴区",
+        "value": "330502"
+      },
+      {
+        "label": "南浔区",
+        "value": "330503"
+      },
+      {
+        "label": "德清县",
+        "value": "330521"
+      },
+      {
+        "label": "长兴县",
+        "value": "330522"
+      },
+      {
+        "label": "安吉县",
+        "value": "330523"
+      }
+    ],
+    [{
+        "label": "越城区",
+        "value": "330602"
+      },
+      {
+        "label": "柯桥区",
+        "value": "330603"
+      },
+      {
+        "label": "上虞区",
+        "value": "330604"
+      },
+      {
+        "label": "新昌县",
+        "value": "330624"
+      },
+      {
+        "label": "诸暨市",
+        "value": "330681"
+      },
+      {
+        "label": "嵊州市",
+        "value": "330683"
+      }
+    ],
+    [{
+        "label": "婺城区",
+        "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": "330802"
+      },
+      {
+        "label": "衢江区",
+        "value": "330803"
+      },
+      {
+        "label": "常山县",
+        "value": "330822"
+      },
+      {
+        "label": "开化县",
+        "value": "330824"
+      },
+      {
+        "label": "龙游县",
+        "value": "330825"
+      },
+      {
+        "label": "江山市",
+        "value": "330881"
+      }
+    ],
+    [{
+        "label": "定海区",
+        "value": "330902"
+      },
+      {
+        "label": "普陀区",
+        "value": "330903"
+      },
+      {
+        "label": "岱山县",
+        "value": "330921"
+      },
+      {
+        "label": "嵊泗县",
+        "value": "330922"
+      }
+    ],
+    [{
+        "label": "椒江区",
+        "value": "331002"
+      },
+      {
+        "label": "黄岩区",
+        "value": "331003"
+      },
+      {
+        "label": "路桥区",
+        "value": "331004"
+      },
+      {
+        "label": "三门县",
+        "value": "331022"
+      },
+      {
+        "label": "天台县",
+        "value": "331023"
+      },
+      {
+        "label": "仙居县",
+        "value": "331024"
+      },
+      {
+        "label": "温岭市",
+        "value": "331081"
+      },
+      {
+        "label": "临海市",
+        "value": "331082"
+      },
+      {
+        "label": "玉环市",
+        "value": "331083"
+      }
+    ],
+    [{
+        "label": "莲都区",
+        "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": "340102"
+      },
+      {
+        "label": "庐阳区",
+        "value": "340103"
+      },
+      {
+        "label": "蜀山区",
+        "value": "340104"
+      },
+      {
+        "label": "包河区",
+        "value": "340111"
+      },
+      {
+        "label": "长丰县",
+        "value": "340121"
+      },
+      {
+        "label": "肥东县",
+        "value": "340122"
+      },
+      {
+        "label": "肥西县",
+        "value": "340123"
+      },
+      {
+        "label": "庐江县",
+        "value": "340124"
+      },
+      {
+        "label": "合肥高新技术产业开发区",
+        "value": "340171"
+      },
+      {
+        "label": "合肥经济技术开发区",
+        "value": "340172"
+      },
+      {
+        "label": "合肥新站高新技术产业开发区",
+        "value": "340173"
+      },
+      {
+        "label": "巢湖市",
+        "value": "340181"
+      }
+    ],
+    [{
+        "label": "镜湖区",
+        "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": "340271"
+      },
+      {
+        "label": "安徽芜湖长江大桥经济开发区",
+        "value": "340272"
+      }
+    ],
+    [{
+        "label": "龙子湖区",
+        "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": "340402"
+      },
+      {
+        "label": "田家庵区",
+        "value": "340403"
+      },
+      {
+        "label": "谢家集区",
+        "value": "340404"
+      },
+      {
+        "label": "八公山区",
+        "value": "340405"
+      },
+      {
+        "label": "潘集区",
+        "value": "340406"
+      },
+      {
+        "label": "凤台县",
+        "value": "340421"
+      },
+      {
+        "label": "寿县",
+        "value": "340422"
+      }
+    ],
+    [{
+        "label": "花山区",
+        "value": "340503"
+      },
+      {
+        "label": "雨山区",
+        "value": "340504"
+      },
+      {
+        "label": "博望区",
+        "value": "340506"
+      },
+      {
+        "label": "当涂县",
+        "value": "340521"
+      },
+      {
+        "label": "含山县",
+        "value": "340522"
+      },
+      {
+        "label": "和县",
+        "value": "340523"
+      }
+    ],
+    [{
+        "label": "杜集区",
+        "value": "340602"
+      },
+      {
+        "label": "相山区",
+        "value": "340603"
+      },
+      {
+        "label": "烈山区",
+        "value": "340604"
+      },
+      {
+        "label": "濉溪县",
+        "value": "340621"
+      }
+    ],
+    [{
+        "label": "铜官区",
+        "value": "340705"
+      },
+      {
+        "label": "义安区",
+        "value": "340706"
+      },
+      {
+        "label": "郊区",
+        "value": "340711"
+      },
+      {
+        "label": "枞阳县",
+        "value": "340722"
+      }
+    ],
+    [{
+        "label": "迎江区",
+        "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": "340871"
+      },
+      {
+        "label": "桐城市",
+        "value": "340881"
+      }
+    ],
+    [{
+        "label": "屯溪区",
+        "value": "341002"
+      },
+      {
+        "label": "黄山区",
+        "value": "341003"
+      },
+      {
+        "label": "徽州区",
+        "value": "341004"
+      },
+      {
+        "label": "歙县",
+        "value": "341021"
+      },
+      {
+        "label": "休宁县",
+        "value": "341022"
+      },
+      {
+        "label": "黟县",
+        "value": "341023"
+      },
+      {
+        "label": "祁门县",
+        "value": "341024"
+      }
+    ],
+    [{
+        "label": "琅琊区",
+        "value": "341102"
+      },
+      {
+        "label": "南谯区",
+        "value": "341103"
+      },
+      {
+        "label": "来安县",
+        "value": "341122"
+      },
+      {
+        "label": "全椒县",
+        "value": "341124"
+      },
+      {
+        "label": "定远县",
+        "value": "341125"
+      },
+      {
+        "label": "凤阳县",
+        "value": "341126"
+      },
+      {
+        "label": "苏滁现代产业园",
+        "value": "341171"
+      },
+      {
+        "label": "滁州经济技术开发区",
+        "value": "341172"
+      },
+      {
+        "label": "天长市",
+        "value": "341181"
+      },
+      {
+        "label": "明光市",
+        "value": "341182"
+      }
+    ],
+    [{
+        "label": "颍州区",
+        "value": "341202"
+      },
+      {
+        "label": "颍东区",
+        "value": "341203"
+      },
+      {
+        "label": "颍泉区",
+        "value": "341204"
+      },
+      {
+        "label": "临泉县",
+        "value": "341221"
+      },
+      {
+        "label": "太和县",
+        "value": "341222"
+      },
+      {
+        "label": "阜南县",
+        "value": "341225"
+      },
+      {
+        "label": "颍上县",
+        "value": "341226"
+      },
+      {
+        "label": "阜阳合肥现代产业园区",
+        "value": "341271"
+      },
+      {
+        "label": "阜阳经济技术开发区",
+        "value": "341272"
+      },
+      {
+        "label": "界首市",
+        "value": "341282"
+      }
+    ],
+    [{
+        "label": "埇桥区",
+        "value": "341302"
+      },
+      {
+        "label": "砀山县",
+        "value": "341321"
+      },
+      {
+        "label": "萧县",
+        "value": "341322"
+      },
+      {
+        "label": "灵璧县",
+        "value": "341323"
+      },
+      {
+        "label": "泗县",
+        "value": "341324"
+      },
+      {
+        "label": "宿州马鞍山现代产业园区",
+        "value": "341371"
+      },
+      {
+        "label": "宿州经济技术开发区",
+        "value": "341372"
+      }
+    ],
+    [{
+        "label": "金安区",
+        "value": "341502"
+      },
+      {
+        "label": "裕安区",
+        "value": "341503"
+      },
+      {
+        "label": "叶集区",
+        "value": "341504"
+      },
+      {
+        "label": "霍邱县",
+        "value": "341522"
+      },
+      {
+        "label": "舒城县",
+        "value": "341523"
+      },
+      {
+        "label": "金寨县",
+        "value": "341524"
+      },
+      {
+        "label": "霍山县",
+        "value": "341525"
+      }
+    ],
+    [{
+        "label": "谯城区",
+        "value": "341602"
+      },
+      {
+        "label": "涡阳县",
+        "value": "341621"
+      },
+      {
+        "label": "蒙城县",
+        "value": "341622"
+      },
+      {
+        "label": "利辛县",
+        "value": "341623"
+      }
+    ],
+    [{
+        "label": "贵池区",
+        "value": "341702"
+      },
+      {
+        "label": "东至县",
+        "value": "341721"
+      },
+      {
+        "label": "石台县",
+        "value": "341722"
+      },
+      {
+        "label": "青阳县",
+        "value": "341723"
+      }
+    ],
+    [{
+        "label": "宣州区",
+        "value": "341802"
+      },
+      {
+        "label": "郎溪县",
+        "value": "341821"
+      },
+      {
+        "label": "广德县",
+        "value": "341822"
+      },
+      {
+        "label": "泾县",
+        "value": "341823"
+      },
+      {
+        "label": "绩溪县",
+        "value": "341824"
+      },
+      {
+        "label": "旌德县",
+        "value": "341825"
+      },
+      {
+        "label": "宣城市经济开发区",
+        "value": "341871"
+      },
+      {
+        "label": "宁国市",
+        "value": "341881"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "鼓楼区",
+        "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": "350203"
+      },
+      {
+        "label": "海沧区",
+        "value": "350205"
+      },
+      {
+        "label": "湖里区",
+        "value": "350206"
+      },
+      {
+        "label": "集美区",
+        "value": "350211"
+      },
+      {
+        "label": "同安区",
+        "value": "350212"
+      },
+      {
+        "label": "翔安区",
+        "value": "350213"
+      }
+    ],
+    [{
+        "label": "城厢区",
+        "value": "350302"
+      },
+      {
+        "label": "涵江区",
+        "value": "350303"
+      },
+      {
+        "label": "荔城区",
+        "value": "350304"
+      },
+      {
+        "label": "秀屿区",
+        "value": "350305"
+      },
+      {
+        "label": "仙游县",
+        "value": "350322"
+      }
+    ],
+    [{
+        "label": "梅列区",
+        "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": "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": "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": "350702"
+      },
+      {
+        "label": "建阳区",
+        "value": "350703"
+      },
+      {
+        "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": "350802"
+      },
+      {
+        "label": "永定区",
+        "value": "350803"
+      },
+      {
+        "label": "长汀县",
+        "value": "350821"
+      },
+      {
+        "label": "上杭县",
+        "value": "350823"
+      },
+      {
+        "label": "武平县",
+        "value": "350824"
+      },
+      {
+        "label": "连城县",
+        "value": "350825"
+      },
+      {
+        "label": "漳平市",
+        "value": "350881"
+      }
+    ],
+    [{
+        "label": "蕉城区",
+        "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": "360102"
+      },
+      {
+        "label": "西湖区",
+        "value": "360103"
+      },
+      {
+        "label": "青云谱区",
+        "value": "360104"
+      },
+      {
+        "label": "湾里区",
+        "value": "360105"
+      },
+      {
+        "label": "青山湖区",
+        "value": "360111"
+      },
+      {
+        "label": "新建区",
+        "value": "360112"
+      },
+      {
+        "label": "南昌县",
+        "value": "360121"
+      },
+      {
+        "label": "安义县",
+        "value": "360123"
+      },
+      {
+        "label": "进贤县",
+        "value": "360124"
+      }
+    ],
+    [{
+        "label": "昌江区",
+        "value": "360202"
+      },
+      {
+        "label": "珠山区",
+        "value": "360203"
+      },
+      {
+        "label": "浮梁县",
+        "value": "360222"
+      },
+      {
+        "label": "乐平市",
+        "value": "360281"
+      }
+    ],
+    [{
+        "label": "安源区",
+        "value": "360302"
+      },
+      {
+        "label": "湘东区",
+        "value": "360313"
+      },
+      {
+        "label": "莲花县",
+        "value": "360321"
+      },
+      {
+        "label": "上栗县",
+        "value": "360322"
+      },
+      {
+        "label": "芦溪县",
+        "value": "360323"
+      }
+    ],
+    [{
+        "label": "濂溪区",
+        "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": "360502"
+      },
+      {
+        "label": "分宜县",
+        "value": "360521"
+      }
+    ],
+    [{
+        "label": "月湖区",
+        "value": "360602"
+      },
+      {
+        "label": "余江县",
+        "value": "360622"
+      },
+      {
+        "label": "贵溪市",
+        "value": "360681"
+      }
+    ],
+    [{
+        "label": "章贡区",
+        "value": "360702"
+      },
+      {
+        "label": "南康区",
+        "value": "360703"
+      },
+      {
+        "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": "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": "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": "361002"
+      },
+      {
+        "label": "东乡区",
+        "value": "361003"
+      },
+      {
+        "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": "361030"
+      }
+    ],
+    [{
+        "label": "信州区",
+        "value": "361102"
+      },
+      {
+        "label": "广丰区",
+        "value": "361103"
+      },
+      {
+        "label": "上饶县",
+        "value": "361121"
+      },
+      {
+        "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": "370102"
+      },
+      {
+        "label": "市中区",
+        "value": "370103"
+      },
+      {
+        "label": "槐荫区",
+        "value": "370104"
+      },
+      {
+        "label": "天桥区",
+        "value": "370105"
+      },
+      {
+        "label": "历城区",
+        "value": "370112"
+      },
+      {
+        "label": "长清区",
+        "value": "370113"
+      },
+      {
+        "label": "章丘区",
+        "value": "370114"
+      },
+      {
+        "label": "平阴县",
+        "value": "370124"
+      },
+      {
+        "label": "济阳县",
+        "value": "370125"
+      },
+      {
+        "label": "商河县",
+        "value": "370126"
+      },
+      {
+        "label": "济南高新技术产业开发区",
+        "value": "370171"
+      }
+    ],
+    [{
+        "label": "市南区",
+        "value": "370202"
+      },
+      {
+        "label": "市北区",
+        "value": "370203"
+      },
+      {
+        "label": "黄岛区",
+        "value": "370211"
+      },
+      {
+        "label": "崂山区",
+        "value": "370212"
+      },
+      {
+        "label": "李沧区",
+        "value": "370213"
+      },
+      {
+        "label": "城阳区",
+        "value": "370214"
+      },
+      {
+        "label": "即墨区",
+        "value": "370215"
+      },
+      {
+        "label": "青岛高新技术产业开发区",
+        "value": "370271"
+      },
+      {
+        "label": "胶州市",
+        "value": "370281"
+      },
+      {
+        "label": "平度市",
+        "value": "370283"
+      },
+      {
+        "label": "莱西市",
+        "value": "370285"
+      }
+    ],
+    [{
+        "label": "淄川区",
+        "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": "370402"
+      },
+      {
+        "label": "薛城区",
+        "value": "370403"
+      },
+      {
+        "label": "峄城区",
+        "value": "370404"
+      },
+      {
+        "label": "台儿庄区",
+        "value": "370405"
+      },
+      {
+        "label": "山亭区",
+        "value": "370406"
+      },
+      {
+        "label": "滕州市",
+        "value": "370481"
+      }
+    ],
+    [{
+        "label": "东营区",
+        "value": "370502"
+      },
+      {
+        "label": "河口区",
+        "value": "370503"
+      },
+      {
+        "label": "垦利区",
+        "value": "370505"
+      },
+      {
+        "label": "利津县",
+        "value": "370522"
+      },
+      {
+        "label": "广饶县",
+        "value": "370523"
+      },
+      {
+        "label": "东营经济技术开发区",
+        "value": "370571"
+      },
+      {
+        "label": "东营港经济开发区",
+        "value": "370572"
+      }
+    ],
+    [{
+        "label": "芝罘区",
+        "value": "370602"
+      },
+      {
+        "label": "福山区",
+        "value": "370611"
+      },
+      {
+        "label": "牟平区",
+        "value": "370612"
+      },
+      {
+        "label": "莱山区",
+        "value": "370613"
+      },
+      {
+        "label": "长岛县",
+        "value": "370634"
+      },
+      {
+        "label": "烟台高新技术产业开发区",
+        "value": "370671"
+      },
+      {
+        "label": "烟台经济技术开发区",
+        "value": "370672"
+      },
+      {
+        "label": "龙口市",
+        "value": "370681"
+      },
+      {
+        "label": "莱阳市",
+        "value": "370682"
+      },
+      {
+        "label": "莱州市",
+        "value": "370683"
+      },
+      {
+        "label": "蓬莱市",
+        "value": "370684"
+      },
+      {
+        "label": "招远市",
+        "value": "370685"
+      },
+      {
+        "label": "栖霞市",
+        "value": "370686"
+      },
+      {
+        "label": "海阳市",
+        "value": "370687"
+      }
+    ],
+    [{
+        "label": "潍城区",
+        "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": "370811"
+      },
+      {
+        "label": "兖州区",
+        "value": "370812"
+      },
+      {
+        "label": "微山县",
+        "value": "370826"
+      },
+      {
+        "label": "鱼台县",
+        "value": "370827"
+      },
+      {
+        "label": "金乡县",
+        "value": "370828"
+      },
+      {
+        "label": "嘉祥县",
+        "value": "370829"
+      },
+      {
+        "label": "汶上县",
+        "value": "370830"
+      },
+      {
+        "label": "泗水县",
+        "value": "370831"
+      },
+      {
+        "label": "梁山县",
+        "value": "370832"
+      },
+      {
+        "label": "济宁高新技术产业开发区",
+        "value": "370871"
+      },
+      {
+        "label": "曲阜市",
+        "value": "370881"
+      },
+      {
+        "label": "邹城市",
+        "value": "370883"
+      }
+    ],
+    [{
+        "label": "泰山区",
+        "value": "370902"
+      },
+      {
+        "label": "岱岳区",
+        "value": "370911"
+      },
+      {
+        "label": "宁阳县",
+        "value": "370921"
+      },
+      {
+        "label": "东平县",
+        "value": "370923"
+      },
+      {
+        "label": "新泰市",
+        "value": "370982"
+      },
+      {
+        "label": "肥城市",
+        "value": "370983"
+      }
+    ],
+    [{
+        "label": "环翠区",
+        "value": "371002"
+      },
+      {
+        "label": "文登区",
+        "value": "371003"
+      },
+      {
+        "label": "威海火炬高技术产业开发区",
+        "value": "371071"
+      },
+      {
+        "label": "威海经济技术开发区",
+        "value": "371072"
+      },
+      {
+        "label": "威海临港经济技术开发区",
+        "value": "371073"
+      },
+      {
+        "label": "荣成市",
+        "value": "371082"
+      },
+      {
+        "label": "乳山市",
+        "value": "371083"
+      }
+    ],
+    [{
+        "label": "东港区",
+        "value": "371102"
+      },
+      {
+        "label": "岚山区",
+        "value": "371103"
+      },
+      {
+        "label": "五莲县",
+        "value": "371121"
+      },
+      {
+        "label": "莒县",
+        "value": "371122"
+      },
+      {
+        "label": "日照经济技术开发区",
+        "value": "371171"
+      },
+      {
+        "label": "日照国际海洋城",
+        "value": "371172"
+      }
+    ],
+    [{
+        "label": "莱城区",
+        "value": "371202"
+      },
+      {
+        "label": "钢城区",
+        "value": "371203"
+      }
+    ],
+    [{
+        "label": "兰山区",
+        "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": "371372"
+      },
+      {
+        "label": "临沂临港经济开发区",
+        "value": "371373"
+      }
+    ],
+    [{
+        "label": "德城区",
+        "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": "371471"
+      },
+      {
+        "label": "德州运河经济开发区",
+        "value": "371472"
+      },
+      {
+        "label": "乐陵市",
+        "value": "371481"
+      },
+      {
+        "label": "禹城市",
+        "value": "371482"
+      }
+    ],
+    [{
+        "label": "东昌府区",
+        "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": "371602"
+      },
+      {
+        "label": "沾化区",
+        "value": "371603"
+      },
+      {
+        "label": "惠民县",
+        "value": "371621"
+      },
+      {
+        "label": "阳信县",
+        "value": "371622"
+      },
+      {
+        "label": "无棣县",
+        "value": "371623"
+      },
+      {
+        "label": "博兴县",
+        "value": "371625"
+      },
+      {
+        "label": "邹平县",
+        "value": "371626"
+      }
+    ],
+    [{
+        "label": "牡丹区",
+        "value": "371702"
+      },
+      {
+        "label": "定陶区",
+        "value": "371703"
+      },
+      {
+        "label": "曹县",
+        "value": "371721"
+      },
+      {
+        "label": "单县",
+        "value": "371722"
+      },
+      {
+        "label": "成武县",
+        "value": "371723"
+      },
+      {
+        "label": "巨野县",
+        "value": "371724"
+      },
+      {
+        "label": "郓城县",
+        "value": "371725"
+      },
+      {
+        "label": "鄄城县",
+        "value": "371726"
+      },
+      {
+        "label": "东明县",
+        "value": "371728"
+      },
+      {
+        "label": "菏泽经济技术开发区",
+        "value": "371771"
+      },
+      {
+        "label": "菏泽高新技术开发区",
+        "value": "371772"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "中原区",
+        "value": "410102"
+      },
+      {
+        "label": "二七区",
+        "value": "410103"
+      },
+      {
+        "label": "管城回族区",
+        "value": "410104"
+      },
+      {
+        "label": "金水区",
+        "value": "410105"
+      },
+      {
+        "label": "上街区",
+        "value": "410106"
+      },
+      {
+        "label": "惠济区",
+        "value": "410108"
+      },
+      {
+        "label": "中牟县",
+        "value": "410122"
+      },
+      {
+        "label": "郑州经济技术开发区",
+        "value": "410171"
+      },
+      {
+        "label": "郑州高新技术产业开发区",
+        "value": "410172"
+      },
+      {
+        "label": "郑州航空港经济综合实验区",
+        "value": "410173"
+      },
+      {
+        "label": "巩义市",
+        "value": "410181"
+      },
+      {
+        "label": "荥阳市",
+        "value": "410182"
+      },
+      {
+        "label": "新密市",
+        "value": "410183"
+      },
+      {
+        "label": "新郑市",
+        "value": "410184"
+      },
+      {
+        "label": "登封市",
+        "value": "410185"
+      }
+    ],
+    [{
+        "label": "龙亭区",
+        "value": "410202"
+      },
+      {
+        "label": "顺河回族区",
+        "value": "410203"
+      },
+      {
+        "label": "鼓楼区",
+        "value": "410204"
+      },
+      {
+        "label": "禹王台区",
+        "value": "410205"
+      },
+      {
+        "label": "祥符区",
+        "value": "410212"
+      },
+      {
+        "label": "杞县",
+        "value": "410221"
+      },
+      {
+        "label": "通许县",
+        "value": "410222"
+      },
+      {
+        "label": "尉氏县",
+        "value": "410223"
+      },
+      {
+        "label": "兰考县",
+        "value": "410225"
+      }
+    ],
+    [{
+        "label": "老城区",
+        "value": "410302"
+      },
+      {
+        "label": "西工区",
+        "value": "410303"
+      },
+      {
+        "label": "瀍河回族区",
+        "value": "410304"
+      },
+      {
+        "label": "涧西区",
+        "value": "410305"
+      },
+      {
+        "label": "吉利区",
+        "value": "410306"
+      },
+      {
+        "label": "洛龙区",
+        "value": "410311"
+      },
+      {
+        "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": "410371"
+      },
+      {
+        "label": "偃师市",
+        "value": "410381"
+      }
+    ],
+    [{
+        "label": "新华区",
+        "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": "410471"
+      },
+      {
+        "label": "平顶山市新城区",
+        "value": "410472"
+      },
+      {
+        "label": "舞钢市",
+        "value": "410481"
+      },
+      {
+        "label": "汝州市",
+        "value": "410482"
+      }
+    ],
+    [{
+        "label": "文峰区",
+        "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": "410571"
+      },
+      {
+        "label": "林州市",
+        "value": "410581"
+      }
+    ],
+    [{
+        "label": "鹤山区",
+        "value": "410602"
+      },
+      {
+        "label": "山城区",
+        "value": "410603"
+      },
+      {
+        "label": "淇滨区",
+        "value": "410611"
+      },
+      {
+        "label": "浚县",
+        "value": "410621"
+      },
+      {
+        "label": "淇县",
+        "value": "410622"
+      },
+      {
+        "label": "鹤壁经济技术开发区",
+        "value": "410671"
+      }
+    ],
+    [{
+        "label": "红旗区",
+        "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": "410771"
+      },
+      {
+        "label": "新乡经济技术开发区",
+        "value": "410772"
+      },
+      {
+        "label": "新乡市平原城乡一体化示范区",
+        "value": "410773"
+      },
+      {
+        "label": "卫辉市",
+        "value": "410781"
+      },
+      {
+        "label": "辉县市",
+        "value": "410782"
+      }
+    ],
+    [{
+        "label": "解放区",
+        "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": "410871"
+      },
+      {
+        "label": "沁阳市",
+        "value": "410882"
+      },
+      {
+        "label": "孟州市",
+        "value": "410883"
+      }
+    ],
+    [{
+        "label": "华龙区",
+        "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": "411002"
+      },
+      {
+        "label": "建安区",
+        "value": "411003"
+      },
+      {
+        "label": "鄢陵县",
+        "value": "411024"
+      },
+      {
+        "label": "襄城县",
+        "value": "411025"
+      },
+      {
+        "label": "许昌经济技术开发区",
+        "value": "411071"
+      },
+      {
+        "label": "禹州市",
+        "value": "411081"
+      },
+      {
+        "label": "长葛市",
+        "value": "411082"
+      }
+    ],
+    [{
+        "label": "源汇区",
+        "value": "411102"
+      },
+      {
+        "label": "郾城区",
+        "value": "411103"
+      },
+      {
+        "label": "召陵区",
+        "value": "411104"
+      },
+      {
+        "label": "舞阳县",
+        "value": "411121"
+      },
+      {
+        "label": "临颍县",
+        "value": "411122"
+      },
+      {
+        "label": "漯河经济技术开发区",
+        "value": "411171"
+      }
+    ],
+    [{
+        "label": "湖滨区",
+        "value": "411202"
+      },
+      {
+        "label": "陕州区",
+        "value": "411203"
+      },
+      {
+        "label": "渑池县",
+        "value": "411221"
+      },
+      {
+        "label": "卢氏县",
+        "value": "411224"
+      },
+      {
+        "label": "河南三门峡经济开发区",
+        "value": "411271"
+      },
+      {
+        "label": "义马市",
+        "value": "411281"
+      },
+      {
+        "label": "灵宝市",
+        "value": "411282"
+      }
+    ],
+    [{
+        "label": "宛城区",
+        "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": "411371"
+      },
+      {
+        "label": "南阳市城乡一体化示范区",
+        "value": "411372"
+      },
+      {
+        "label": "邓州市",
+        "value": "411381"
+      }
+    ],
+    [{
+        "label": "梁园区",
+        "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": "411471"
+      },
+      {
+        "label": "河南商丘经济开发区",
+        "value": "411472"
+      },
+      {
+        "label": "永城市",
+        "value": "411481"
+      }
+    ],
+    [{
+        "label": "浉河区",
+        "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": "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": "411671"
+      },
+      {
+        "label": "项城市",
+        "value": "411681"
+      }
+    ],
+    [{
+        "label": "驿城区",
+        "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": "411728"
+      },
+      {
+        "label": "新蔡县",
+        "value": "411729"
+      },
+      {
+        "label": "河南驻马店经济开发区",
+        "value": "411771"
+      }
+    ],
+    [{
+      "label": "济源市",
+      "value": "419001"
+    }]
+  ],
+  [
+    [{
+        "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": "420202"
+      },
+      {
+        "label": "西塞山区",
+        "value": "420203"
+      },
+      {
+        "label": "下陆区",
+        "value": "420204"
+      },
+      {
+        "label": "铁山区",
+        "value": "420205"
+      },
+      {
+        "label": "阳新县",
+        "value": "420222"
+      },
+      {
+        "label": "大冶市",
+        "value": "420281"
+      }
+    ],
+    [{
+        "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": "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": "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": "420702"
+      },
+      {
+        "label": "华容区",
+        "value": "420703"
+      },
+      {
+        "label": "鄂城区",
+        "value": "420704"
+      }
+    ],
+    [{
+        "label": "东宝区",
+        "value": "420802"
+      },
+      {
+        "label": "掇刀区",
+        "value": "420804"
+      },
+      {
+        "label": "京山县",
+        "value": "420821"
+      },
+      {
+        "label": "沙洋县",
+        "value": "420822"
+      },
+      {
+        "label": "钟祥市",
+        "value": "420881"
+      }
+    ],
+    [{
+        "label": "孝南区",
+        "value": "420902"
+      },
+      {
+        "label": "孝昌县",
+        "value": "420921"
+      },
+      {
+        "label": "大悟县",
+        "value": "420922"
+      },
+      {
+        "label": "云梦县",
+        "value": "420923"
+      },
+      {
+        "label": "应城市",
+        "value": "420981"
+      },
+      {
+        "label": "安陆市",
+        "value": "420982"
+      },
+      {
+        "label": "汉川市",
+        "value": "420984"
+      }
+    ],
+    [{
+        "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": "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": "421202"
+      },
+      {
+        "label": "嘉鱼县",
+        "value": "421221"
+      },
+      {
+        "label": "通城县",
+        "value": "421222"
+      },
+      {
+        "label": "崇阳县",
+        "value": "421223"
+      },
+      {
+        "label": "通山县",
+        "value": "421224"
+      },
+      {
+        "label": "赤壁市",
+        "value": "421281"
+      }
+    ],
+    [{
+        "label": "曾都区",
+        "value": "421303"
+      },
+      {
+        "label": "随县",
+        "value": "421321"
+      },
+      {
+        "label": "广水市",
+        "value": "421381"
+      }
+    ],
+    [{
+        "label": "恩施市",
+        "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": "429004"
+      },
+      {
+        "label": "潜江市",
+        "value": "429005"
+      },
+      {
+        "label": "天门市",
+        "value": "429006"
+      },
+      {
+        "label": "神农架林区",
+        "value": "429021"
+      }
+    ]
+  ],
+  [
+    [{
+        "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": "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": "430302"
+      },
+      {
+        "label": "岳塘区",
+        "value": "430304"
+      },
+      {
+        "label": "湘潭县",
+        "value": "430321"
+      },
+      {
+        "label": "湖南湘潭高新技术产业园区",
+        "value": "430371"
+      },
+      {
+        "label": "湘潭昭山示范区",
+        "value": "430372"
+      },
+      {
+        "label": "湘潭九华示范区",
+        "value": "430373"
+      },
+      {
+        "label": "湘乡市",
+        "value": "430381"
+      },
+      {
+        "label": "韶山市",
+        "value": "430382"
+      }
+    ],
+    [{
+        "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": "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": "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": "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": "430802"
+      },
+      {
+        "label": "武陵源区",
+        "value": "430811"
+      },
+      {
+        "label": "慈利县",
+        "value": "430821"
+      },
+      {
+        "label": "桑植县",
+        "value": "430822"
+      }
+    ],
+    [{
+        "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": "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": "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": "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": "431302"
+      },
+      {
+        "label": "双峰县",
+        "value": "431321"
+      },
+      {
+        "label": "新化县",
+        "value": "431322"
+      },
+      {
+        "label": "冷水江市",
+        "value": "431381"
+      },
+      {
+        "label": "涟源市",
+        "value": "431382"
+      }
+    ],
+    [{
+        "label": "吉首市",
+        "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": "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": "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": "440303"
+      },
+      {
+        "label": "福田区",
+        "value": "440304"
+      },
+      {
+        "label": "南山区",
+        "value": "440305"
+      },
+      {
+        "label": "宝安区",
+        "value": "440306"
+      },
+      {
+        "label": "龙岗区",
+        "value": "440307"
+      },
+      {
+        "label": "盐田区",
+        "value": "440308"
+      },
+      {
+        "label": "龙华区",
+        "value": "440309"
+      },
+      {
+        "label": "坪山区",
+        "value": "440310"
+      }
+    ],
+    [{
+        "label": "香洲区",
+        "value": "440402"
+      },
+      {
+        "label": "斗门区",
+        "value": "440403"
+      },
+      {
+        "label": "金湾区",
+        "value": "440404"
+      }
+    ],
+    [{
+        "label": "龙湖区",
+        "value": "440507"
+      },
+      {
+        "label": "金平区",
+        "value": "440511"
+      },
+      {
+        "label": "濠江区",
+        "value": "440512"
+      },
+      {
+        "label": "潮阳区",
+        "value": "440513"
+      },
+      {
+        "label": "潮南区",
+        "value": "440514"
+      },
+      {
+        "label": "澄海区",
+        "value": "440515"
+      },
+      {
+        "label": "南澳县",
+        "value": "440523"
+      }
+    ],
+    [{
+        "label": "禅城区",
+        "value": "440604"
+      },
+      {
+        "label": "南海区",
+        "value": "440605"
+      },
+      {
+        "label": "顺德区",
+        "value": "440606"
+      },
+      {
+        "label": "三水区",
+        "value": "440607"
+      },
+      {
+        "label": "高明区",
+        "value": "440608"
+      }
+    ],
+    [{
+        "label": "蓬江区",
+        "value": "440703"
+      },
+      {
+        "label": "江海区",
+        "value": "440704"
+      },
+      {
+        "label": "新会区",
+        "value": "440705"
+      },
+      {
+        "label": "台山市",
+        "value": "440781"
+      },
+      {
+        "label": "开平市",
+        "value": "440783"
+      },
+      {
+        "label": "鹤山市",
+        "value": "440784"
+      },
+      {
+        "label": "恩平市",
+        "value": "440785"
+      }
+    ],
+    [{
+        "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": "440902"
+      },
+      {
+        "label": "电白区",
+        "value": "440904"
+      },
+      {
+        "label": "高州市",
+        "value": "440981"
+      },
+      {
+        "label": "化州市",
+        "value": "440982"
+      },
+      {
+        "label": "信宜市",
+        "value": "440983"
+      }
+    ],
+    [{
+        "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": "441302"
+      },
+      {
+        "label": "惠阳区",
+        "value": "441303"
+      },
+      {
+        "label": "博罗县",
+        "value": "441322"
+      },
+      {
+        "label": "惠东县",
+        "value": "441323"
+      },
+      {
+        "label": "龙门县",
+        "value": "441324"
+      }
+    ],
+    [{
+        "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": "441502"
+      },
+      {
+        "label": "海丰县",
+        "value": "441521"
+      },
+      {
+        "label": "陆河县",
+        "value": "441523"
+      },
+      {
+        "label": "陆丰市",
+        "value": "441581"
+      }
+    ],
+    [{
+        "label": "源城区",
+        "value": "441602"
+      },
+      {
+        "label": "紫金县",
+        "value": "441621"
+      },
+      {
+        "label": "龙川县",
+        "value": "441622"
+      },
+      {
+        "label": "连平县",
+        "value": "441623"
+      },
+      {
+        "label": "和平县",
+        "value": "441624"
+      },
+      {
+        "label": "东源县",
+        "value": "441625"
+      }
+    ],
+    [{
+        "label": "江城区",
+        "value": "441702"
+      },
+      {
+        "label": "阳东区",
+        "value": "441704"
+      },
+      {
+        "label": "阳西县",
+        "value": "441721"
+      },
+      {
+        "label": "阳春市",
+        "value": "441781"
+      }
+    ],
+    [{
+        "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": "445102"
+      },
+      {
+        "label": "潮安区",
+        "value": "445103"
+      },
+      {
+        "label": "饶平县",
+        "value": "445122"
+      }
+    ],
+    [{
+        "label": "榕城区",
+        "value": "445202"
+      },
+      {
+        "label": "揭东区",
+        "value": "445203"
+      },
+      {
+        "label": "揭西县",
+        "value": "445222"
+      },
+      {
+        "label": "惠来县",
+        "value": "445224"
+      },
+      {
+        "label": "普宁市",
+        "value": "445281"
+      }
+    ],
+    [{
+        "label": "云城区",
+        "value": "445302"
+      },
+      {
+        "label": "云安区",
+        "value": "445303"
+      },
+      {
+        "label": "新兴县",
+        "value": "445321"
+      },
+      {
+        "label": "郁南县",
+        "value": "445322"
+      },
+      {
+        "label": "罗定市",
+        "value": "445381"
+      }
+    ]
+  ],
+  [
+    [{
+        "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": "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": "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": "450403"
+      },
+      {
+        "label": "长洲区",
+        "value": "450405"
+      },
+      {
+        "label": "龙圩区",
+        "value": "450406"
+      },
+      {
+        "label": "苍梧县",
+        "value": "450421"
+      },
+      {
+        "label": "藤县",
+        "value": "450422"
+      },
+      {
+        "label": "蒙山县",
+        "value": "450423"
+      },
+      {
+        "label": "岑溪市",
+        "value": "450481"
+      }
+    ],
+    [{
+        "label": "海城区",
+        "value": "450502"
+      },
+      {
+        "label": "银海区",
+        "value": "450503"
+      },
+      {
+        "label": "铁山港区",
+        "value": "450512"
+      },
+      {
+        "label": "合浦县",
+        "value": "450521"
+      }
+    ],
+    [{
+        "label": "港口区",
+        "value": "450602"
+      },
+      {
+        "label": "防城区",
+        "value": "450603"
+      },
+      {
+        "label": "上思县",
+        "value": "450621"
+      },
+      {
+        "label": "东兴市",
+        "value": "450681"
+      }
+    ],
+    [{
+        "label": "钦南区",
+        "value": "450702"
+      },
+      {
+        "label": "钦北区",
+        "value": "450703"
+      },
+      {
+        "label": "灵山县",
+        "value": "450721"
+      },
+      {
+        "label": "浦北县",
+        "value": "450722"
+      }
+    ],
+    [{
+        "label": "港北区",
+        "value": "450802"
+      },
+      {
+        "label": "港南区",
+        "value": "450803"
+      },
+      {
+        "label": "覃塘区",
+        "value": "450804"
+      },
+      {
+        "label": "平南县",
+        "value": "450821"
+      },
+      {
+        "label": "桂平市",
+        "value": "450881"
+      }
+    ],
+    [{
+        "label": "玉州区",
+        "value": "450902"
+      },
+      {
+        "label": "福绵区",
+        "value": "450903"
+      },
+      {
+        "label": "容县",
+        "value": "450921"
+      },
+      {
+        "label": "陆川县",
+        "value": "450922"
+      },
+      {
+        "label": "博白县",
+        "value": "450923"
+      },
+      {
+        "label": "兴业县",
+        "value": "450924"
+      },
+      {
+        "label": "北流市",
+        "value": "450981"
+      }
+    ],
+    [{
+        "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": "451102"
+      },
+      {
+        "label": "平桂区",
+        "value": "451103"
+      },
+      {
+        "label": "昭平县",
+        "value": "451121"
+      },
+      {
+        "label": "钟山县",
+        "value": "451122"
+      },
+      {
+        "label": "富川瑶族自治县",
+        "value": "451123"
+      }
+    ],
+    [{
+        "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": "451302"
+      },
+      {
+        "label": "忻城县",
+        "value": "451321"
+      },
+      {
+        "label": "象州县",
+        "value": "451322"
+      },
+      {
+        "label": "武宣县",
+        "value": "451323"
+      },
+      {
+        "label": "金秀瑶族自治县",
+        "value": "451324"
+      },
+      {
+        "label": "合山市",
+        "value": "451381"
+      }
+    ],
+    [{
+        "label": "江州区",
+        "value": "451402"
+      },
+      {
+        "label": "扶绥县",
+        "value": "451421"
+      },
+      {
+        "label": "宁明县",
+        "value": "451422"
+      },
+      {
+        "label": "龙州县",
+        "value": "451423"
+      },
+      {
+        "label": "大新县",
+        "value": "451424"
+      },
+      {
+        "label": "天等县",
+        "value": "451425"
+      },
+      {
+        "label": "凭祥市",
+        "value": "451481"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "秀英区",
+        "value": "460105"
+      },
+      {
+        "label": "龙华区",
+        "value": "460106"
+      },
+      {
+        "label": "琼山区",
+        "value": "460107"
+      },
+      {
+        "label": "美兰区",
+        "value": "460108"
+      }
+    ],
+    [{
+        "label": "海棠区",
+        "value": "460202"
+      },
+      {
+        "label": "吉阳区",
+        "value": "460203"
+      },
+      {
+        "label": "天涯区",
+        "value": "460204"
+      },
+      {
+        "label": "崖州区",
+        "value": "460205"
+      }
+    ],
+    [{
+        "label": "西沙群岛",
+        "value": "460321"
+      },
+      {
+        "label": "南沙群岛",
+        "value": "460322"
+      },
+      {
+        "label": "中沙群岛的岛礁及其海域",
+        "value": "460323"
+      }
+    ],
+    [{
+      "label": "儋州市",
+      "value": "460400"
+    }],
+    [{
+        "label": "五指山市",
+        "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": "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": "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": "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": "510302"
+      },
+      {
+        "label": "贡井区",
+        "value": "510303"
+      },
+      {
+        "label": "大安区",
+        "value": "510304"
+      },
+      {
+        "label": "沿滩区",
+        "value": "510311"
+      },
+      {
+        "label": "荣县",
+        "value": "510321"
+      },
+      {
+        "label": "富顺县",
+        "value": "510322"
+      }
+    ],
+    [{
+        "label": "东区",
+        "value": "510402"
+      },
+      {
+        "label": "西区",
+        "value": "510403"
+      },
+      {
+        "label": "仁和区",
+        "value": "510411"
+      },
+      {
+        "label": "米易县",
+        "value": "510421"
+      },
+      {
+        "label": "盐边县",
+        "value": "510422"
+      }
+    ],
+    [{
+        "label": "江阳区",
+        "value": "510502"
+      },
+      {
+        "label": "纳溪区",
+        "value": "510503"
+      },
+      {
+        "label": "龙马潭区",
+        "value": "510504"
+      },
+      {
+        "label": "泸县",
+        "value": "510521"
+      },
+      {
+        "label": "合江县",
+        "value": "510522"
+      },
+      {
+        "label": "叙永县",
+        "value": "510524"
+      },
+      {
+        "label": "古蔺县",
+        "value": "510525"
+      }
+    ],
+    [{
+        "label": "旌阳区",
+        "value": "510603"
+      },
+      {
+        "label": "罗江区",
+        "value": "510604"
+      },
+      {
+        "label": "中江县",
+        "value": "510623"
+      },
+      {
+        "label": "广汉市",
+        "value": "510681"
+      },
+      {
+        "label": "什邡市",
+        "value": "510682"
+      },
+      {
+        "label": "绵竹市",
+        "value": "510683"
+      }
+    ],
+    [{
+        "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": "510802"
+      },
+      {
+        "label": "昭化区",
+        "value": "510811"
+      },
+      {
+        "label": "朝天区",
+        "value": "510812"
+      },
+      {
+        "label": "旺苍县",
+        "value": "510821"
+      },
+      {
+        "label": "青川县",
+        "value": "510822"
+      },
+      {
+        "label": "剑阁县",
+        "value": "510823"
+      },
+      {
+        "label": "苍溪县",
+        "value": "510824"
+      }
+    ],
+    [{
+        "label": "船山区",
+        "value": "510903"
+      },
+      {
+        "label": "安居区",
+        "value": "510904"
+      },
+      {
+        "label": "蓬溪县",
+        "value": "510921"
+      },
+      {
+        "label": "射洪县",
+        "value": "510922"
+      },
+      {
+        "label": "大英县",
+        "value": "510923"
+      }
+    ],
+    [{
+        "label": "市中区",
+        "value": "511002"
+      },
+      {
+        "label": "东兴区",
+        "value": "511011"
+      },
+      {
+        "label": "威远县",
+        "value": "511024"
+      },
+      {
+        "label": "资中县",
+        "value": "511025"
+      },
+      {
+        "label": "内江经济开发区",
+        "value": "511071"
+      },
+      {
+        "label": "隆昌市",
+        "value": "511083"
+      }
+    ],
+    [{
+        "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": "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": "511402"
+      },
+      {
+        "label": "彭山区",
+        "value": "511403"
+      },
+      {
+        "label": "仁寿县",
+        "value": "511421"
+      },
+      {
+        "label": "洪雅县",
+        "value": "511423"
+      },
+      {
+        "label": "丹棱县",
+        "value": "511424"
+      },
+      {
+        "label": "青神县",
+        "value": "511425"
+      }
+    ],
+    [{
+        "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": "511602"
+      },
+      {
+        "label": "前锋区",
+        "value": "511603"
+      },
+      {
+        "label": "岳池县",
+        "value": "511621"
+      },
+      {
+        "label": "武胜县",
+        "value": "511622"
+      },
+      {
+        "label": "邻水县",
+        "value": "511623"
+      },
+      {
+        "label": "华蓥市",
+        "value": "511681"
+      }
+    ],
+    [{
+        "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": "511802"
+      },
+      {
+        "label": "名山区",
+        "value": "511803"
+      },
+      {
+        "label": "荥经县",
+        "value": "511822"
+      },
+      {
+        "label": "汉源县",
+        "value": "511823"
+      },
+      {
+        "label": "石棉县",
+        "value": "511824"
+      },
+      {
+        "label": "天全县",
+        "value": "511825"
+      },
+      {
+        "label": "芦山县",
+        "value": "511826"
+      },
+      {
+        "label": "宝兴县",
+        "value": "511827"
+      }
+    ],
+    [{
+        "label": "巴州区",
+        "value": "511902"
+      },
+      {
+        "label": "恩阳区",
+        "value": "511903"
+      },
+      {
+        "label": "通江县",
+        "value": "511921"
+      },
+      {
+        "label": "南江县",
+        "value": "511922"
+      },
+      {
+        "label": "平昌县",
+        "value": "511923"
+      },
+      {
+        "label": "巴中经济开发区",
+        "value": "511971"
+      }
+    ],
+    [{
+        "label": "雁江区",
+        "value": "512002"
+      },
+      {
+        "label": "安岳县",
+        "value": "512021"
+      },
+      {
+        "label": "乐至县",
+        "value": "512022"
+      }
+    ],
+    [{
+        "label": "马尔康市",
+        "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": "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": "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": "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": "520201"
+      },
+      {
+        "label": "六枝特区",
+        "value": "520203"
+      },
+      {
+        "label": "水城县",
+        "value": "520221"
+      },
+      {
+        "label": "盘州市",
+        "value": "520281"
+      }
+    ],
+    [{
+        "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": "520402"
+      },
+      {
+        "label": "平坝区",
+        "value": "520403"
+      },
+      {
+        "label": "普定县",
+        "value": "520422"
+      },
+      {
+        "label": "镇宁布依族苗族自治县",
+        "value": "520423"
+      },
+      {
+        "label": "关岭布依族苗族自治县",
+        "value": "520424"
+      },
+      {
+        "label": "紫云苗族布依族自治县",
+        "value": "520425"
+      }
+    ],
+    [{
+        "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": "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": "522301"
+      },
+      {
+        "label": "兴仁县",
+        "value": "522322"
+      },
+      {
+        "label": "普安县",
+        "value": "522323"
+      },
+      {
+        "label": "晴隆县",
+        "value": "522324"
+      },
+      {
+        "label": "贞丰县",
+        "value": "522325"
+      },
+      {
+        "label": "望谟县",
+        "value": "522326"
+      },
+      {
+        "label": "册亨县",
+        "value": "522327"
+      },
+      {
+        "label": "安龙县",
+        "value": "522328"
+      }
+    ],
+    [{
+        "label": "凯里市",
+        "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": "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": "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": "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": "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": "530502"
+      },
+      {
+        "label": "施甸县",
+        "value": "530521"
+      },
+      {
+        "label": "龙陵县",
+        "value": "530523"
+      },
+      {
+        "label": "昌宁县",
+        "value": "530524"
+      },
+      {
+        "label": "腾冲市",
+        "value": "530581"
+      }
+    ],
+    [{
+        "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": "530702"
+      },
+      {
+        "label": "玉龙纳西族自治县",
+        "value": "530721"
+      },
+      {
+        "label": "永胜县",
+        "value": "530722"
+      },
+      {
+        "label": "华坪县",
+        "value": "530723"
+      },
+      {
+        "label": "宁蒗彝族自治县",
+        "value": "530724"
+      }
+    ],
+    [{
+        "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": "530902"
+      },
+      {
+        "label": "凤庆县",
+        "value": "530921"
+      },
+      {
+        "label": "云县",
+        "value": "530922"
+      },
+      {
+        "label": "永德县",
+        "value": "530923"
+      },
+      {
+        "label": "镇康县",
+        "value": "530924"
+      },
+      {
+        "label": "双江拉祜族佤族布朗族傣族自治县",
+        "value": "530925"
+      },
+      {
+        "label": "耿马傣族佤族自治县",
+        "value": "530926"
+      },
+      {
+        "label": "沧源佤族自治县",
+        "value": "530927"
+      }
+    ],
+    [{
+        "label": "楚雄市",
+        "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": "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": "532601"
+      },
+      {
+        "label": "砚山县",
+        "value": "532622"
+      },
+      {
+        "label": "西畴县",
+        "value": "532623"
+      },
+      {
+        "label": "麻栗坡县",
+        "value": "532624"
+      },
+      {
+        "label": "马关县",
+        "value": "532625"
+      },
+      {
+        "label": "丘北县",
+        "value": "532626"
+      },
+      {
+        "label": "广南县",
+        "value": "532627"
+      },
+      {
+        "label": "富宁县",
+        "value": "532628"
+      }
+    ],
+    [{
+        "label": "景洪市",
+        "value": "532801"
+      },
+      {
+        "label": "勐海县",
+        "value": "532822"
+      },
+      {
+        "label": "勐腊县",
+        "value": "532823"
+      }
+    ],
+    [{
+        "label": "大理市",
+        "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": "533102"
+      },
+      {
+        "label": "芒市",
+        "value": "533103"
+      },
+      {
+        "label": "梁河县",
+        "value": "533122"
+      },
+      {
+        "label": "盈江县",
+        "value": "533123"
+      },
+      {
+        "label": "陇川县",
+        "value": "533124"
+      }
+    ],
+    [{
+        "label": "泸水市",
+        "value": "533301"
+      },
+      {
+        "label": "福贡县",
+        "value": "533323"
+      },
+      {
+        "label": "贡山独龙族怒族自治县",
+        "value": "533324"
+      },
+      {
+        "label": "兰坪白族普米族自治县",
+        "value": "533325"
+      }
+    ],
+    [{
+        "label": "香格里拉市",
+        "value": "533401"
+      },
+      {
+        "label": "德钦县",
+        "value": "533422"
+      },
+      {
+        "label": "维西傈僳族自治县",
+        "value": "533423"
+      }
+    ]
+  ],
+  [
+    [{
+        "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": "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": "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": "540402"
+      },
+      {
+        "label": "工布江达县",
+        "value": "540421"
+      },
+      {
+        "label": "米林县",
+        "value": "540422"
+      },
+      {
+        "label": "墨脱县",
+        "value": "540423"
+      },
+      {
+        "label": "波密县",
+        "value": "540424"
+      },
+      {
+        "label": "察隅县",
+        "value": "540425"
+      },
+      {
+        "label": "朗县",
+        "value": "540426"
+      }
+    ],
+    [{
+        "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": "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": "542521"
+      },
+      {
+        "label": "札达县",
+        "value": "542522"
+      },
+      {
+        "label": "噶尔县",
+        "value": "542523"
+      },
+      {
+        "label": "日土县",
+        "value": "542524"
+      },
+      {
+        "label": "革吉县",
+        "value": "542525"
+      },
+      {
+        "label": "改则县",
+        "value": "542526"
+      },
+      {
+        "label": "措勤县",
+        "value": "542527"
+      }
+    ]
+  ],
+  [
+    [{
+        "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": "610202"
+      },
+      {
+        "label": "印台区",
+        "value": "610203"
+      },
+      {
+        "label": "耀州区",
+        "value": "610204"
+      },
+      {
+        "label": "宜君县",
+        "value": "610222"
+      }
+    ],
+    [{
+        "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": "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": "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": "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": "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": "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": "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": "611002"
+      },
+      {
+        "label": "洛南县",
+        "value": "611021"
+      },
+      {
+        "label": "丹凤县",
+        "value": "611022"
+      },
+      {
+        "label": "商南县",
+        "value": "611023"
+      },
+      {
+        "label": "山阳县",
+        "value": "611024"
+      },
+      {
+        "label": "镇安县",
+        "value": "611025"
+      },
+      {
+        "label": "柞水县",
+        "value": "611026"
+      }
+    ]
+  ],
+  [
+    [{
+        "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": "620201"
+    }],
+    [{
+        "label": "金川区",
+        "value": "620302"
+      },
+      {
+        "label": "永昌县",
+        "value": "620321"
+      }
+    ],
+    [{
+        "label": "白银区",
+        "value": "620402"
+      },
+      {
+        "label": "平川区",
+        "value": "620403"
+      },
+      {
+        "label": "靖远县",
+        "value": "620421"
+      },
+      {
+        "label": "会宁县",
+        "value": "620422"
+      },
+      {
+        "label": "景泰县",
+        "value": "620423"
+      }
+    ],
+    [{
+        "label": "秦州区",
+        "value": "620502"
+      },
+      {
+        "label": "麦积区",
+        "value": "620503"
+      },
+      {
+        "label": "清水县",
+        "value": "620521"
+      },
+      {
+        "label": "秦安县",
+        "value": "620522"
+      },
+      {
+        "label": "甘谷县",
+        "value": "620523"
+      },
+      {
+        "label": "武山县",
+        "value": "620524"
+      },
+      {
+        "label": "张家川回族自治县",
+        "value": "620525"
+      }
+    ],
+    [{
+        "label": "凉州区",
+        "value": "620602"
+      },
+      {
+        "label": "民勤县",
+        "value": "620621"
+      },
+      {
+        "label": "古浪县",
+        "value": "620622"
+      },
+      {
+        "label": "天祝藏族自治县",
+        "value": "620623"
+      }
+    ],
+    [{
+        "label": "甘州区",
+        "value": "620702"
+      },
+      {
+        "label": "肃南裕固族自治县",
+        "value": "620721"
+      },
+      {
+        "label": "民乐县",
+        "value": "620722"
+      },
+      {
+        "label": "临泽县",
+        "value": "620723"
+      },
+      {
+        "label": "高台县",
+        "value": "620724"
+      },
+      {
+        "label": "山丹县",
+        "value": "620725"
+      }
+    ],
+    [{
+        "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": "620902"
+      },
+      {
+        "label": "金塔县",
+        "value": "620921"
+      },
+      {
+        "label": "瓜州县",
+        "value": "620922"
+      },
+      {
+        "label": "肃北蒙古族自治县",
+        "value": "620923"
+      },
+      {
+        "label": "阿克塞哈萨克族自治县",
+        "value": "620924"
+      },
+      {
+        "label": "玉门市",
+        "value": "620981"
+      },
+      {
+        "label": "敦煌市",
+        "value": "620982"
+      }
+    ],
+    [{
+        "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": "621102"
+      },
+      {
+        "label": "通渭县",
+        "value": "621121"
+      },
+      {
+        "label": "陇西县",
+        "value": "621122"
+      },
+      {
+        "label": "渭源县",
+        "value": "621123"
+      },
+      {
+        "label": "临洮县",
+        "value": "621124"
+      },
+      {
+        "label": "漳县",
+        "value": "621125"
+      },
+      {
+        "label": "岷县",
+        "value": "621126"
+      }
+    ],
+    [{
+        "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": "622901"
+      },
+      {
+        "label": "临夏县",
+        "value": "622921"
+      },
+      {
+        "label": "康乐县",
+        "value": "622922"
+      },
+      {
+        "label": "永靖县",
+        "value": "622923"
+      },
+      {
+        "label": "广河县",
+        "value": "622924"
+      },
+      {
+        "label": "和政县",
+        "value": "622925"
+      },
+      {
+        "label": "东乡族自治县",
+        "value": "622926"
+      },
+      {
+        "label": "积石山保安族东乡族撒拉族自治县",
+        "value": "622927"
+      }
+    ],
+    [{
+        "label": "合作市",
+        "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": "630102"
+      },
+      {
+        "label": "城中区",
+        "value": "630103"
+      },
+      {
+        "label": "城西区",
+        "value": "630104"
+      },
+      {
+        "label": "城北区",
+        "value": "630105"
+      },
+      {
+        "label": "大通回族土族自治县",
+        "value": "630121"
+      },
+      {
+        "label": "湟中县",
+        "value": "630122"
+      },
+      {
+        "label": "湟源县",
+        "value": "630123"
+      }
+    ],
+    [{
+        "label": "乐都区",
+        "value": "630202"
+      },
+      {
+        "label": "平安区",
+        "value": "630203"
+      },
+      {
+        "label": "民和回族土族自治县",
+        "value": "630222"
+      },
+      {
+        "label": "互助土族自治县",
+        "value": "630223"
+      },
+      {
+        "label": "化隆回族自治县",
+        "value": "630224"
+      },
+      {
+        "label": "循化撒拉族自治县",
+        "value": "630225"
+      }
+    ],
+    [{
+        "label": "门源回族自治县",
+        "value": "632221"
+      },
+      {
+        "label": "祁连县",
+        "value": "632222"
+      },
+      {
+        "label": "海晏县",
+        "value": "632223"
+      },
+      {
+        "label": "刚察县",
+        "value": "632224"
+      }
+    ],
+    [{
+        "label": "同仁县",
+        "value": "632321"
+      },
+      {
+        "label": "尖扎县",
+        "value": "632322"
+      },
+      {
+        "label": "泽库县",
+        "value": "632323"
+      },
+      {
+        "label": "河南蒙古族自治县",
+        "value": "632324"
+      }
+    ],
+    [{
+        "label": "共和县",
+        "value": "632521"
+      },
+      {
+        "label": "同德县",
+        "value": "632522"
+      },
+      {
+        "label": "贵德县",
+        "value": "632523"
+      },
+      {
+        "label": "兴海县",
+        "value": "632524"
+      },
+      {
+        "label": "贵南县",
+        "value": "632525"
+      }
+    ],
+    [{
+        "label": "玛沁县",
+        "value": "632621"
+      },
+      {
+        "label": "班玛县",
+        "value": "632622"
+      },
+      {
+        "label": "甘德县",
+        "value": "632623"
+      },
+      {
+        "label": "达日县",
+        "value": "632624"
+      },
+      {
+        "label": "久治县",
+        "value": "632625"
+      },
+      {
+        "label": "玛多县",
+        "value": "632626"
+      }
+    ],
+    [{
+        "label": "玉树市",
+        "value": "632701"
+      },
+      {
+        "label": "杂多县",
+        "value": "632722"
+      },
+      {
+        "label": "称多县",
+        "value": "632723"
+      },
+      {
+        "label": "治多县",
+        "value": "632724"
+      },
+      {
+        "label": "囊谦县",
+        "value": "632725"
+      },
+      {
+        "label": "曲麻莱县",
+        "value": "632726"
+      }
+    ],
+    [{
+        "label": "格尔木市",
+        "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": "640104"
+      },
+      {
+        "label": "西夏区",
+        "value": "640105"
+      },
+      {
+        "label": "金凤区",
+        "value": "640106"
+      },
+      {
+        "label": "永宁县",
+        "value": "640121"
+      },
+      {
+        "label": "贺兰县",
+        "value": "640122"
+      },
+      {
+        "label": "灵武市",
+        "value": "640181"
+      }
+    ],
+    [{
+        "label": "大武口区",
+        "value": "640202"
+      },
+      {
+        "label": "惠农区",
+        "value": "640205"
+      },
+      {
+        "label": "平罗县",
+        "value": "640221"
+      }
+    ],
+    [{
+        "label": "利通区",
+        "value": "640302"
+      },
+      {
+        "label": "红寺堡区",
+        "value": "640303"
+      },
+      {
+        "label": "盐池县",
+        "value": "640323"
+      },
+      {
+        "label": "同心县",
+        "value": "640324"
+      },
+      {
+        "label": "青铜峡市",
+        "value": "640381"
+      }
+    ],
+    [{
+        "label": "原州区",
+        "value": "640402"
+      },
+      {
+        "label": "西吉县",
+        "value": "640422"
+      },
+      {
+        "label": "隆德县",
+        "value": "640423"
+      },
+      {
+        "label": "泾源县",
+        "value": "640424"
+      },
+      {
+        "label": "彭阳县",
+        "value": "640425"
+      }
+    ],
+    [{
+        "label": "沙坡头区",
+        "value": "640502"
+      },
+      {
+        "label": "中宁县",
+        "value": "640521"
+      },
+      {
+        "label": "海原县",
+        "value": "640522"
+      }
+    ]
+  ],
+  [
+    [{
+        "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": "650202"
+      },
+      {
+        "label": "克拉玛依区",
+        "value": "650203"
+      },
+      {
+        "label": "白碱滩区",
+        "value": "650204"
+      },
+      {
+        "label": "乌尔禾区",
+        "value": "650205"
+      }
+    ],
+    [{
+        "label": "高昌区",
+        "value": "650402"
+      },
+      {
+        "label": "鄯善县",
+        "value": "650421"
+      },
+      {
+        "label": "托克逊县",
+        "value": "650422"
+      }
+    ],
+    [{
+        "label": "伊州区",
+        "value": "650502"
+      },
+      {
+        "label": "巴里坤哈萨克自治县",
+        "value": "650521"
+      },
+      {
+        "label": "伊吾县",
+        "value": "650522"
+      }
+    ],
+    [{
+        "label": "昌吉市",
+        "value": "652301"
+      },
+      {
+        "label": "阜康市",
+        "value": "652302"
+      },
+      {
+        "label": "呼图壁县",
+        "value": "652323"
+      },
+      {
+        "label": "玛纳斯县",
+        "value": "652324"
+      },
+      {
+        "label": "奇台县",
+        "value": "652325"
+      },
+      {
+        "label": "吉木萨尔县",
+        "value": "652327"
+      },
+      {
+        "label": "木垒哈萨克自治县",
+        "value": "652328"
+      }
+    ],
+    [{
+        "label": "博乐市",
+        "value": "652701"
+      },
+      {
+        "label": "阿拉山口市",
+        "value": "652702"
+      },
+      {
+        "label": "精河县",
+        "value": "652722"
+      },
+      {
+        "label": "温泉县",
+        "value": "652723"
+      }
+    ],
+    [{
+        "label": "库尔勒市",
+        "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": "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": "653001"
+      },
+      {
+        "label": "阿克陶县",
+        "value": "653022"
+      },
+      {
+        "label": "阿合奇县",
+        "value": "653023"
+      },
+      {
+        "label": "乌恰县",
+        "value": "653024"
+      }
+    ],
+    [{
+        "label": "喀什市",
+        "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": "653201"
+      },
+      {
+        "label": "和田县",
+        "value": "653221"
+      },
+      {
+        "label": "墨玉县",
+        "value": "653222"
+      },
+      {
+        "label": "皮山县",
+        "value": "653223"
+      },
+      {
+        "label": "洛浦县",
+        "value": "653224"
+      },
+      {
+        "label": "策勒县",
+        "value": "653225"
+      },
+      {
+        "label": "于田县",
+        "value": "653226"
+      },
+      {
+        "label": "民丰县",
+        "value": "653227"
+      }
+    ],
+    [{
+        "label": "伊宁市",
+        "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": "654201"
+      },
+      {
+        "label": "乌苏市",
+        "value": "654202"
+      },
+      {
+        "label": "额敏县",
+        "value": "654221"
+      },
+      {
+        "label": "沙湾县",
+        "value": "654223"
+      },
+      {
+        "label": "托里县",
+        "value": "654224"
+      },
+      {
+        "label": "裕民县",
+        "value": "654225"
+      },
+      {
+        "label": "和布克赛尔蒙古自治县",
+        "value": "654226"
+      }
+    ],
+    [{
+        "label": "阿勒泰市",
+        "value": "654301"
+      },
+      {
+        "label": "布尔津县",
+        "value": "654321"
+      },
+      {
+        "label": "富蕴县",
+        "value": "654322"
+      },
+      {
+        "label": "福海县",
+        "value": "654323"
+      },
+      {
+        "label": "哈巴河县",
+        "value": "654324"
+      },
+      {
+        "label": "青河县",
+        "value": "654325"
+      },
+      {
+        "label": "吉木乃县",
+        "value": "654326"
+      }
+    ],
+    [{
+        "label": "石河子市",
+        "value": "659001"
+      },
+      {
+        "label": "阿拉尔市",
+        "value": "659002"
+      },
+      {
+        "label": "图木舒克市",
+        "value": "659003"
+      },
+      {
+        "label": "五家渠市",
+        "value": "659004"
+      },
+      {
+        "label": "铁门关市",
+        "value": "659006"
+      }
+    ]
+  ],
+  [
+    [{
+      "label": "台北",
+      "value": "660101"
+    }],
+    [{
+      "label": "高雄",
+      "value": "660201"
+    }],
+    [{
+      "label": "基隆",
+      "value": "660301"
+    }],
+    [{
+      "label": "台中",
+      "value": "660401"
+    }],
+    [{
+      "label": "台南",
+      "value": "660501"
+    }],
+    [{
+      "label": "新竹",
+      "value": "660601"
+    }],
+    [{
+      "label": "嘉义",
+      "value": "660701"
+    }],
+    [{
+      "label": "宜兰",
+      "value": "660801"
+    }],
+    [{
+      "label": "桃园",
+      "value": "660901"
+    }],
+    [{
+      "label": "苗栗",
+      "value": "661001"
+    }],
+    [{
+      "label": "彰化",
+      "value": "661101"
+    }],
+    [{
+      "label": "南投",
+      "value": "661201"
+    }],
+    [{
+      "label": "云林",
+      "value": "661301"
+    }],
+    [{
+      "label": "屏东",
+      "value": "661401"
+    }],
+    [{
+      "label": "台东",
+      "value": "661501"
+    }],
+    [{
+      "label": "花莲",
+      "value": "661601"
+    }],
+    [{
+      "label": "澎湖",
+      "value": "661701"
+    }]
+  ],
+  [
+    [{
+      "label": "香港岛",
+      "value": "670101"
+    }],
+    [{
+      "label": "九龙",
+      "value": "670201"
+    }],
+    [{
+      "label": "新界",
+      "value": "670301"
+    }]
+  ],
+  [
+    [{
+      "label": "澳门半岛",
+      "value": "680101"
+    }],
+    [{
+      "label": "氹仔岛",
+      "value": "680201"
+    }],
+    [{
+      "label": "路环岛",
+      "value": "680301"
+    }],
+    [{
+      "label": "路氹城",
+      "value": "680401"
+    }]
+  ]
+]
+export default areaData;
diff --git a/components/mpvue-citypicker/city-data/city.js b/components/mpvue-citypicker/city-data/city.js
new file mode 100644
index 0000000..8c1dc26
--- /dev/null
+++ b/components/mpvue-citypicker/city-data/city.js
@@ -0,0 +1,1503 @@
+/* eslint-disable */
+var cityData = [
+  [{
+    "label": "市辖区",
+    "value": "1101"
+  }],
+  [{
+    "label": "市辖区",
+    "value": "1201"
+  }],
+  [{
+      "label": "石家庄市",
+      "value": "1301"
+    },
+    {
+      "label": "唐山市",
+      "value": "1302"
+    },
+    {
+      "label": "秦皇岛市",
+      "value": "1303"
+    },
+    {
+      "label": "邯郸市",
+      "value": "1304"
+    },
+    {
+      "label": "邢台市",
+      "value": "1305"
+    },
+    {
+      "label": "保定市",
+      "value": "1306"
+    },
+    {
+      "label": "张家口市",
+      "value": "1307"
+    },
+    {
+      "label": "承德市",
+      "value": "1308"
+    },
+    {
+      "label": "沧州市",
+      "value": "1309"
+    },
+    {
+      "label": "廊坊市",
+      "value": "1310"
+    },
+    {
+      "label": "衡水市",
+      "value": "1311"
+    }
+  ],
+  [{
+      "label": "太原市",
+      "value": "1401"
+    },
+    {
+      "label": "大同市",
+      "value": "1402"
+    },
+    {
+      "label": "阳泉市",
+      "value": "1403"
+    },
+    {
+      "label": "长治市",
+      "value": "1404"
+    },
+    {
+      "label": "晋城市",
+      "value": "1405"
+    },
+    {
+      "label": "朔州市",
+      "value": "1406"
+    },
+    {
+      "label": "晋中市",
+      "value": "1407"
+    },
+    {
+      "label": "运城市",
+      "value": "1408"
+    },
+    {
+      "label": "忻州市",
+      "value": "1409"
+    },
+    {
+      "label": "临汾市",
+      "value": "1410"
+    },
+    {
+      "label": "吕梁市",
+      "value": "1411"
+    }
+  ],
+  [{
+      "label": "呼和浩特市",
+      "value": "1501"
+    },
+    {
+      "label": "包头市",
+      "value": "1502"
+    },
+    {
+      "label": "乌海市",
+      "value": "1503"
+    },
+    {
+      "label": "赤峰市",
+      "value": "1504"
+    },
+    {
+      "label": "通辽市",
+      "value": "1505"
+    },
+    {
+      "label": "鄂尔多斯市",
+      "value": "1506"
+    },
+    {
+      "label": "呼伦贝尔市",
+      "value": "1507"
+    },
+    {
+      "label": "巴彦淖尔市",
+      "value": "1508"
+    },
+    {
+      "label": "乌兰察布市",
+      "value": "1509"
+    },
+    {
+      "label": "兴安盟",
+      "value": "1522"
+    },
+    {
+      "label": "锡林郭勒盟",
+      "value": "1525"
+    },
+    {
+      "label": "阿拉善盟",
+      "value": "1529"
+    }
+  ],
+  [{
+      "label": "沈阳市",
+      "value": "2101"
+    },
+    {
+      "label": "大连市",
+      "value": "2102"
+    },
+    {
+      "label": "鞍山市",
+      "value": "2103"
+    },
+    {
+      "label": "抚顺市",
+      "value": "2104"
+    },
+    {
+      "label": "本溪市",
+      "value": "2105"
+    },
+    {
+      "label": "丹东市",
+      "value": "2106"
+    },
+    {
+      "label": "锦州市",
+      "value": "2107"
+    },
+    {
+      "label": "营口市",
+      "value": "2108"
+    },
+    {
+      "label": "阜新市",
+      "value": "2109"
+    },
+    {
+      "label": "辽阳市",
+      "value": "2110"
+    },
+    {
+      "label": "盘锦市",
+      "value": "2111"
+    },
+    {
+      "label": "铁岭市",
+      "value": "2112"
+    },
+    {
+      "label": "朝阳市",
+      "value": "2113"
+    },
+    {
+      "label": "葫芦岛市",
+      "value": "2114"
+    }
+  ],
+  [{
+      "label": "长春市",
+      "value": "2201"
+    },
+    {
+      "label": "吉林市",
+      "value": "2202"
+    },
+    {
+      "label": "四平市",
+      "value": "2203"
+    },
+    {
+      "label": "辽源市",
+      "value": "2204"
+    },
+    {
+      "label": "通化市",
+      "value": "2205"
+    },
+    {
+      "label": "白山市",
+      "value": "2206"
+    },
+    {
+      "label": "松原市",
+      "value": "2207"
+    },
+    {
+      "label": "白城市",
+      "value": "2208"
+    },
+    {
+      "label": "延边朝鲜族自治州",
+      "value": "2224"
+    }
+  ],
+  [{
+      "label": "哈尔滨市",
+      "value": "2301"
+    },
+    {
+      "label": "齐齐哈尔市",
+      "value": "2302"
+    },
+    {
+      "label": "鸡西市",
+      "value": "2303"
+    },
+    {
+      "label": "鹤岗市",
+      "value": "2304"
+    },
+    {
+      "label": "双鸭山市",
+      "value": "2305"
+    },
+    {
+      "label": "大庆市",
+      "value": "2306"
+    },
+    {
+      "label": "伊春市",
+      "value": "2307"
+    },
+    {
+      "label": "佳木斯市",
+      "value": "2308"
+    },
+    {
+      "label": "七台河市",
+      "value": "2309"
+    },
+    {
+      "label": "牡丹江市",
+      "value": "2310"
+    },
+    {
+      "label": "黑河市",
+      "value": "2311"
+    },
+    {
+      "label": "绥化市",
+      "value": "2312"
+    },
+    {
+      "label": "大兴安岭地区",
+      "value": "2327"
+    }
+  ],
+  [{
+    "label": "市辖区",
+    "value": "3101"
+  }],
+  [{
+      "label": "南京市",
+      "value": "3201"
+    },
+    {
+      "label": "无锡市",
+      "value": "3202"
+    },
+    {
+      "label": "徐州市",
+      "value": "3203"
+    },
+    {
+      "label": "常州市",
+      "value": "3204"
+    },
+    {
+      "label": "苏州市",
+      "value": "3205"
+    },
+    {
+      "label": "南通市",
+      "value": "3206"
+    },
+    {
+      "label": "连云港市",
+      "value": "3207"
+    },
+    {
+      "label": "淮安市",
+      "value": "3208"
+    },
+    {
+      "label": "盐城市",
+      "value": "3209"
+    },
+    {
+      "label": "扬州市",
+      "value": "3210"
+    },
+    {
+      "label": "镇江市",
+      "value": "3211"
+    },
+    {
+      "label": "泰州市",
+      "value": "3212"
+    },
+    {
+      "label": "宿迁市",
+      "value": "3213"
+    }
+  ],
+  [{
+      "label": "杭州市",
+      "value": "3301"
+    },
+    {
+      "label": "宁波市",
+      "value": "3302"
+    },
+    {
+      "label": "温州市",
+      "value": "3303"
+    },
+    {
+      "label": "嘉兴市",
+      "value": "3304"
+    },
+    {
+      "label": "湖州市",
+      "value": "3305"
+    },
+    {
+      "label": "绍兴市",
+      "value": "3306"
+    },
+    {
+      "label": "金华市",
+      "value": "3307"
+    },
+    {
+      "label": "衢州市",
+      "value": "3308"
+    },
+    {
+      "label": "舟山市",
+      "value": "3309"
+    },
+    {
+      "label": "台州市",
+      "value": "3310"
+    },
+    {
+      "label": "丽水市",
+      "value": "3311"
+    }
+  ],
+  [{
+      "label": "合肥市",
+      "value": "3401"
+    },
+    {
+      "label": "芜湖市",
+      "value": "3402"
+    },
+    {
+      "label": "蚌埠市",
+      "value": "3403"
+    },
+    {
+      "label": "淮南市",
+      "value": "3404"
+    },
+    {
+      "label": "马鞍山市",
+      "value": "3405"
+    },
+    {
+      "label": "淮北市",
+      "value": "3406"
+    },
+    {
+      "label": "铜陵市",
+      "value": "3407"
+    },
+    {
+      "label": "安庆市",
+      "value": "3408"
+    },
+    {
+      "label": "黄山市",
+      "value": "3410"
+    },
+    {
+      "label": "滁州市",
+      "value": "3411"
+    },
+    {
+      "label": "阜阳市",
+      "value": "3412"
+    },
+    {
+      "label": "宿州市",
+      "value": "3413"
+    },
+    {
+      "label": "六安市",
+      "value": "3415"
+    },
+    {
+      "label": "亳州市",
+      "value": "3416"
+    },
+    {
+      "label": "池州市",
+      "value": "3417"
+    },
+    {
+      "label": "宣城市",
+      "value": "3418"
+    }
+  ],
+  [{
+      "label": "福州市",
+      "value": "3501"
+    },
+    {
+      "label": "厦门市",
+      "value": "3502"
+    },
+    {
+      "label": "莆田市",
+      "value": "3503"
+    },
+    {
+      "label": "三明市",
+      "value": "3504"
+    },
+    {
+      "label": "泉州市",
+      "value": "3505"
+    },
+    {
+      "label": "漳州市",
+      "value": "3506"
+    },
+    {
+      "label": "南平市",
+      "value": "3507"
+    },
+    {
+      "label": "龙岩市",
+      "value": "3508"
+    },
+    {
+      "label": "宁德市",
+      "value": "3509"
+    }
+  ],
+  [{
+      "label": "南昌市",
+      "value": "3601"
+    },
+    {
+      "label": "景德镇市",
+      "value": "3602"
+    },
+    {
+      "label": "萍乡市",
+      "value": "3603"
+    },
+    {
+      "label": "九江市",
+      "value": "3604"
+    },
+    {
+      "label": "新余市",
+      "value": "3605"
+    },
+    {
+      "label": "鹰潭市",
+      "value": "3606"
+    },
+    {
+      "label": "赣州市",
+      "value": "3607"
+    },
+    {
+      "label": "吉安市",
+      "value": "3608"
+    },
+    {
+      "label": "宜春市",
+      "value": "3609"
+    },
+    {
+      "label": "抚州市",
+      "value": "3610"
+    },
+    {
+      "label": "上饶市",
+      "value": "3611"
+    }
+  ],
+  [{
+      "label": "济南市",
+      "value": "3701"
+    },
+    {
+      "label": "青岛市",
+      "value": "3702"
+    },
+    {
+      "label": "淄博市",
+      "value": "3703"
+    },
+    {
+      "label": "枣庄市",
+      "value": "3704"
+    },
+    {
+      "label": "东营市",
+      "value": "3705"
+    },
+    {
+      "label": "烟台市",
+      "value": "3706"
+    },
+    {
+      "label": "潍坊市",
+      "value": "3707"
+    },
+    {
+      "label": "济宁市",
+      "value": "3708"
+    },
+    {
+      "label": "泰安市",
+      "value": "3709"
+    },
+    {
+      "label": "威海市",
+      "value": "3710"
+    },
+    {
+      "label": "日照市",
+      "value": "3711"
+    },
+    {
+      "label": "莱芜市",
+      "value": "3712"
+    },
+    {
+      "label": "临沂市",
+      "value": "3713"
+    },
+    {
+      "label": "德州市",
+      "value": "3714"
+    },
+    {
+      "label": "聊城市",
+      "value": "3715"
+    },
+    {
+      "label": "滨州市",
+      "value": "3716"
+    },
+    {
+      "label": "菏泽市",
+      "value": "3717"
+    }
+  ],
+  [{
+      "label": "郑州市",
+      "value": "4101"
+    },
+    {
+      "label": "开封市",
+      "value": "4102"
+    },
+    {
+      "label": "洛阳市",
+      "value": "4103"
+    },
+    {
+      "label": "平顶山市",
+      "value": "4104"
+    },
+    {
+      "label": "安阳市",
+      "value": "4105"
+    },
+    {
+      "label": "鹤壁市",
+      "value": "4106"
+    },
+    {
+      "label": "新乡市",
+      "value": "4107"
+    },
+    {
+      "label": "焦作市",
+      "value": "4108"
+    },
+    {
+      "label": "濮阳市",
+      "value": "4109"
+    },
+    {
+      "label": "许昌市",
+      "value": "4110"
+    },
+    {
+      "label": "漯河市",
+      "value": "4111"
+    },
+    {
+      "label": "三门峡市",
+      "value": "4112"
+    },
+    {
+      "label": "南阳市",
+      "value": "4113"
+    },
+    {
+      "label": "商丘市",
+      "value": "4114"
+    },
+    {
+      "label": "信阳市",
+      "value": "4115"
+    },
+    {
+      "label": "周口市",
+      "value": "4116"
+    },
+    {
+      "label": "驻马店市",
+      "value": "4117"
+    },
+    {
+      "label": "省直辖县级行政区划",
+      "value": "4190"
+    }
+  ],
+  [{
+      "label": "武汉市",
+      "value": "4201"
+    },
+    {
+      "label": "黄石市",
+      "value": "4202"
+    },
+    {
+      "label": "十堰市",
+      "value": "4203"
+    },
+    {
+      "label": "宜昌市",
+      "value": "4205"
+    },
+    {
+      "label": "襄阳市",
+      "value": "4206"
+    },
+    {
+      "label": "鄂州市",
+      "value": "4207"
+    },
+    {
+      "label": "荆门市",
+      "value": "4208"
+    },
+    {
+      "label": "孝感市",
+      "value": "4209"
+    },
+    {
+      "label": "荆州市",
+      "value": "4210"
+    },
+    {
+      "label": "黄冈市",
+      "value": "4211"
+    },
+    {
+      "label": "咸宁市",
+      "value": "4212"
+    },
+    {
+      "label": "随州市",
+      "value": "4213"
+    },
+    {
+      "label": "恩施土家族苗族自治州",
+      "value": "4228"
+    },
+    {
+      "label": "省直辖县级行政区划",
+      "value": "4290"
+    }
+  ],
+  [{
+      "label": "长沙市",
+      "value": "4301"
+    },
+    {
+      "label": "株洲市",
+      "value": "4302"
+    },
+    {
+      "label": "湘潭市",
+      "value": "4303"
+    },
+    {
+      "label": "衡阳市",
+      "value": "4304"
+    },
+    {
+      "label": "邵阳市",
+      "value": "4305"
+    },
+    {
+      "label": "岳阳市",
+      "value": "4306"
+    },
+    {
+      "label": "常德市",
+      "value": "4307"
+    },
+    {
+      "label": "张家界市",
+      "value": "4308"
+    },
+    {
+      "label": "益阳市",
+      "value": "4309"
+    },
+    {
+      "label": "郴州市",
+      "value": "4310"
+    },
+    {
+      "label": "永州市",
+      "value": "4311"
+    },
+    {
+      "label": "怀化市",
+      "value": "4312"
+    },
+    {
+      "label": "娄底市",
+      "value": "4313"
+    },
+    {
+      "label": "湘西土家族苗族自治州",
+      "value": "4331"
+    }
+  ],
+  [{
+      "label": "广州市",
+      "value": "4401"
+    },
+    {
+      "label": "韶关市",
+      "value": "4402"
+    },
+    {
+      "label": "深圳市",
+      "value": "4403"
+    },
+    {
+      "label": "珠海市",
+      "value": "4404"
+    },
+    {
+      "label": "汕头市",
+      "value": "4405"
+    },
+    {
+      "label": "佛山市",
+      "value": "4406"
+    },
+    {
+      "label": "江门市",
+      "value": "4407"
+    },
+    {
+      "label": "湛江市",
+      "value": "4408"
+    },
+    {
+      "label": "茂名市",
+      "value": "4409"
+    },
+    {
+      "label": "肇庆市",
+      "value": "4412"
+    },
+    {
+      "label": "惠州市",
+      "value": "4413"
+    },
+    {
+      "label": "梅州市",
+      "value": "4414"
+    },
+    {
+      "label": "汕尾市",
+      "value": "4415"
+    },
+    {
+      "label": "河源市",
+      "value": "4416"
+    },
+    {
+      "label": "阳江市",
+      "value": "4417"
+    },
+    {
+      "label": "清远市",
+      "value": "4418"
+    },
+    {
+      "label": "东莞市",
+      "value": "4419"
+    },
+    {
+      "label": "中山市",
+      "value": "4420"
+    },
+    {
+      "label": "潮州市",
+      "value": "4451"
+    },
+    {
+      "label": "揭阳市",
+      "value": "4452"
+    },
+    {
+      "label": "云浮市",
+      "value": "4453"
+    }
+  ],
+  [{
+      "label": "南宁市",
+      "value": "4501"
+    },
+    {
+      "label": "柳州市",
+      "value": "4502"
+    },
+    {
+      "label": "桂林市",
+      "value": "4503"
+    },
+    {
+      "label": "梧州市",
+      "value": "4504"
+    },
+    {
+      "label": "北海市",
+      "value": "4505"
+    },
+    {
+      "label": "防城港市",
+      "value": "4506"
+    },
+    {
+      "label": "钦州市",
+      "value": "4507"
+    },
+    {
+      "label": "贵港市",
+      "value": "4508"
+    },
+    {
+      "label": "玉林市",
+      "value": "4509"
+    },
+    {
+      "label": "百色市",
+      "value": "4510"
+    },
+    {
+      "label": "贺州市",
+      "value": "4511"
+    },
+    {
+      "label": "河池市",
+      "value": "4512"
+    },
+    {
+      "label": "来宾市",
+      "value": "4513"
+    },
+    {
+      "label": "崇左市",
+      "value": "4514"
+    }
+  ],
+  [{
+      "label": "海口市",
+      "value": "4601"
+    },
+    {
+      "label": "三亚市",
+      "value": "4602"
+    },
+    {
+      "label": "三沙市",
+      "value": "4603"
+    },
+    {
+      "label": "儋州市",
+      "value": "4604"
+    },
+    {
+      "label": "省直辖县级行政区划",
+      "value": "4690"
+    }
+  ],
+  [{
+      "label": "市辖区",
+      "value": "5001"
+    },
+    {
+      "label": "县",
+      "value": "5002"
+    }
+  ],
+  [{
+      "label": "成都市",
+      "value": "5101"
+    },
+    {
+      "label": "自贡市",
+      "value": "5103"
+    },
+    {
+      "label": "攀枝花市",
+      "value": "5104"
+    },
+    {
+      "label": "泸州市",
+      "value": "5105"
+    },
+    {
+      "label": "德阳市",
+      "value": "5106"
+    },
+    {
+      "label": "绵阳市",
+      "value": "5107"
+    },
+    {
+      "label": "广元市",
+      "value": "5108"
+    },
+    {
+      "label": "遂宁市",
+      "value": "5109"
+    },
+    {
+      "label": "内江市",
+      "value": "5110"
+    },
+    {
+      "label": "乐山市",
+      "value": "5111"
+    },
+    {
+      "label": "南充市",
+      "value": "5113"
+    },
+    {
+      "label": "眉山市",
+      "value": "5114"
+    },
+    {
+      "label": "宜宾市",
+      "value": "5115"
+    },
+    {
+      "label": "广安市",
+      "value": "5116"
+    },
+    {
+      "label": "达州市",
+      "value": "5117"
+    },
+    {
+      "label": "雅安市",
+      "value": "5118"
+    },
+    {
+      "label": "巴中市",
+      "value": "5119"
+    },
+    {
+      "label": "资阳市",
+      "value": "5120"
+    },
+    {
+      "label": "阿坝藏族羌族自治州",
+      "value": "5132"
+    },
+    {
+      "label": "甘孜藏族自治州",
+      "value": "5133"
+    },
+    {
+      "label": "凉山彝族自治州",
+      "value": "5134"
+    }
+  ],
+  [{
+      "label": "贵阳市",
+      "value": "5201"
+    },
+    {
+      "label": "六盘水市",
+      "value": "5202"
+    },
+    {
+      "label": "遵义市",
+      "value": "5203"
+    },
+    {
+      "label": "安顺市",
+      "value": "5204"
+    },
+    {
+      "label": "毕节市",
+      "value": "5205"
+    },
+    {
+      "label": "铜仁市",
+      "value": "5206"
+    },
+    {
+      "label": "黔西南布依族苗族自治州",
+      "value": "5223"
+    },
+    {
+      "label": "黔东南苗族侗族自治州",
+      "value": "5226"
+    },
+    {
+      "label": "黔南布依族苗族自治州",
+      "value": "5227"
+    }
+  ],
+  [{
+      "label": "昆明市",
+      "value": "5301"
+    },
+    {
+      "label": "曲靖市",
+      "value": "5303"
+    },
+    {
+      "label": "玉溪市",
+      "value": "5304"
+    },
+    {
+      "label": "保山市",
+      "value": "5305"
+    },
+    {
+      "label": "昭通市",
+      "value": "5306"
+    },
+    {
+      "label": "丽江市",
+      "value": "5307"
+    },
+    {
+      "label": "普洱市",
+      "value": "5308"
+    },
+    {
+      "label": "临沧市",
+      "value": "5309"
+    },
+    {
+      "label": "楚雄彝族自治州",
+      "value": "5323"
+    },
+    {
+      "label": "红河哈尼族彝族自治州",
+      "value": "5325"
+    },
+    {
+      "label": "文山壮族苗族自治州",
+      "value": "5326"
+    },
+    {
+      "label": "西双版纳傣族自治州",
+      "value": "5328"
+    },
+    {
+      "label": "大理白族自治州",
+      "value": "5329"
+    },
+    {
+      "label": "德宏傣族景颇族自治州",
+      "value": "5331"
+    },
+    {
+      "label": "怒江傈僳族自治州",
+      "value": "5333"
+    },
+    {
+      "label": "迪庆藏族自治州",
+      "value": "5334"
+    }
+  ],
+  [{
+      "label": "拉萨市",
+      "value": "5401"
+    },
+    {
+      "label": "日喀则市",
+      "value": "5402"
+    },
+    {
+      "label": "昌都市",
+      "value": "5403"
+    },
+    {
+      "label": "林芝市",
+      "value": "5404"
+    },
+    {
+      "label": "山南市",
+      "value": "5405"
+    },
+    {
+      "label": "那曲地区",
+      "value": "5424"
+    },
+    {
+      "label": "阿里地区",
+      "value": "5425"
+    }
+  ],
+  [{
+      "label": "西安市",
+      "value": "6101"
+    },
+    {
+      "label": "铜川市",
+      "value": "6102"
+    },
+    {
+      "label": "宝鸡市",
+      "value": "6103"
+    },
+    {
+      "label": "咸阳市",
+      "value": "6104"
+    },
+    {
+      "label": "渭南市",
+      "value": "6105"
+    },
+    {
+      "label": "延安市",
+      "value": "6106"
+    },
+    {
+      "label": "汉中市",
+      "value": "6107"
+    },
+    {
+      "label": "榆林市",
+      "value": "6108"
+    },
+    {
+      "label": "安康市",
+      "value": "6109"
+    },
+    {
+      "label": "商洛市",
+      "value": "6110"
+    }
+  ],
+  [{
+      "label": "兰州市",
+      "value": "6201"
+    },
+    {
+      "label": "嘉峪关市",
+      "value": "6202"
+    },
+    {
+      "label": "金昌市",
+      "value": "6203"
+    },
+    {
+      "label": "白银市",
+      "value": "6204"
+    },
+    {
+      "label": "天水市",
+      "value": "6205"
+    },
+    {
+      "label": "武威市",
+      "value": "6206"
+    },
+    {
+      "label": "张掖市",
+      "value": "6207"
+    },
+    {
+      "label": "平凉市",
+      "value": "6208"
+    },
+    {
+      "label": "酒泉市",
+      "value": "6209"
+    },
+    {
+      "label": "庆阳市",
+      "value": "6210"
+    },
+    {
+      "label": "定西市",
+      "value": "6211"
+    },
+    {
+      "label": "陇南市",
+      "value": "6212"
+    },
+    {
+      "label": "临夏回族自治州",
+      "value": "6229"
+    },
+    {
+      "label": "甘南藏族自治州",
+      "value": "6230"
+    }
+  ],
+  [{
+      "label": "西宁市",
+      "value": "6301"
+    },
+    {
+      "label": "海东市",
+      "value": "6302"
+    },
+    {
+      "label": "海北藏族自治州",
+      "value": "6322"
+    },
+    {
+      "label": "黄南藏族自治州",
+      "value": "6323"
+    },
+    {
+      "label": "海南藏族自治州",
+      "value": "6325"
+    },
+    {
+      "label": "果洛藏族自治州",
+      "value": "6326"
+    },
+    {
+      "label": "玉树藏族自治州",
+      "value": "6327"
+    },
+    {
+      "label": "海西蒙古族藏族自治州",
+      "value": "6328"
+    }
+  ],
+  [{
+      "label": "银川市",
+      "value": "6401"
+    },
+    {
+      "label": "石嘴山市",
+      "value": "6402"
+    },
+    {
+      "label": "吴忠市",
+      "value": "6403"
+    },
+    {
+      "label": "固原市",
+      "value": "6404"
+    },
+    {
+      "label": "中卫市",
+      "value": "6405"
+    }
+  ],
+  [{
+      "label": "乌鲁木齐市",
+      "value": "6501"
+    },
+    {
+      "label": "克拉玛依市",
+      "value": "6502"
+    },
+    {
+      "label": "吐鲁番市",
+      "value": "6504"
+    },
+    {
+      "label": "哈密市",
+      "value": "6505"
+    },
+    {
+      "label": "昌吉回族自治州",
+      "value": "6523"
+    },
+    {
+      "label": "博尔塔拉蒙古自治州",
+      "value": "6527"
+    },
+    {
+      "label": "巴音郭楞蒙古自治州",
+      "value": "6528"
+    },
+    {
+      "label": "阿克苏地区",
+      "value": "6529"
+    },
+    {
+      "label": "克孜勒苏柯尔克孜自治州",
+      "value": "6530"
+    },
+    {
+      "label": "喀什地区",
+      "value": "6531"
+    },
+    {
+      "label": "和田地区",
+      "value": "6532"
+    },
+    {
+      "label": "伊犁哈萨克自治州",
+      "value": "6540"
+    },
+    {
+      "label": "塔城地区",
+      "value": "6542"
+    },
+    {
+      "label": "阿勒泰地区",
+      "value": "6543"
+    },
+    {
+      "label": "自治区直辖县级行政区划",
+      "value": "6590"
+    }
+  ],
+  [{
+      "label": "台北",
+      "value": "6601"
+    },
+    {
+      "label": "高雄",
+      "value": "6602"
+    },
+    {
+      "label": "基隆",
+      "value": "6603"
+    },
+    {
+      "label": "台中",
+      "value": "6604"
+    },
+    {
+      "label": "台南",
+      "value": "6605"
+    },
+    {
+      "label": "新竹",
+      "value": "6606"
+    },
+    {
+      "label": "嘉义",
+      "value": "6607"
+    },
+    {
+      "label": "宜兰",
+      "value": "6608"
+    },
+    {
+      "label": "桃园",
+      "value": "6609"
+    },
+    {
+      "label": "苗栗",
+      "value": "6610"
+    },
+    {
+      "label": "彰化",
+      "value": "6611"
+    },
+    {
+      "label": "南投",
+      "value": "6612"
+    },
+    {
+      "label": "云林",
+      "value": "6613"
+    },
+    {
+      "label": "屏东",
+      "value": "6614"
+    },
+    {
+      "label": "台东",
+      "value": "6615"
+    },
+    {
+      "label": "花莲",
+      "value": "6616"
+    },
+    {
+      "label": "澎湖",
+      "value": "6617"
+    }
+  ],
+  [{
+      "label": "香港岛",
+      "value": "6701"
+    },
+    {
+      "label": "九龙",
+      "value": "6702"
+    },
+    {
+      "label": "新界",
+      "value": "6703"
+    }
+  ],
+  [{
+      "label": "澳门半岛",
+      "value": "6801"
+    },
+    {
+      "label": "氹仔岛",
+      "value": "6802"
+    },
+    {
+      "label": "路环岛",
+      "value": "6803"
+    },
+    {
+      "label": "路氹城",
+      "value": "6804"
+    }
+  ]
+]
+export default cityData;
diff --git a/components/mpvue-citypicker/city-data/province.js b/components/mpvue-citypicker/city-data/province.js
new file mode 100644
index 0000000..1bd680e
--- /dev/null
+++ b/components/mpvue-citypicker/city-data/province.js
@@ -0,0 +1,139 @@
+/* eslint-disable */
+var provinceData = [{
+    "label": "北京市",
+    "value": "11"
+  },
+  {
+    "label": "天津市",
+    "value": "12"
+  },
+  {
+    "label": "河北省",
+    "value": "13"
+  },
+  {
+    "label": "山西省",
+    "value": "14"
+  },
+  {
+    "label": "内蒙古自治区",
+    "value": "15"
+  },
+  {
+    "label": "辽宁省",
+    "value": "21"
+  },
+  {
+    "label": "吉林省",
+    "value": "22"
+  },
+  {
+    "label": "黑龙江省",
+    "value": "23"
+  },
+  {
+    "label": "上海市",
+    "value": "31"
+  },
+  {
+    "label": "江苏省",
+    "value": "32"
+  },
+  {
+    "label": "浙江省",
+    "value": "33"
+  },
+  {
+    "label": "安徽省",
+    "value": "34"
+  },
+  {
+    "label": "福建省",
+    "value": "35"
+  },
+  {
+    "label": "江西省",
+    "value": "36"
+  },
+  {
+    "label": "山东省",
+    "value": "37"
+  },
+  {
+    "label": "河南省",
+    "value": "41"
+  },
+  {
+    "label": "湖北省",
+    "value": "42"
+  },
+  {
+    "label": "湖南省",
+    "value": "43"
+  },
+  {
+    "label": "广东省",
+    "value": "44"
+  },
+  {
+    "label": "广西壮族自治区",
+    "value": "45"
+  },
+  {
+    "label": "海南省",
+    "value": "46"
+  },
+  {
+    "label": "重庆市",
+    "value": "50"
+  },
+  {
+    "label": "四川省",
+    "value": "51"
+  },
+  {
+    "label": "贵州省",
+    "value": "52"
+  },
+  {
+    "label": "云南省",
+    "value": "53"
+  },
+  {
+    "label": "西藏自治区",
+    "value": "54"
+  },
+  {
+    "label": "陕西省",
+    "value": "61"
+  },
+  {
+    "label": "甘肃省",
+    "value": "62"
+  },
+  {
+    "label": "青海省",
+    "value": "63"
+  },
+  {
+    "label": "宁夏回族自治区",
+    "value": "64"
+  },
+  {
+    "label": "新疆维吾尔自治区",
+    "value": "65"
+  },
+  {
+    "label": "台湾",
+    "value": "66"
+  },
+  {
+    "label": "香港",
+    "value": "67"
+  },
+  {
+    "label": "澳门",
+    "value": "68"
+  }
+]
+export default provinceData;
diff --git a/components/mpvue-citypicker/mpvueCityPicker.vue b/components/mpvue-citypicker/mpvueCityPicker.vue
new file mode 100644
index 0000000..ec02c8b
--- /dev/null
+++ b/components/mpvue-citypicker/mpvueCityPicker.vue
@@ -0,0 +1,230 @@
+<template>
+	<div class="mpvue-picker">
+		<div :class="{'pickerMask':showPicker}" @click="maskClick" catchtouchmove="true"></div>
+		<div class="mpvue-picker-content " :class="{'mpvue-picker-view-show':showPicker}">
+			<div class="mpvue-picker__hd" catchtouchmove="true">
+				<div class="mpvue-picker__action" @click="pickerCancel">取消</div>
+				<div class="mpvue-picker__action" :style="{color:themeColor}" @click="pickerConfirm">确定</div>
+			</div>
+			<picker-view indicator-style="height: 40px;" class="mpvue-picker-view" :value="pickerValue" @change="pickerChange">
+				<block>
+					<picker-view-column>
+						<div class="picker-item" v-for="(item,index) in provinceDataList" :key="index">{{item.label}}</div>
+					</picker-view-column>
+					<picker-view-column>
+						<div class="picker-item" v-for="(item,index) in cityDataList" :key="index">{{item.label}}</div>
+					</picker-view-column>
+					<picker-view-column>
+						<div class="picker-item" v-for="(item,index) in areaDataList" :key="index">{{item.label}}</div>
+					</picker-view-column>
+				</block>
+			</picker-view>
+		</div>
+	</div>
+</template>
+
+<script>
+	import provinceData from './city-data/province.js';
+	import cityData from './city-data/city.js';
+	import areaData from './city-data/area.js';
+	export default {
+		data() {
+			return {
+				pickerValue: [0, 0, 0],
+				provinceDataList: provinceData,
+				cityDataList: cityData[0],
+				areaDataList: areaData[0][0],
+				/* 是否显示控件 */
+				showPicker: false,
+			};
+		},
+		created() {
+			this.init()
+		},
+		props: {
+			/* 默认值 */
+			pickerValueDefault: {
+				type: Array,
+				default () {
+					return [0, 0, 0]
+				}
+			},
+			/* 主题色 */
+			themeColor: String
+		},
+		watch: {
+			pickerValueDefault() {
+				this.init();
+			}
+		},
+		methods: {
+			init() {
+				this.handPickValueDefault(); // 对 pickerValueDefault 做兼容处理
+
+				const pickerValueDefault = this.pickerValueDefault
+
+				this.cityDataList = cityData[pickerValueDefault[0]];
+				this.areaDataList = areaData[pickerValueDefault[0]][pickerValueDefault[1]];
+				this.pickerValue = pickerValueDefault;
+			},
+			show() {
+				setTimeout(() => {
+					this.showPicker = true;
+				}, 0);
+			},
+			maskClick() {
+				this.pickerCancel();
+			},
+			pickerCancel() {
+				this.showPicker = false;
+				this._$emit('onCancel');
+			},
+			pickerConfirm(e) {
+				this.showPicker = false;
+				this._$emit('onConfirm');
+			},
+			showPickerView() {
+				this.showPicker = true;
+			},
+			handPickValueDefault() {
+				const pickerValueDefault = this.pickerValueDefault
+
+				let provinceIndex = pickerValueDefault[0]
+				let cityIndex = pickerValueDefault[1]
+				const areaIndex = pickerValueDefault[2]
+				if (
+					provinceIndex !== 0 ||
+					cityIndex !== 0 ||
+					areaIndex !== 0
+				) {
+					if (provinceIndex > provinceData.length - 1) {
+						this.pickerValueDefault[0] = provinceIndex = provinceData.length - 1;
+					}
+					if (cityIndex > cityData[provinceIndex].length - 1) {
+						this.pickerValueDefault[1] = cityIndex = cityData[provinceIndex].length - 1;
+					}
+					if (areaIndex > areaData[provinceIndex][cityIndex].length - 1) {
+						this.pickerValueDefault[2] = areaData[provinceIndex][cityIndex].length - 1;
+					}
+				}
+			},
+			pickerChange(e) {
+				let changePickerValue = e.mp.detail.value;
+				if (this.pickerValue[0] !== changePickerValue[0]) {
+					// 第一级发生滚动
+					this.cityDataList = cityData[changePickerValue[0]];
+					this.areaDataList = areaData[changePickerValue[0]][0];
+					changePickerValue[1] = 0;
+					changePickerValue[2] = 0;
+				} else if (this.pickerValue[1] !== changePickerValue[1]) {
+					// 第二级滚动
+					this.areaDataList =
+						areaData[changePickerValue[0]][changePickerValue[1]];
+					changePickerValue[2] = 0;
+				}
+				this.pickerValue = changePickerValue;
+				this._$emit('onChange');
+			},
+			_$emit(emitName) {
+				let pickObj = {
+					label: this._getLabel(),
+					value: this.pickerValue,
+					cityCode: this._getCityCode()
+				};
+				this.$emit(emitName, pickObj);
+			},
+			_getLabel() {
+				let pcikerLabel =
+					this.provinceDataList[this.pickerValue[0]].label +
+					'-' +
+					this.cityDataList[this.pickerValue[1]].label +
+					'-' +
+					this.areaDataList[this.pickerValue[2]].label;
+				return pcikerLabel;
+			},
+			_getCityCode() {
+				return this.areaDataList[this.pickerValue[2]].value;
+			}
+		}
+	};
+</script>
+
+<style>
+	.pickerMask {
+		position: fixed;
+		z-index: 1000;
+		top: 0;
+		right: 0;
+		left: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.6);
+	}
+
+	.mpvue-picker-content {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		transition: all 0.3s ease;
+		transform: translateY(100%);
+		z-index: 3000;
+	}
+
+	.mpvue-picker-view-show {
+		transform: translateY(0);
+	}
+
+	.mpvue-picker__hd {
+		display: flex;
+		padding: 9px 15px;
+		background-color: #fff;
+		position: relative;
+		text-align: center;
+		font-size: 17px;
+	}
+
+	.mpvue-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);
+	}
+
+	.mpvue-picker__action {
+		display: block;
+		flex: 1;
+		color: #1aad19;
+	}
+
+	.mpvue-picker__action:first-child {
+		text-align: left;
+		color: #888;
+	}
+
+	.mpvue-picker__action:last-child {
+		text-align: right;
+	}
+
+	.picker-item {
+		text-align: center;
+		line-height: 40px;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		font-size: 16px;
+	}
+
+	.mpvue-picker-view {
+		position: relative;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 238px;
+		background-color: rgba(255, 255, 255, 1);
+	}
+</style>
diff --git a/components/mpvue-echarts/src/echarts.vue b/components/mpvue-echarts/src/echarts.vue
new file mode 100644
index 0000000..e1cbb66
--- /dev/null
+++ b/components/mpvue-echarts/src/echarts.vue
@@ -0,0 +1,123 @@
+<template>
+	<canvas v-if="canvasId" class="ec-canvas" :id="canvasId" :canvasId="canvasId" @touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd" @error="error"></canvas>
+</template>
+
+<script>
+import WxCanvas from './wx-canvas';
+
+export default {
+	props: {
+		canvasId: {
+			type: String,
+			default: 'ec-canvas'
+		},
+		lazyLoad: {
+			type: Boolean,
+			default: false
+		},
+		disableTouch: {
+			type: Boolean,
+			default: false
+		},
+		throttleTouch: {
+			type: Boolean,
+			default: false
+		}
+	},
+	// #ifdef H5
+	mounted() {
+		if (!this.lazyLoad) this.init();
+	},
+	// #endif
+	// #ifndef H5
+	onReady() {
+		if (!this.lazyLoad) this.init();
+	},
+	// #endif
+	methods: {
+		setChart(chart){
+			this.chart = chart
+		},
+		init() {
+			const { canvasId } = this;
+			this.ctx = wx.createCanvasContext(canvasId, this);
+
+			this.canvas = new WxCanvas(this.ctx, canvasId);
+
+			const query = wx.createSelectorQuery().in(this);
+			query
+				.select(`#${canvasId}`)
+				.boundingClientRect(res => {
+					if (!res) {
+						setTimeout(() => this.init(), 50);
+						return;
+					}
+					this.$emit('onInit', {
+						width: res.width,
+						height: res.height
+					});
+				})
+				.exec();
+		},
+		canvasToTempFilePath(opt) {
+			const { canvasId } = this;
+			this.ctx.draw(true, () => {
+				wx.canvasToTempFilePath({
+					canvasId,
+					...opt
+				});
+			});
+		},
+		touchStart(e) {
+			const { disableTouch, chart } = this;
+			if (disableTouch || !chart || !e.mp.touches.length) return;
+			const touch = e.mp.touches[0];
+			chart._zr.handler.dispatch('mousedown', {
+				zrX: touch.x,
+				zrY: touch.y
+			});
+			chart._zr.handler.dispatch('mousemove', {
+				zrX: touch.x,
+				zrY: touch.y
+			});
+		},
+		touchMove(e) {
+			const { disableTouch, throttleTouch, chart, lastMoveTime } = this;
+			if (disableTouch || !chart || !e.mp.touches.length) return;
+
+			if (throttleTouch) {
+				const currMoveTime = Date.now();
+				if (currMoveTime - lastMoveTime < 240) return;
+				this.lastMoveTime = currMoveTime;
+			}
+
+			const touch = e.mp.touches[0];
+			chart._zr.handler.dispatch('mousemove', {
+				zrX: touch.x,
+				zrY: touch.y
+			});
+		},
+		touchEnd(e) {
+			const { disableTouch, chart } = this;
+			if (disableTouch || !chart) return;
+			const touch = e.mp.changedTouches ? e.mp.changedTouches[0] : {};
+			chart._zr.handler.dispatch('mouseup', {
+				zrX: touch.x,
+				zrY: touch.y
+			});
+			chart._zr.handler.dispatch('click', {
+				zrX: touch.x,
+				zrY: touch.y
+			});
+		}
+	}
+};
+</script>
+
+<style scoped>
+.ec-canvas {
+	width: 100%;
+	height: 100%;
+	flex: 1;
+}
+</style>
diff --git a/components/mpvue-echarts/src/wx-canvas.js b/components/mpvue-echarts/src/wx-canvas.js
new file mode 100644
index 0000000..ef58893
--- /dev/null
+++ b/components/mpvue-echarts/src/wx-canvas.js
@@ -0,0 +1,73 @@
+export default class WxCanvas {
+  constructor(ctx, canvasId) {
+    this.ctx = ctx;
+    this.canvasId = canvasId;
+    this.chart = null;
+
+    WxCanvas.initStyle(ctx);
+    this.initEvent();
+  }
+
+  getContext(contextType) {
+    return contextType === '2d' ? this.ctx : null;
+  }
+
+  setChart(chart) {
+    this.chart = chart;
+  }
+
+  attachEvent() {
+    // noop
+  }
+
+  detachEvent() {
+    // noop
+  }
+
+  static initStyle(ctx) {
+    const styles = ['fillStyle', 'strokeStyle', 'globalAlpha',
+      'textAlign', 'textBaseAlign', 'shadow', 'lineWidth',
+      'lineCap', 'lineJoin', 'lineDash', 'miterLimit', 'fontSize'];
+
+    styles.forEach((style) => {
+      Object.defineProperty(ctx, style, {
+        set: (value) => {
+          if ((style !== 'fillStyle' && style !== 'strokeStyle')
+            || (value !== 'none' && value !== null)
+          ) {
+            ctx[`set${style.charAt(0).toUpperCase()}${style.slice(1)}`](value);
+          }
+        },
+      });
+    });
+
+    ctx.createRadialGradient = () => ctx.createCircularGradient(arguments);
+  }
+
+  initEvent() {
+    this.event = {};
+    const eventNames = [{
+      wxName: 'touchStart',
+      ecName: 'mousedown',
+    }, {
+      wxName: 'touchMove',
+      ecName: 'mousemove',
+    }, {
+      wxName: 'touchEnd',
+      ecName: 'mouseup',
+    }, {
+      wxName: 'touchEnd',
+      ecName: 'click',
+    }];
+
+    eventNames.forEach((name) => {
+      this.event[name.wxName] = (e) => {
+        const touch = e.mp.touches[0];
+        this.chart._zr.handler.dispatch(name.ecName, {
+          zrX: name.wxName === 'tap' ? touch.clientX : touch.x,
+          zrY: name.wxName === 'tap' ? touch.clientY : touch.y,
+        });
+      };
+    });
+  }
+}
diff --git a/components/mpvue-picker/mpvuePicker.vue b/components/mpvue-picker/mpvuePicker.vue
new file mode 100644
index 0000000..93397ee
--- /dev/null
+++ b/components/mpvue-picker/mpvuePicker.vue
@@ -0,0 +1,484 @@
+<template>
+	<view class="mpvue-picker">
+		<view :class="{'pickerMask':showPicker}" @click="maskClick" catchtouchmove="true"></view>
+		<view class="mpvue-picker-content " :class="{'mpvue-picker-view-show':showPicker}">
+			<view class="mpvue-picker__hd" catchtouchmove="true">
+				<view class="mpvue-picker__action" @click="pickerCancel">取消</view>
+				<view class="mpvue-picker__action" :style="{color:themeColor}" @click="pickerConfirm">确定</view>
+			</view>
+			<!-- 单列 -->
+			<picker-view indicator-style="height: 40px;" class="mpvue-picker-view" :value="pickerValue"
+				@change="pickerChange" v-if="mode==='selector' && pickerValueSingleArray.length > 0">
+				<picker-view-column>
+					<view class="picker-item" v-for="(item,index) in pickerValueSingleArray" :key="index">{{item.label}}
+					</view>
+				</picker-view-column>
+			</picker-view>
+			<!-- 时间选择器 -->
+			<picker-view indicator-style="height: 40px;" class="mpvue-picker-view" :value="pickerValue"
+				@change="pickerChange" v-if="mode==='timeSelector'">
+				<picker-view-column>
+					<view class="picker-item" v-for="(item,index) in pickerValueHour" :key="index">{{item.label}}</view>
+				</picker-view-column>
+				<picker-view-column>
+					<view class="picker-item" v-for="(item,index) in pickerValueMinute" :key="index">{{item.label}}
+					</view>
+				</picker-view-column>
+			</picker-view>
+			<!-- 多列选择 -->
+			<picker-view indicator-style="height: 40px;" class="mpvue-picker-view" :value="pickerValue"
+				@change="pickerChange" v-if="mode==='multiSelector'">
+				<!-- #ifdef VUE3 -->
+				<template v-for="(n,index) in pickerValueMulArray.length" :key="index">
+					<picker-view-column>
+						<view class="picker-item" v-for="(item,index1) in pickerValueMulArray[n]" :key="index1">
+							{{item.label}}
+						</view>
+					</picker-view-column>
+				</template>
+				<!-- #endif -->
+				<!-- #ifndef VUE3 -->
+				<block v-for="(n,index) in pickerValueMulArray.length" :key="index">
+					<picker-view-column>
+						<view class="picker-item" v-for="(item,index1) in pickerValueMulArray[n]" :key="index1">
+							{{item.label}}
+						</view>
+					</picker-view-column>
+				</block>
+				<!-- #endif -->
+			</picker-view>
+			<!-- 二级联动 -->
+			<picker-view indicator-style="height: 40px;" class="mpvue-picker-view" :value="pickerValue"
+				@change="pickerChangeMul" v-if="mode==='multiLinkageSelector' && deepLength===2">
+				<picker-view-column>
+					<view class="picker-item" v-for="(item,index) in pickerValueMulTwoOne" :key="index">{{item.label}}
+					</view>
+				</picker-view-column>
+				<picker-view-column>
+					<view class="picker-item" v-for="(item,index) in pickerValueMulTwoTwo" :key="index">{{item.label}}
+					</view>
+				</picker-view-column>
+			</picker-view>
+			<!-- 三级联动 -->
+			<picker-view indicator-style="height: 40px;" class="mpvue-picker-view" :value="pickerValue"
+				@change="pickerChangeMul" v-if="mode==='multiLinkageSelector' && deepLength===3">
+				<picker-view-column>
+					<view class="picker-item" v-for="(item,index) in pickerValueMulThreeOne" :key="index">{{item.label}}
+					</view>
+				</picker-view-column>
+				<picker-view-column>
+					<view class="picker-item" v-for="(item,index) in pickerValueMulThreeTwo" :key="index">{{item.label}}
+					</view>
+				</picker-view-column>
+				<picker-view-column>
+					<view class="picker-item" v-for="(item,index) in pickerValueMulThreeThree" :key="index">
+						{{item.label}}
+					</view>
+				</picker-view-column>
+			</picker-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pickerChangeValue: [],
+				pickerValue: [],
+				pickerValueArrayChange: true,
+				modeChange: false,
+				pickerValueSingleArray: [],
+				pickerValueHour: [],
+				pickerValueMinute: [],
+				pickerValueMulArray: [],
+				pickerValueMulTwoOne: [],
+				pickerValueMulTwoTwo: [],
+				pickerValueMulThreeOne: [],
+				pickerValueMulThreeTwo: [],
+				pickerValueMulThreeThree: [],
+				/* 是否显示控件 */
+				showPicker: false,
+			};
+		},
+		props: {
+			/* mode */
+			mode: {
+				type: String,
+				default: 'selector'
+			},
+			/* picker 数值 */
+			pickerValueArray: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			/* 默认值 */
+			pickerValueDefault: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			/* 几级联动 */
+			deepLength: {
+				type: Number,
+				default: 2
+			},
+			/* 主题色 */
+			themeColor: String
+		},
+		watch: {
+			pickerValueArray(oldVal, newVal) {
+				this.pickerValueArrayChange = true;
+			},
+			mode(oldVal, newVal) {
+				this.modeChange = true;
+			},
+			pickerValueArray(val) {
+				this.initPicker(val);
+			}
+		},
+		methods: {
+			initPicker(valueArray) {
+				let pickerValueArray = valueArray;
+				this.pickerValue = this.pickerValueDefault;
+				// 初始化多级联动
+				if (this.mode === 'selector') {
+					this.pickerValueSingleArray = valueArray;
+				} else if (this.mode === 'timeSelector') {
+					this.modeChange = false;
+					let hourArray = [];
+					let minuteArray = [];
+					for (let i = 0; i < 24; i++) {
+						hourArray.push({
+							value: i,
+							label: i > 9 ? `${i} 时` : `0${i} 时`
+						});
+					}
+					for (let i = 0; i < 60; i++) {
+						minuteArray.push({
+							value: i,
+							label: i > 9 ? `${i} 分` : `0${i} 分`
+						});
+					}
+					this.pickerValueHour = hourArray;
+					this.pickerValueMinute = minuteArray;
+				} else if (this.mode === 'multiSelector') {
+					this.pickerValueMulArray = valueArray;
+				} else if (this.mode === 'multiLinkageSelector' && this.deepLength === 2) {
+					// 两级联动
+					let pickerValueMulTwoOne = [];
+					let pickerValueMulTwoTwo = [];
+					// 第一列
+					for (let i = 0, length = pickerValueArray.length; i < length; i++) {
+						pickerValueMulTwoOne.push(pickerValueArray[i]);
+					}
+					// 渲染第二列
+					// 如果有设定的默认值
+					if (this.pickerValueDefault.length === 2) {
+						let num = this.pickerValueDefault[0];
+						for (
+							let i = 0, length = pickerValueArray[num].children.length; i < length; i++
+						) {
+							pickerValueMulTwoTwo.push(pickerValueArray[num].children[i]);
+						}
+					} else {
+						for (
+							let i = 0, length = pickerValueArray[0].children.length; i < length; i++
+						) {
+							pickerValueMulTwoTwo.push(pickerValueArray[0].children[i]);
+						}
+					}
+					this.pickerValueMulTwoOne = pickerValueMulTwoOne;
+					this.pickerValueMulTwoTwo = pickerValueMulTwoTwo;
+				} else if (
+					this.mode === 'multiLinkageSelector' &&
+					this.deepLength === 3
+				) {
+					let pickerValueMulThreeOne = [];
+					let pickerValueMulThreeTwo = [];
+					let pickerValueMulThreeThree = [];
+					// 第一列
+					for (let i = 0, length = pickerValueArray.length; i < length; i++) {
+						pickerValueMulThreeOne.push(pickerValueArray[i]);
+					}
+					// 渲染第二列
+					this.pickerValueDefault =
+						this.pickerValueDefault.length === 3 ?
+						this.pickerValueDefault : [0, 0, 0];
+					if (this.pickerValueDefault.length === 3) {
+						let num = this.pickerValueDefault[0];
+						for (
+							let i = 0, length = pickerValueArray[num].children.length; i < length; i++
+						) {
+							pickerValueMulThreeTwo.push(pickerValueArray[num].children[i]);
+						}
+						// 第三列
+						let numSecond = this.pickerValueDefault[1];
+						for (let i = 0, length = pickerValueArray[num].children[numSecond].children.length; i <
+							length; i++) {
+							pickerValueMulThreeThree.push(
+								pickerValueArray[num].children[numSecond].children[i]
+							);
+						}
+					}
+					this.pickerValueMulThreeOne = pickerValueMulThreeOne;
+					this.pickerValueMulThreeTwo = pickerValueMulThreeTwo;
+					this.pickerValueMulThreeThree = pickerValueMulThreeThree;
+				}
+			},
+			show() {
+				setTimeout(() => {
+					if (this.pickerValueArrayChange || this.modeChange) {
+						this.initPicker(this.pickerValueArray);
+						this.showPicker = true;
+						this.pickerValueArrayChange = false;
+						this.modeChange = false;
+					} else {
+						this.showPicker = true;
+					}
+				}, 0);
+			},
+			maskClick() {
+				this.pickerCancel();
+			},
+			pickerCancel() {
+				this.showPicker = false;
+				this._initPickerVale();
+				let pickObj = {
+					index: this.pickerValue,
+					value: this._getPickerLabelAndValue(this.pickerValue, this.mode).value,
+					label: this._getPickerLabelAndValue(this.pickerValue, this.mode).label
+				};
+				this.$emit('onCancel', pickObj);
+			},
+			pickerConfirm(e) {
+				this.showPicker = false;
+				this._initPickerVale();
+				let pickObj = {
+					index: this.pickerValue,
+					value: this._getPickerLabelAndValue(this.pickerValue, this.mode).value,
+					label: this._getPickerLabelAndValue(this.pickerValue, this.mode).label
+				};
+				this.$emit('onConfirm', pickObj);
+			},
+			showPickerView() {
+				this.showPicker = true;
+			},
+			pickerChange(e) {
+				console.log(11111111, e);
+				this.pickerValue = e.detail.value;
+				let pickObj = {
+					index: this.pickerValue,
+					value: this._getPickerLabelAndValue(this.pickerValue, this.mode).value,
+					label: this._getPickerLabelAndValue(this.pickerValue, this.mode).label
+				};
+				this.$emit('onChange', pickObj);
+			},
+			pickerChangeMul(e) {
+				if (this.deepLength === 2) {
+					let pickerValueArray = this.pickerValueArray;
+					let changeValue = e.detail.value;
+					// 处理第一列滚动
+					if (changeValue[0] !== this.pickerValue[0]) {
+						let pickerValueMulTwoTwo = [];
+						// 第一列滚动第二列数据更新
+						for (let i = 0, length = pickerValueArray[changeValue[0]].children.length; i < length; i++) {
+							pickerValueMulTwoTwo.push(pickerValueArray[changeValue[0]].children[i]);
+						}
+						this.pickerValueMulTwoTwo = pickerValueMulTwoTwo;
+						// 第二列初始化为 0
+						changeValue[1] = 0;
+					}
+					this.pickerValue = changeValue;
+				} else if (this.deepLength === 3) {
+					let pickerValueArray = this.pickerValueArray;
+					let changeValue = e.detail.value;
+					let pickerValueMulThreeTwo = [];
+					let pickerValueMulThreeThree = [];
+					// 重新渲染第二列
+					// 如果是第一列滚动
+					if (changeValue[0] !== this.pickerValue[0]) {
+						this.pickerValueMulThreeTwo = [];
+						for (let i = 0, length = pickerValueArray[changeValue[0]].children.length; i < length; i++) {
+							pickerValueMulThreeTwo.push(pickerValueArray[changeValue[0]].children[i]);
+						}
+						// 重新渲染第三列
+						for (let i = 0, length = pickerValueArray[changeValue[0]].children[0].children.length; i <
+							length; i++) {
+							pickerValueMulThreeThree.push(pickerValueArray[changeValue[0]].children[0].children[i]);
+						}
+						changeValue[1] = 0;
+						changeValue[2] = 0;
+						this.pickerValueMulThreeTwo = pickerValueMulThreeTwo;
+						this.pickerValueMulThreeThree = pickerValueMulThreeThree;
+					} else if (changeValue[1] !== this.pickerValue[1]) {
+						// 第二列滚动
+						// 重新渲染第三列
+						this.pickerValueMulThreeThree = [];
+						pickerValueMulThreeTwo = this.pickerValueMulThreeTwo;
+						for (let i = 0, length = pickerValueArray[changeValue[0]].children[changeValue[1]].children
+								.length; i <
+							length; i++) {
+							pickerValueMulThreeThree.push(pickerValueArray[changeValue[0]].children[changeValue[1]]
+								.children[
+									i]);
+						}
+						changeValue[2] = 0;
+						this.pickerValueMulThreeThree = pickerValueMulThreeThree;
+					}
+					this.pickerValue = changeValue;
+				}
+				let pickObj = {
+					index: this.pickerValue,
+					value: this._getPickerLabelAndValue(this.pickerValue, this.mode).value,
+					label: this._getPickerLabelAndValue(this.pickerValue, this.mode).label
+				};
+				this.$emit('onChange', pickObj);
+			},
+			// 获取 pxikerLabel
+			_getPickerLabelAndValue(value, mode) {
+				let pickerLable;
+				let pickerGetValue = [];
+				// selector
+				if (mode === 'selector') {
+					pickerLable = this.pickerValueSingleArray[value].label;
+					pickerGetValue.push(this.pickerValueSingleArray[value].value);
+				} else if (mode === 'timeSelector') {
+					pickerLable = `${this.pickerValueHour[value[0]].label}-${this.pickerValueMinute[value[1]].label}`;
+					pickerGetValue.push(this.pickerValueHour[value[0]].value);
+					pickerGetValue.push(this.pickerValueHour[value[1]].value);
+				} else if (mode === 'multiSelector') {
+					for (let i = 0; i < value.length; i++) {
+						if (i > 0) {
+							pickerLable += this.pickerValueMulArray[i][value[i]].label + (i === value.length - 1 ? '' :
+								'-');
+						} else {
+							pickerLable = this.pickerValueMulArray[i][value[i]].label + '-';
+						}
+						pickerGetValue.push(this.pickerValueMulArray[i][value[i]].value);
+					}
+				} else if (mode === 'multiLinkageSelector') {
+					/* eslint-disable indent */
+					pickerLable =
+						this.deepLength === 2 ?
+						`${this.pickerValueMulTwoOne[value[0]].label}-${this.pickerValueMulTwoTwo[value[1]].label}` :
+						`${this.pickerValueMulThreeOne[value[0]].label}-${this.pickerValueMulThreeTwo[value[1]].label}-${this.pickerValueMulThreeThree[value[2]].label}`;
+					if (this.deepLength === 2) {
+						pickerGetValue.push(this.pickerValueMulTwoOne[value[0]].value);
+						pickerGetValue.push(this.pickerValueMulTwoTwo[value[1]].value);
+					} else {
+						pickerGetValue.push(this.pickerValueMulThreeOne[value[0]].value);
+						pickerGetValue.push(this.pickerValueMulThreeTwo[value[1]].value);
+						pickerGetValue.push(this.pickerValueMulThreeThree[value[2]].value);
+					}
+					/* eslint-enable indent */
+				}
+				return {
+					label: pickerLable,
+					value: pickerGetValue
+				};
+			},
+			// 初始化 pickerValue 默认值
+			_initPickerVale() {
+				if (this.pickerValue.length === 0) {
+					if (this.mode === 'selector') {
+						this.pickerValue = [0];
+					} else if (this.mode === 'multiSelector') {
+						this.pickerValue = new Int8Array(this.pickerValueArray.length);
+					} else if (
+						this.mode === 'multiLinkageSelector' &&
+						this.deepLength === 2
+					) {
+						this.pickerValue = [0, 0];
+					} else if (
+						this.mode === 'multiLinkageSelector' &&
+						this.deepLength === 3
+					) {
+						this.pickerValue = [0, 0, 0];
+					}
+				}
+			}
+		}
+	};
+</script>
+
+<style>
+	.pickerMask {
+		position: fixed;
+		z-index: 1000;
+		top: 0;
+		right: 0;
+		left: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.6);
+	}
+
+	.mpvue-picker-content {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		transition: all 0.3s ease;
+		transform: translateY(100%);
+		z-index: 3000;
+	}
+
+	.mpvue-picker-view-show {
+		transform: translateY(0);
+	}
+
+	.mpvue-picker__hd {
+		display: flex;
+		padding: 9px 15px;
+		background-color: #fff;
+		position: relative;
+		text-align: center;
+		font-size: 17px;
+	}
+
+	.mpvue-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);
+	}
+
+	.mpvue-picker__action {
+		display: block;
+		flex: 1;
+		color: #1aad19;
+	}
+
+	.mpvue-picker__action:first-child {
+		text-align: left;
+		color: #888;
+	}
+
+	.mpvue-picker__action:last-child {
+		text-align: right;
+	}
+
+	.picker-item {
+		text-align: center;
+		line-height: 40px;
+		font-size: 16px;
+	}
+
+	.mpvue-picker-view {
+		position: relative;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 238px;
+		background-color: rgba(255, 255, 255, 1);
+	}
+</style>
diff --git a/components/mpvueGestureLock/gestureLock.js b/components/mpvueGestureLock/gestureLock.js
new file mode 100644
index 0000000..21cf459
--- /dev/null
+++ b/components/mpvueGestureLock/gestureLock.js
@@ -0,0 +1,175 @@
+class GestureLock {
+
+    constructor(containerWidth, cycleRadius) {
+        this.containerWidth = containerWidth; // 容器宽度
+        this.cycleRadius = cycleRadius; // 圆的半径
+
+        this.circleArray = []; // 全部圆的对象数组
+        this.checkPoints = []; // 选中的圆的对象数组
+        this.lineArray = []; // 已激活锁之间的线段数组
+        this.lastCheckPoint = 0; // 最后一个激活的锁
+        this.offsetX = 0; // 容器的 X 偏移
+        this.offsetY = 0; // 容器的 Y 偏移
+        this.activeLine = {}; // 最后一个激活的锁与当前位置之间的线段
+
+        this.windowWidth = wx.getSystemInfoSync().windowWidth; // 窗口大小(用于rpx 和 px 转换)
+
+        this.initCircleArray();
+    }
+
+    // 初始化 画布上的 9个圆
+    initCircleArray() {
+        const cycleMargin = (this.containerWidth - 6 * this.cycleRadius) / 6;
+        let count = 0;
+        for (let i = 0; i < 3; i++) {
+            for (let j = 0; j < 3; j++) {
+                count++;
+                this.circleArray.push({
+                    count: count,
+                    x: this.rpxTopx((cycleMargin + this.cycleRadius) * (j * 2 + 1)),
+                    y: this.rpxTopx((cycleMargin + this.cycleRadius) * (i * 2 + 1)),
+                    radius: this.rpxTopx(this.cycleRadius),
+                    check: false,
+                    style: {
+                        left: (cycleMargin + this.cycleRadius) * (j * 2 + 1) - this.cycleRadius + 'rpx',
+                        top: (cycleMargin + this.cycleRadius) * (i * 2 + 1) - this.cycleRadius + 'rpx',
+                        width: this.cycleRadius * 2 + 'rpx',
+                    }
+                });
+            }
+        }
+    }
+
+    onTouchStart(e) {
+        this.setOffset(e);
+        this.checkTouch({
+            x: e.touches[0].pageX - this.offsetX,
+            y: e.touches[0].pageY - this.offsetY
+        });
+    }
+
+    onTouchMove(e) {
+        this.moveDraw(e)
+    }
+
+    onTouchEnd(e) {
+        const checkPoints = this.checkPoints;
+        this.reset();
+        return checkPoints;
+    }
+
+    // 初始化 偏移量
+    setOffset(e) {
+        this.offsetX = e.currentTarget.offsetLeft;
+        this.offsetY = e.currentTarget.offsetTop;
+    }
+
+    // 检测当时 触摸位置是否位于 锁上
+    checkTouch({
+        x,
+        y
+    }) {
+        for (let i = 0; i < this.circleArray.length; i++) {
+            let point = this.circleArray[i];
+            if (this.isPointInCycle(x, y, point.x, point.y, point.radius)) {
+                if (!point.check) {
+                    this.checkPoints.push(point.count);
+                    if (this.lastCheckPoint != 0) {
+                        // 已激活锁之间的线段
+                        const line = this.drawLine(this.lastCheckPoint, point);
+                        this.lineArray.push(line);
+                    }
+                    this.lastCheckPoint = point;
+                }
+                point.check = true;
+                return;
+            }
+        }
+    }
+
+    // 画线 - 返回 样式 对象
+    drawLine(start, end) {
+        const width = this.getPointDis(start.x, start.y, end.x, end.y);
+        const rotate = this.getAngle(start, end);
+
+        return {
+            activeLeft: start.x + 'px',
+            activeTop: start.y + 'px',
+            activeWidth: width + 'px',
+            activeRotate: rotate + 'deg'
+        }
+
+    }
+
+    // 获取 画线的 角度
+    getAngle(start, end) {
+        var diff_x = end.x - start.x,
+            diff_y = end.y - start.y;
+        if (diff_x >= 0) {
+            return 360 * Math.atan(diff_y / diff_x) / (2 * Math.PI);
+        } else {
+            return 180 + 360 * Math.atan(diff_y / diff_x) / (2 * Math.PI);
+        }
+    }
+
+    // 判断 当前点是否位于 锁内
+    isPointInCycle(x, y, circleX, circleY, radius) {
+        return (this.getPointDis(x, y, circleX, circleY) < radius) ? true : false;
+    }
+
+    // 获取两点之间距离
+    getPointDis(ax, ay, bx, by) {
+        return Math.sqrt(Math.pow(ax - bx, 2) + Math.pow(ay - by, 2));
+    }
+
+    // 移动 绘制
+    moveDraw(e) {
+        // 画经过的圆
+        const x = e.touches[0].pageX - this.offsetX;
+        const y = e.touches[0].pageY - this.offsetY;
+        this.checkTouch({
+            x,
+            y
+        });
+
+        // 画 最后一个激活的锁与当前位置之间的线段
+        this.activeLine = this.drawLine(this.lastCheckPoint, {
+            x,
+            y
+        });
+    }
+
+    // 使 画布 恢复初始状态
+    reset() {
+        this.circleArray.forEach((item) => {
+            item.check = false;
+        });
+        this.checkPoints = [];
+        this.lineArray = [];
+        this.activeLine = {};
+        this.lastCheckPoint = 0;
+    }
+
+
+    // 获取 最后一个激活的锁与当前位置之间的线段
+    getActiveLine() {
+        return this.activeLine;
+    }
+
+    // 获取 圆对象数组
+    getCycleArray() {
+        return this.circleArray;
+    }
+
+    // 获取 已激活锁之间的线段
+    getLineArray() {
+        return this.lineArray;
+    }
+
+    // 将 RPX 转换成 PX
+    rpxTopx(rpx) {
+        return rpx / 750 * this.windowWidth;
+    }
+}
+
+export default GestureLock;
diff --git a/components/mpvueGestureLock/index.vue b/components/mpvueGestureLock/index.vue
new file mode 100644
index 0000000..a2cefdd
--- /dev/null
+++ b/components/mpvueGestureLock/index.vue
@@ -0,0 +1,138 @@
+<template>
+	<view class="gesture-lock" :class="{error:error}" :style="{width: containerWidth +'rpx', height:containerWidth +'rpx'}"
+	 @touchstart.stop="onTouchStart" @touchmove.stop="onTouchMove" @touchend.stop="onTouchEnd">
+		<!-- 同级 v-for 的 key 重复会有问题，需要套一层。 -->
+		<!-- 9 个圆 -->
+		<view>
+			<view v-for="(item,i) in circleArray" :key="i" class="cycle" :class="{check:item.check}" :style="{left:item.style.left,top:item.style.top,width:item.style.width,height:item.style.width}">
+			</view>
+		</view>
+		<view>
+			<!-- 已激活锁之间的线段 -->
+			<view v-for="(item,i) in lineArray" :key="i" class="line" :style="{left:item.activeLeft,top:item.activeTop,width:item.activeWidth,'-webkit-transform':'rotate('+item.activeRotate+')',transform:'rotate('+item.activeRotate+')'}">
+			</view>
+		</view>
+		<!-- 最后一个激活的锁与当前位置之间的线段 -->
+		<view class="line" :style="{left:activeLine.activeLeft,top:activeLine.activeTop,width:activeLine.activeWidth,'-webkit-transform':'rotate('+activeLine.activeRotate+')',transform:'rotate('+activeLine.activeRotate+')'}">
+		</view>
+	</view>
+</template>
+<script>
+	import GestureLock from './gestureLock';
+
+	export default {
+		name: 'index',
+		props: {
+			/**
+			 * 容器宽度
+			 */
+			containerWidth: {
+				type: [Number, String],
+				default: 0
+			},
+			/**
+			 * 圆的半径
+			 */
+			cycleRadius: {
+				type: [Number, String],
+				default: 0
+			},
+			/**
+			 * 已设定的密码
+			 */
+			password: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+		},
+		data() {
+			return {
+				gestureLock: {}, // 锁对象
+				circleArray: [], // 圆对象数组
+				lineArray: [], // 已激活锁之间的线段
+				activeLine: {}, // 最后一个激活的锁与当前位置之间的线段
+				error: false
+			}
+		},
+		methods: {
+			onTouchStart(e) {
+				this.gestureLock.onTouchStart(e);
+				this.refesh();
+			},
+
+			onTouchMove(e) {
+				this.gestureLock.onTouchMove(e);
+				this.refesh();
+			},
+
+			onTouchEnd(e) {
+				const checkPoints = this.gestureLock.onTouchEnd(e);
+				if (!this.password.length || checkPoints.join('') == this.password.join('')) {
+					this.refesh();
+					this.$emit('end', checkPoints);
+				} else {
+					this.error = true;
+					setTimeout(() => {
+						this.refesh();
+						this.$emit('end', checkPoints);
+					}, 800);
+				}
+
+			},
+			refesh() {
+				this.error = false;
+				this.circleArray = this.gestureLock.getCycleArray();
+				this.lineArray = this.gestureLock.getLineArray();
+				this.activeLine = this.gestureLock.getActiveLine();
+			}
+		},
+		mounted() {
+			this.gestureLock = new GestureLock(this.containerWidth, this.cycleRadius);
+			this.refesh();
+		}
+	}
+</script>
+
+<style scoped>
+	.gesture-lock {
+		margin: 0 auto;
+		position: relative;
+		box-sizing: border-box;
+		overflow: auto;
+	}
+
+	.gesture-lock .cycle {
+		box-sizing: border-box;
+		position: absolute;
+		border: 2px solid #66aaff;
+		border-radius: 50%;
+	}
+
+	.gesture-lock .cycle.check:after {
+		content: "";
+		display: block;
+		position: absolute;
+		width: 32%;
+		height: 32%;
+		border: 2px solid #66aaff;
+		border-radius: 50%;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+
+	.gesture-lock .line {
+		height: 0;
+		border-top: 2px solid #66aaff;
+		position: absolute;
+		transform-origin: left center;
+	}
+
+	.gesture-lock.error .cycle.check,
+	.gesture-lock.error .cycle.check:after,
+	.gesture-lock.error .line {
+		border-color: #ffa197;
+	}
+</style>
diff --git a/components/my-paging/my-paging.vue b/components/my-paging/my-paging.vue
new file mode 100644
index 0000000..7c04929
--- /dev/null
+++ b/components/my-paging/my-paging.vue
@@ -0,0 +1,157 @@
+<!-- 基于z-paging封装个性化分页组件演示，可减少大量重复代码 -->
+<template>
+	<!-- 这边统一设置z-paging，在页面中使用时就不用重复写 -->
+	<!-- 如果要在这里设置极简写法，这里的ref不能设置为paging，设置为其他名即可，因为极简写法会修改/调用第一个包含了ref="paging"的付view中的list和query -->
+	<!-- 极简写法在下方设置autowire-list-name="xxx" autowire-query-name="xxx"即可，与minimalism-demo.vue中的一致，并且不用再从这个组件转发到页面，只要遵循上一行的规则即可 -->
+	<z-paging ref="paging" v-model="list" fixed auto-show-back-to-top refresher-threshold="160rpx" @query="queryList"
+		:useVirtualList="useVirtualList" :useInnerList="useInnerList" :cellKeyName="cellKeyName" :innerListStyle="innerListStyle" :preloadPage="preloadPage" :cellHeightMode="cellHeightMode" :virtualScrollFps="virtualScrollFps"
+		:loading-more-loading-text="{'en':'英文的加载中','zh-cn':'中文的加载中','zh-hant-cn':'繁体的加载中'}">
+		
+		<!-- 这里插入一个view到z-paging中，并且这个view会被z-paging标记为top固定在顶部 -->
+		<template #top>
+			<!-- 这里接收页面传进来的slot，这样相当于将页面传进来的slot传给z-paging的slot="top"了 -->
+			<slot name="top" />
+		</template>
+		
+		<!-- 这里插入一个view到z-paging中，并且这个view会被z-paging标记为bottom固定在顶部 -->
+		<!-- vue3中用v-slot:bottom -->
+		<template #bottom>
+			<!-- 这里接收页面传进来的slot，这样相当于将页面传进来的slot传给z-paging的slot="bottom"了 -->
+			<slot name="bottom" />
+		</template>
+		
+		<template #empty v-if="$slots.empty" >
+			<!-- 这里接收页面传进来的slot，这样相当于将页面传进来的slot传给z-paging的slot="empty"了 -->
+			<slot name="empty" />
+		</template>
+		
+		<!-- 这个是插入虚拟列表/内置列表的cell -->
+		<template #cell="{item,index}">
+			<slot name="cell" :item="item" :index="index"/>
+		</template>
+
+		<!-- 这里通过slot统一自定义了下拉刷新view和没有更多数据view，页面那边就不用再写下面两行了 -->
+		<!-- 自定义下拉刷新view(如果use-custom-refresher为true且不设置下面的slot="refresher"，此时不用获取refresherStatus，会自动使用z-paging自带的下拉刷新view) -->
+		<template #refresher="{refresherStatus}">
+			<!-- <custom-refresher :status="refresherStatus" /> -->
+		</template>
+		<!-- 自定义没有更多数据view -->
+		<template #loadingMoreNoMore>
+			<!-- <custom-nomore></custom-nomore> -->
+			<uni-load-more status="normore" />
+		</template>
+
+		<!-- 这里接收页面传进来的普通slot，如列表数据等 -->
+		<slot />
+	</z-paging>
+</template>
+
+<script>
+	export default {
+		name: "my-paging",
+		data() {
+			return {
+				list: []
+			};
+		},
+		props: {
+			//用于接收父组件v-model所绑定的list的值
+			value: {
+				type: Array,
+				default: function() {
+					return [];
+				}
+			},
+			//是否使用虚拟列表，默认为否
+			useVirtualList: {
+				type: Boolean,
+				default: false
+			},
+			//是否在z-paging内部循环渲染列表(内置列表)，默认为否。若use-virtual-list为true，则此项恒为true
+			useInnerList: {
+				type: Boolean,
+				default: false
+			},
+			//内置列表cell的key名称，仅nvue有效，在nvue中开启use-inner-list时必须填此项
+			cellKeyName: {
+				type: String,
+				default: ''
+			},
+			//innerList样式
+			innerListStyle: {
+				type: Object,
+				default: function() {
+					return {};
+				}
+			},
+			//预加载的列表可视范围(列表高度)页数，默认为12，即预加载当前页及上下各7页的cell。此数值越大，则虚拟列表中加载的dom越多，内存消耗越大(会维持在一个稳定值)，但增加预加载页面数量可缓解快速滚动短暂白屏问题
+			preloadPage: {
+				type: [Number, String],
+				default: 12
+			},
+			//虚拟列表cell高度模式，默认为fixed，也就是每个cell高度完全相同，将以第一个cell高度为准进行计算。可选值【dynamic】，即代表高度是动态非固定的，【dynamic】性能低于【fixed】。
+			cellHeightMode: {
+				type: String,
+				default: 'fixed'
+			},
+			//虚拟列表scroll取样帧率，默认为60，过高可能出现卡顿等问题
+			virtualScrollFps: {
+				type: [Number, String],
+				default: 60
+			},
+		},
+		watch: {
+			//监听页面v-mode传过来的值，同时传给z-paging
+			value(newVal) {
+				this.list = newVal;
+			},
+			// #ifdef VUE3
+			modelValue(newVal) {
+				this.list = newVal;
+			},
+			// #endif
+			//监听z-paging给当前组件的值，同时传给页面
+			list(newVal) {
+				//通过emit input修改页面中v-model绑定的值
+				this.$emit('input', newVal);
+				// #ifdef VUE3
+				this.$emit('update:modelValue', newVal);
+				// #endif
+			}
+		},
+		methods: {
+			//监听z-paging的@query方法，通过emit传递给页面
+			queryList(pageNo, pageSize) {
+				console.log("queryList",pageNo)
+				// this.$emit('query', pageNo, pageSize);
+			},
+			//接收页面触发的reload方法，传给z-paging
+			reload(data) {
+				this.$refs.paging.reload(data);
+			},
+			//接收页面触发的complete方法，传给z-paging
+			complete(data) {
+				this.$refs.paging.complete(data);
+			},
+			/*
+			//如果是使用页面滚动，则需要添加以下三行，注意页面那边要引入mixins，与使用页面滚动示例写法相同。
+			//接收页面触发的updatePageScrollTop方法，传给z-paging
+			updatePageScrollTop(data){
+				this.$refs.paging.updatePageScrollTop(data);
+			},
+			//接收页面触发的pageReachBottom方法，传给z-paging
+			pageReachBottom(){
+				this.$refs.paging.pageReachBottom();
+			},
+			//接收页面触发的doChatRecordLoadMore方法，传给z-paging
+			doChatRecordLoadMore() {
+				this.$refs.paging.doChatRecordLoadMore();
+			}
+			*/
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/components/page-foot/page-foot.vue b/components/page-foot/page-foot.vue
new file mode 100644
index 0000000..1154dbe
--- /dev/null
+++ b/components/page-foot/page-foot.vue
@@ -0,0 +1,38 @@
+<template name="page-foot">
+	<view class="page-share-title">
+		<text>感谢{{name}}提供本示例，</text>
+		<text class="submit" @click="submit">我也提交</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "page-foot",
+		props: {
+			name: {
+				type: String,
+				default: ""
+			}
+		},
+		methods: {
+			submit() {
+				uni.showModal({
+					content:"hello uni-app开源地址为https://github.com/dcloudio/uni-app/tree/master/examples，请在这个开源项目上贡献你的代码",
+					showCancel:false
+				})
+			}
+		}
+	}
+</script>
+<style>
+	.page-share-title {
+		text-align: center;
+		font-size: 30rpx;
+		color: #BEBEBE;
+		padding: 20rpx 0;
+	}
+
+	.submit {
+		border-bottom: 1rpx solid #BEBEBE;
+	}
+</style>
diff --git a/components/page-head/page-head.vue b/components/page-head/page-head.vue
new file mode 100644
index 0000000..07ed46d
--- /dev/null
+++ b/components/page-head/page-head.vue
@@ -0,0 +1,16 @@
+<template name="page-head">
+	<view class="common-page-head">
+		<view class="common-page-head-title">{{title}}</view>
+	</view>
+</template>
+<script>
+	export default {
+		name: "page-head",
+		props: {
+			title: {
+				type: String,
+				default: ""
+			}
+		}
+	}
+</script>
diff --git a/components/pullDown/pullDown.vue b/components/pullDown/pullDown.vue
new file mode 100644
index 0000000..10058a2
--- /dev/null
+++ b/components/pullDown/pullDown.vue
@@ -0,0 +1,663 @@
+<template>
+	<view>
+		<view class="maskbox" v-show="active" @tap="maskClick"></view>
+		<view :class="description == 'row'?'uni-combox-row':'uni-combox-column'">
+			<view v-if="label" class="uni-combox__label" :style="labelStyle">
+				<text>{{label}}</text>
+			</view>
+			<view class="u-dropdown">
+				<view class="u-dropdown__menu">
+					<view class="u-dropdown__menu__item">
+						<view class="u-flex " style="width: 100%;">
+							<view class="u-close-wrap" v-if="isSearch">
+								<u-icon class="u-clear-icon" :size="30" :name="searchIcon"
+									:color="searchIconColor ? searchIconColor : color"></u-icon>
+							</view>
+
+							<view class="u-input">
+								<u-input confirm-type="search" class="uni-combox__input"
+									:type="isAutoHeight ? 'textarea':'text'" v-model="inputVal" @confirm="confirm()"
+									:placeholder="placeholder" :auto-height="isAutoHeight"
+									:height="isAutoHeight ?height-20:height" />
+							</view>
+
+							<icon class="uni-combox__icon" type="clear" size="16" @tap="clearInputValue"
+								v-if="inputVal!=''" style="height: 100%;align-items: center;justify-content: center;" />
+							<!-- <image size="16" src="/static/icons/close-circle2.svg"
+							style="height: 35%;width: 10%;align-items: center;justify-content: center;background-color: aqua;display: flex;"> -->
+							<!-- </image> -->
+							<view :style="{width:height + 'rpx'}" class="u-dropdown__menu__item__arrow" :class="{
+								'u-dropdown__menu__item__arrow--rotate': active
+							}" @tap.stop="menuClick()">
+								<u-icon :custom-style="{display: 'flex'}" :name="menuIcon"
+									:size="$u.addUnit(menuIconSize)" :color="active ? activeColor : '#c0c4cc'"></u-icon>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="u-dropdown__content" :style="[contentStyle, {
+				transition: `opacity ${duration / 1000}s linear`,
+				top: $u.addUnit(height+28),
+				height: contentHeight + 'px'}]" @tap="maskClick" @touchmove.stop.prevent>
+
+					<view class="u-dropdown__content__popup" :style="[popupStyle]" @touchmove.stop.prevent="() => {}"
+						@tap.stop.prevent="() => {}">
+
+						<view class="uni-combox__selector-empty" v-if="optionsLength === 0" @click="empty()">
+							<text>{{emptyTips}}</text>
+						</view>
+
+						<view v-for="(item, index) in filterOptions" style="width: 100%;"
+							@click="onSelectorClick(index)">
+							<view v-if="itemTextCount == 1" class="uni-combox-item">
+								<text class="uni-combox-item-text" :title-style="{
+										color: inputVal === item ? activeColor : inactiveColor
+									}">{{item}}</text>
+								<u-icon v-if="inputVal === item" name="checkbox-mark" :color="activeColor" size="32">
+								</u-icon>
+							</view>
+							<view v-if="itemTextCount == 2" class="uni-combox-item2">
+								<text class="uni-combox-item-text" :title-style="{
+										color: inputVal === item ? activeColor : inactiveColor
+									}">{{item.value}}</text>
+								<text class="uni-combox-item-text" :title-style="{
+										color: inputVal === item ? activeColor : inactiveColor
+									}">{{item.desc}}</text>
+							</view>
+							<u-line class="line_color"></u-line>
+						</view>
+					</view>
+					<!-- <view class="u-dropdown__content__mask"></view> -->
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * dropdown 下拉菜单
+	 * @description 菜单标题与编辑框排列方向,即水平排列row/垂直排列column,默认水平排列row
+	 * @tutorial http://uviewui.com/components/dropdown.html
+	 * @property {String} active-color 标题和选项卡选中的颜色（默认#2979ff）
+	 * @property {String} inactive-color 标题和选项卡未选中的颜色（默认#606266）
+	 * @property {Boolean} close-on-click-mask 点击遮罩是否关闭菜单（默认true）
+	 * @property {Boolean} close-on-click-self 点击当前激活项标题是否关闭菜单（默认true）
+	 * @property {String | Number} duration 选项卡展开和收起的过渡时间，单位ms（默认300）
+	 * @property {String | Number} height 标题菜单的高度，单位任意（默认80）
+	 * @property {String | Number} border-radius 菜单展开内容下方的圆角值，单位任意（默认0）
+	 * @property {Boolean} border-bottom 标题菜单是否显示下边框（默认false）
+	 * @property {String | Number} title-size 标题的字体大小，单位任意，数值默认为rpx单位（默认28）
+	 * @event {Function} open 下拉菜单被打开时触发
+	 * @event {Function} close 下拉菜单被关闭时触发
+	 * @example <pulldown></pulldown>
+	 */
+	export default {
+		name: 'pulldown',
+		emits: ["open", "close", "update:modelValue", "input", "change", "confirm"],
+		props: {
+			// 菜单标题与编辑框排列方向,水平排列row/垂直排列column
+			description: {
+				type: String,
+				default: 'row'
+			},
+
+			// 菜单标题
+			label: {
+				type: String,
+				default: ''
+			},
+			// 菜单标题长度
+			labelWidth: {
+				type: String,
+				default: 'auto'
+			},
+			// 菜单标题和选项的激活态颜色
+			activeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 菜单标题和选项的未激活态颜色
+			inactiveColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 点击遮罩是否关闭菜单
+			closeOnClickMask: {
+				type: Boolean,
+				default: true
+			},
+			// 点击当前激活项标题是否关闭菜单
+			closeOnClickSelf: {
+				type: Boolean,
+				default: true
+			},
+			// 过渡时间
+			duration: {
+				type: [Number, String],
+				default: 300
+			},
+			// 标题菜单的高度，单位任意，数值默认为rpx单位
+			height: {
+				type: [Number, String],
+				default: 55
+			},
+			// 是否显示下边框
+			borderBottom: {
+				type: Boolean,
+				default: false
+			},
+			// 标题的字体大小
+			titleSize: {
+				type: [Number, String],
+				default: 28
+			},
+			// 下拉出来的内容部分的圆角值
+			borderRadius: {
+				type: [Number, String],
+				default: 0
+			},
+			// 菜单右侧的icon图标
+			menuIcon: {
+				type: String,
+				default: 'arrow-down'
+			},
+			// 菜单右侧图标的大小
+			menuIconSize: {
+				type: [Number, String],
+				default: 26
+			},
+
+			emptyTips: {
+				type: String,
+				default: '无匹配项'
+			},
+
+			// 是否开启搜索模式
+			isSearch: {
+				type: Boolean,
+				default: false
+			},
+
+			// 占位提示文字
+			hint: {
+				type: String,
+				default: ''
+			},
+
+			// 搜索图标的颜色，默认同输入框字体颜色
+			searchIconColor: {
+				type: String,
+				default: ''
+			},
+			// 输入框字体颜色
+			color: {
+				type: String,
+				default: '#606266'
+			},
+
+			// 左边输入框的图标，可以为uView图标名称或图片路径
+			searchIcon: {
+				type: String,
+				default: 'search'
+			},
+
+			// 选项数据，如果传入了默认slot，此参数无效
+			options: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+
+			// 搜索图标的颜色，默认同输入框字体颜色
+			itemTextCount: {
+				type: Number,
+				default: 1
+			},
+			//输入框的高度是否随着行数增加，而自动增加输入框的高度
+			isAutoHeight: {
+				type: Boolean,
+				default: false
+			},
+		},
+		data() {
+			return {
+				inputVal: '',
+				showDropdown: true, // 是否打开下来菜单,
+				menuList: [], // 显示的菜单
+				active: false, // 下拉菜单的状态
+				// 当前是第几个菜单处于激活状态，小程序中此处不能写成false或者""，否则后续将current赋值为0，
+				// 无能的TX没有使用===而是使用==判断，导致程序认为前后二者没有变化，从而不会触发视图更新
+				current: 99999,
+				// 外层内容的样式，初始时处于底层，且透明
+				contentStyle: {
+					// zIndex: 11,
+					zIndex: -1,
+					opacity: 0
+				},
+				// 让某个菜单保持高亮的状态
+				highlightIndex: 99999,
+				contentHeight: 0
+			}
+		},
+		computed: {
+			// 下拉出来部分的样式
+			popupStyle() {
+				let style = {};
+				// 进行Y轴位移，展开状态时，恢复原位。收齐状态时，往上位移100%，进行隐藏
+				style.transform = `translateY(${this.active ? 0 : '-100%'})`
+				style['transition-duration'] = this.duration / 1000 + 's';
+				style.borderRadius = `0 0 ${this.$u.addUnit(this.borderRadius)} ${this.$u.addUnit(this.borderRadius)}`;
+				return style;
+			},
+
+			labelStyle() {
+				if (this.labelWidth === 'auto') {
+					return {}
+				}
+				return {
+					width: this.labelWidth
+				}
+			},
+			optionsLength() {
+				return this.options.length
+			},
+			filterOptions() {
+				if (this.isSearch) {
+					return this.options.filter((item) => {
+						return item.indexOf(this.inputVal) > -1
+					})
+				} else {
+					return this.options;
+				}
+			},
+
+			placeholder() {
+				if (this.hint) {
+					return this.hint;
+				} else {
+					if (this.isSearch) {
+						return '请输入关键字';
+					} else {
+						return '请选择';
+					}
+
+				}
+
+			},
+		},
+		created() {
+			// 引用所有子组件(u-dropdown-item)的this，不能在data中声明变量，否则在微信小程序会造成循环引用而报错
+			this.children = [];
+		},
+		mounted() {
+			this.getContentHeight();
+		},
+		methods: {
+			//清空数据
+			clearInputValue() {
+				this.inputVal = "";
+			},
+
+			//回车监听
+			confirm() {
+				this.$emit("confirm", this.inputVal);
+			},
+
+			init() {
+				// 当某个子组件内容变化时，触发父组件的init，父组件再让每一个子组件重新初始化一遍
+				// 以保证数据的正确性
+				this.menuList = [];
+				this.children.map(child => {
+					child.init();
+				})
+			},
+			// 点击菜单
+			menuClick() {
+				// 判断是否被禁用
+				// if (this.menuList[index].disabled) return;
+				// 如果点击时的索引和当前激活项索引相同，意味着点击了激活项，需要收起下拉菜单
+				if (this.active) {
+					this.close();
+					// 等动画结束后，再移除下拉菜单中的内容，否则直接移除，也就没有下拉菜单收起的效果了
+					// setTimeout(() => {
+					// 	this.active = false;
+					// }, this.duration)
+					return;
+				}
+				this.open();
+			},
+
+			onSelectorClick(index) {
+				// console.log(index);
+				if (this.itemTextCount == 1) {
+					this.inputVal = this.options[index];
+					this.close();
+					// 修改通过v-model绑定的值
+					this.$emit("input", this.inputVal);
+					this.$emit("update:modelValue", this.inputVal);
+					// 发出事件，抛出当前勾选项的value
+					this.$emit("change", index, this.inputVal);
+				} else if (this.itemTextCount == 2) {
+					this.inputVal = this.options[index].value;
+					this.close();
+					// 修改通过v-model绑定的值
+					this.$emit("input", this.inputVal);
+					this.$emit("update:modelValue", this.inputVal);
+					// 发出事件，抛出当前勾选项的value
+					this.$emit("change", index, this.inputVal);
+				}
+
+			},
+			// 打开下拉菜单
+			open() {
+				console.log(this.options[0]);
+				console.log(this.options.length);
+				// console.log(this.filterOptions());
+				// 重置高亮索引，否则会造成多个菜单同时高亮
+				// this.highlightIndex = 9999;
+				// 展开时，设置下拉内容的样式
+				this.contentStyle = {
+					zIndex: 11,
+				}
+				this.$forceUpdate();
+				// 标记展开状态以及当前展开项的索引
+				this.active = true;
+				// this.current = index;
+				// 历遍所有的子元素，将索引匹配的项标记为激活状态，因为子元素是通过v-if控制切换的
+				// 之所以不是因display: none，是因为nvue没有display这个属性
+
+				this.$emit('open', this.current);
+			},
+			// 设置下拉菜单处于收起状态
+			close() {
+				this.$emit('close', this.current);
+				// 设置为收起状态，同时current归位，设置为空字符串
+				this.active = false;
+				this.current = 99999;
+				// 下拉内容的样式进行调整，不透明度设置为0
+				this.contentStyle = {
+					zIndex: -1,
+					opacity: 0
+				}
+			},
+
+			//点击无匹配选项关闭下拉菜单
+			empty() {
+				// 设置为收起状态，同时current归位，设置为空字符串
+				this.active = false;
+				this.current = 99999;
+				// 下拉内容的样式进行调整，不透明度设置为0
+				this.contentStyle = {
+					zIndex: -1,
+					opacity: 0
+				}
+			},
+			// 点击遮罩
+			maskClick() {
+				// 如果不允许点击遮罩，直接返回
+				if (!this.closeOnClickMask) return;
+				this.close();
+			},
+			// 外部手动设置某个菜单高亮
+			highlight(index = undefined) {
+				this.highlightIndex = index !== undefined ? index : 99999;
+			},
+			// 获取下拉菜单内容的高度
+			getContentHeight() {
+				// 这里的原理为，因为dropdown组件是相对定位的，它的下拉出来的内容，必须给定一个高度
+				// 才能让遮罩占满菜单一下，直到屏幕底部的高度
+				// this.$u.sys()为uView封装的获取设备信息的方法
+				let windowHeight = this.$u.sys().windowHeight;
+				this.$uGetRect('.u-dropdown__menu').then(res => {
+					// 这里获取的是dropdown的尺寸，在H5上，uniapp获取尺寸是有bug的(以前提出修复过，后来又出现了此bug，目前hx2.8.11版本)
+					// H5端bug表现为元素尺寸的top值为导航栏底部到到元素的上边沿的距离，但是元素的bottom值确是导航栏顶部到元素底部的距离
+					// 二者是互相矛盾的，本质原因是H5端导航栏非原生，uni的开发者大意造成
+					// 这里取菜单栏的botton值合理的，不能用res.top，否则页面会造成滚动
+					this.contentHeight = windowHeight - res.bottom;
+					// console.log(this.contentHeight);
+					// console.log(res.bottom);
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../uni_modules/vk-uview-ui/libs/css/style.components.scss";
+
+	.u-input {
+		width: 100%;
+		padding-top: 5px;
+		padding-bottom: 5px;
+	}
+
+	.u-clear-icon {
+		@include vue-flex;
+		align-items: center;
+	}
+
+	.u-close-wrap {
+		width: 30px;
+		height: 100%;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 50%;
+	}
+
+	.maskbox {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100vw;
+		height: 100vh;
+		z-index: 4;
+	}
+
+	.uni-combox-row {
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		display: flex;
+		/* #endif */
+		min-height: 40px;
+		flex-direction: row;
+		align-items: center;
+		position: relative;
+		background-color: #FFFFFF;
+		// padding-right: 5px;
+		// padding-left: 5px;
+		// z-index: 3;
+	}
+
+	.uni-combox-column {
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		display: flex;
+		/* #endif */
+		min-height: 40px;
+		flex-direction: column;
+		align-items: flex-start;
+		position: relative;
+		background-color: #FFFFFF;
+		// padding-right: 5px;
+		// padding-left: 5px;
+		// z-index: 3;
+	}
+
+	.uni-combox__label {
+		font-size: 16px;
+		line-height: 22px;
+		padding-right: 10px;
+	}
+
+	.uni-combox__selector-empty,
+	.uni-combox__selector-item {
+		/* #ifdef APP-NVUE */
+		display: flex;
+		/* #endif */
+		line-height: 36px;
+		font-size: 14px;
+		text-align: center;
+		border-bottom: solid 1px #DDDDDD;
+		/* margin: 0px 10px; */
+	}
+
+	.uni-combox__icon {
+		display: flex;
+		height: 100%;
+		align-items: center;
+		justify-content: center;
+		background-color: #FFFFFF;
+		z-index: 4;
+
+	}
+
+	.uni-combox__input {
+		// flex: 1;
+		font-size: 16px;
+		height: 100%;
+		line-height: 100%;
+		background-color: #FFFFFF;
+		width: 100%;
+		z-index: 5;
+	}
+
+	.uni-combox-item {
+		display: flex;
+		flex-direction: row;
+		font-size: 16px;
+		height: 100%;
+		line-height: 100%;
+		background-color: #FFFFFF;
+		width: 100%;
+	}
+
+	.uni-combox-item2 {
+		display: flex;
+		flex-direction: column;
+		font-size: 16px;
+		height: 100%;
+		line-height: 100%;
+		background-color: #FFFFFF;
+		width: 100%;
+	}
+
+	.uni-combox-item-text {
+		font-size: 16px;
+		height: 100%;
+		line-height: 100%;
+		background-color: #FFFFFF;
+		width: 100%;
+		padding: 20rpx;
+		display: flex;
+	}
+
+	.uni-combox__input-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: column;
+	}
+
+	.uni-combox__selector {
+		box-sizing: border-box;
+		position: absolute;
+		top: 42px;
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border-radius: 6px;
+		box-shadow: #DDDDDD 4px 4px 8px, #DDDDDD -4px -4px 8px;
+		z-index: 2;
+	}
+
+	.u-dropdown {
+		flex: 1;
+		width: 100%;
+		position: relative;
+		background-color: #FFFFFF;
+		margin-right: 2rpx;
+		margin-left: 2rpx;
+
+		&__menu {
+			@include vue-flex;
+			// position: relative;
+			z-index: 11;
+			width: 100%;
+
+			&__item {
+				// flex: 1;
+				@include vue-flex;
+				justify-content: center;
+				// align-items: center;
+				border: 2rpx solid $uni-border-color;
+				width: 100%;
+				margin-top: 2rpx;
+				// margin-right: 2rpx;
+				// margin-left: 2rpx;
+
+				&__text {
+					font-size: 28rpx;
+					color: $u-content-color;
+				}
+
+				&__arrow {
+					transition: transform .3s;
+					align-items: center;
+					justify-content: center;
+					@include vue-flex;
+
+					&--rotate {
+						transform: rotate(180deg);
+					}
+				}
+			}
+		}
+
+		&__content {
+			position: absolute;
+			z-index: 8;
+			width: 100%;
+			left: 0px;
+			bottom: 0;
+			overflow: hidden;
+			// z-index: 10;
+			// box-sizing: border-box;
+			// position: absolute;
+			// top: 42px;
+			// left: 0;
+			// width: 100%;
+			// // background-color: #FFFFFF;
+			// border-radius: 6px;
+			// box-shadow: #DDDDDD 4px 4px 8px, #DDDDDD -4px -4px 8px;
+			// z-index: 10;
+
+			&__mask {
+				position: relative;
+				z-index: 9;
+				background: rgba(0, 0, 0, .3);
+				width: 100%;
+				height: 100%;
+				left: 0;
+				top: 0;
+				bottom: 0;
+			}
+
+			&__popup {
+				position: relative;
+				z-index: 11;
+				transition: all 0.3s;
+				transform: translate3D(0, -100%, 0);
+				overflow: hidden;
+				width: 100%;
+				background-color: aliceblue;
+				border: 2rpx solid $uni-border-color;
+				// z-index: 10;
+			}
+		}
+
+	}
+</style>
diff --git a/components/search/index.vue b/components/search/index.vue
new file mode 100644
index 0000000..c9239e9
--- /dev/null
+++ b/components/search/index.vue
@@ -0,0 +1,85 @@
+<template>
+	<view class="content">
+		<view class="screen-input">
+				<u-search 
+					v-model='keyWord'
+					:show-action='false'  
+					:bg-color="searchData.bgBolor ||'white'"
+					:border-color="searchData.borderColor ||'#E4E4E4'"
+					:shape="searchData.shape ||'square'"
+					:height="searchData.height || 80"
+					:placeholder="searchData.placeholder ||'请输入设备名称'" 
+					:clearabled="true"
+					@search='search'
+					@clear='clear'
+					>
+				</u-search>
+		</view>
+		<view class="screen-btn" @click="screen" v-if="isShowScreen">
+			<image src="../../static/icon/screen.png" mode="widthFix"></image>
+			<view>筛选</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			searchData:{
+				type: Object,
+				default:()=>{return {}},
+				require:false
+			},
+			isShowScreen: {
+				type: Boolean,
+				default:()=>{return true},
+				require:false
+			},
+		},
+		data() {
+			return {
+				keyWord: '',
+			}
+		},
+		methods: {
+			// 搜索
+			search() {
+				this.$emit('search', this.keyWord)
+			},
+			// 搜索
+			clear() {
+				this.$emit('search', '')
+			},
+			// 筛选
+			screen() {
+				this.$emit('screen')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		padding: 20rpx;
+		display: flex;
+		align-items: center;
+		background: white;
+
+		.screen-input {
+			flex: 1;
+			width: 0px;
+		}
+
+		.screen-btn {
+			display: flex;
+			align-items: center;
+			margin-left:20rpx;
+
+			image {
+				width: 30rpx;
+				margin-right: 6rpx;
+			}
+		}
+	}
+
+</style>
\ No newline at end of file
diff --git a/components/show-modal/show-modal.vue b/components/show-modal/show-modal.vue
new file mode 100644
index 0000000..f8b523a
--- /dev/null
+++ b/components/show-modal/show-modal.vue
@@ -0,0 +1,456 @@
+<template name="show-modal">
+	<view>
+		<u-modal v-model="show" :title-style="{color: 'red'}" :title="title" :showTitle="false"
+			:showConfirmButton="false" ref="modal">
+			<view class="slot-content">
+				<slot name="icon">
+					<image class="icon" :src="icon" />
+				</slot>
+
+				<scroll-view scroll-y="true" style="max-height: 200px;">
+					<rich-text class="content" :nodes="content">
+					</rich-text>
+				</scroll-view>
+
+
+				<u-line></u-line>
+				<slot name="button">
+					<view class="uni-flex uni-row u-col-center space-between" style="width: 100%;height: 48px;">
+						<view v-if="showCancelButton" class="cance_button" @tap="$u.throttle(cancelClose, 500)">
+							<text :style="{'color':cancelColor}">{{ cancelText }}</text>
+						</view>
+						<u-line direction="col" length="100%"></u-line>
+						<view v-if="showConfirmButton" class="confirm_button" @tap="$u.throttle(confirmClose, 500)">
+							<text :style="{'color':confirmColor}">{{confirmText}}</text>
+							<text v-if="showConfirmCountdown">({{seconds}}s关闭)</text>
+						</view>
+					</view>
+				</slot>
+			</view>
+		</u-modal>
+	</view>
+</template>
+
+<script>
+	/**
+	 * modal 模态框
+	 * @description 弹出模态框，常用于消息提示、消息确认、在当前页面内完成特定的交互操作
+	 * */
+	export default {
+		data() {
+			return {
+				timer: null,
+				show: false, // 是否显示
+				iconType: '消息',
+				icon: '../../static/icons/error-circle.svg',
+				title: '', // 提示标题
+				content: '', // 提示内容
+				cancelText: '取消', // 取消按钮的文字  
+				confirmText: '确定', // 确认按钮文字  
+				showCancel: true, // 是否显示取消按钮，默认为 true
+				confirmColor: '#007aff', // 确定按钮颜色
+				cancelColor: null, // 取消按钮颜色
+				showConfirmButton: true, // 是否显示确认按钮
+				showConfirmCountdown: true, // 是否显示确定倒计时
+				showCancelButton: true, // 是否显示取消按钮
+				showClose: false,
+				confirm: false, //为 true 时，表示用户点击了确定按钮
+				cancel: false, //为 true 时，表示用户点击了取消
+				seconds: 0,
+				success: () => {} // 回调方法
+			}
+		},
+
+
+		methods: {
+			open() {
+				this.show = true;
+			},
+			close() {
+				this.$.refs.modal.popupClose();
+			},
+			confirmClose() {
+				if (this.show) {
+					this.show = false;
+					clearInterval(this.timer) //清空timer
+					this.$.refs.modal.popupClose();
+					this.success({
+						// cancel: false,
+						confirm: true,
+					});
+				}
+			},
+
+			cancelClose() {
+				clearInterval(this.timer) //清空timer
+				this.$.refs.modal.popupClose();
+				this.success({
+					// cancel: true,
+					confirm: false,
+				});
+			},
+
+			// 打开消息弹框(确定）
+			showConfirmMessageModal(mContent, callback) {
+				this.showConfirmModal("消息", mContent, callback);
+			},
+
+			// 打开成功弹框(确定）
+			showConfirmSuccessModal(mContent, callback) {
+				this.showConfirmModal("成功", mContent, callback);
+			},
+
+			// 打开失败弹框(确定）
+			showConfirmFailModal(mContent, callback) {
+				this.showConfirmModal("失败", mContent, callback);
+			},
+
+			// 打开警告弹框(确定）
+			showConfirmWarningModal(mContent, callback) {
+				this.showConfirmModal("警告", mContent, callback);
+			},
+
+			// 打开疑问弹框(确定）
+			showConfirmQuestionModal(mContent, callback) {
+				this.showConfirmModal("疑问", mContent, callback);
+			},
+
+			// 初始化弹框并打开(确定）
+			showConfirmModal(mIconType, mContent, callback) {
+				this.showModal({
+					iconType: mIconType,
+					content: mContent,
+					showCancelButton: false,
+					success: function(res) {
+						if (callback != undefined) {
+							if (res.confirm == true) {
+								callback(true);
+								console.log('用户点击确定')
+							} else {
+								callback(false);
+								console.log('用户点击取消')
+							}
+						}
+
+					}
+				});
+			},
+
+			// 打开消息弹框(取消+确定）
+			showSelectMessageModal(mContent, callback) {
+				this.showSelectModal("消息", mContent, callback);
+			},
+
+			// 打开成功弹框(取消+确定）
+			showSelectSuccessModal(mContent, callback) {
+				this.showSelectModal("成功", mContent, callback);
+			},
+
+			// 打开失败弹框(取消+确定）
+			showSelectFailModal(mContent, callback) {
+				this.showSelectModal("失败", mContent, callback);
+			},
+
+			// 打开警告弹框(取消+确定）
+			showSelectWarningModal(mContent, callback) {
+				this.showSelectModal("警告", mContent, callback);
+			},
+
+			// 打开疑问弹框(取消+确定）
+			showSelectQuestionModal(mContent, callback) {
+				this.showSelectModal("疑问", mContent, callback);
+			},
+
+			// 初始化弹框并打开(取消+确定）
+			showSelectModal(mIconType, mContent, callback) {
+				this.showModal({
+					iconType: mIconType,
+					content: mContent,
+					success: function(res) {
+						if (callback != undefined) {
+							if (res.confirm == true) {
+								callback(true);
+								console.log('用户点击确定')
+							} else {
+								callback(false);
+								console.log('用户点击取消')
+							}
+						}
+
+					}
+				});
+			},
+
+			// 打开消息弹框(确定+倒计时)
+			showConfirmCountdownMessageModal(mContent, callback) {
+				this.showConfirmCountdownModal("消息", mContent, callback);
+			},
+
+			// 打开成功弹框(确定+倒计时)
+			showConfirmCountdownSuccessModal(mContent, callback) {
+				this.showConfirmCountdownModal("成功", mContent, callback);
+			},
+
+			// 打开失败弹框(确定+倒计时)
+			showConfirmCountdownFailModal(mContent, callback) {
+				this.showConfirmCountdownModal("失败", mContent, callback);
+			},
+
+			// 打开警告弹框(确定+倒计时)
+			showConfirmCountdownWarningModal(mContent, callback) {
+				this.showConfirmCountdownModal("警告", mContent, callback);
+			},
+
+			// 打开疑问弹框(确定+倒计时)
+			showConfirmCountdownQuestionModal(mContent, callback) {
+				this.showConfirmCountdownModal("疑问", mContent, callback);
+			},
+
+			// 初始化弹框并打开(确定+倒计时)
+			showConfirmCountdownModal(mIconType, mContent, callback) {
+				this.showModal({
+					iconType: mIconType,
+					content: mContent,
+					showCancelButton: false,
+					showConfirmCountdown: true,
+					success: function(res) {
+						if (callback != undefined) {
+							if (res.confirm == true) {
+								callback(true);
+								console.log('用户点击确定')
+							} else {
+								callback(false);
+								console.log('用户点击取消')
+							}
+						}
+					}
+				});
+			},
+
+			// 打开消息弹框(取消+确定+倒计时)
+			showSelectCountdownMessageModal(mContent, callback) {
+				this.showSelectCountdownModal("消息", mContent, callback);
+			},
+
+			// 打开成功弹框(取消+确定+倒计时)
+			showSelectCountdownSuccessModal(mContent, callback) {
+				this.showSelectCountdownModal("成功", mContent, callback);
+			},
+
+			// 打开失败弹框(取消+确定+倒计时)
+			showSelectCountdownFailModal(mContent, callback) {
+				this.showSelectCountdownModal("失败", mContent, callback);
+			},
+
+			// 打开警告弹框(取消+确定+倒计时)
+			showSelectCountdownWarningModal(mContent, callback) {
+				this.showSelectCountdownModal("警告", mContent, callback);
+			},
+
+			// 打开疑问弹框(取消+确定+倒计时)
+			showSelectCountdownQuestionModal(mContent, callback) {
+				this.showSelectCountdownModal("疑问", mContent, callback);
+			},
+
+			// 初始化弹框并打开(取消+确定+倒计时)
+			showSelectCountdownModal(mIconType, mContent, callback) {
+				this.showModal({
+					iconType: mIconType,
+					content: mContent,
+					showConfirmCountdown: true,
+					success: function(res) {
+						if (callback != undefined) {
+							if (res.confirm == true) {
+								callback(true);
+								console.log('用户点击确定')
+							} else {
+								callback(false);
+								console.log('用户点击取消')
+							}
+						}
+					}
+				});
+			},
+
+			// 初始化弹框并打开
+			showModal(data) {
+				if (data.iconType) {
+					this.iconType = data.iconType
+					switch (data.iconType) {
+						case '消息':
+							this.icon = '/static/icons/error-circle.svg';
+							break;
+						case '成功':
+							this.icon = '/static/icons/checkmark-circle.svg';
+							break;
+						case '失败':
+							this.icon = '/static/icons/close-circle.svg';
+							break;
+						case '警告':
+							this.icon = '/static/icons/warning.svg';
+							break;
+						case '疑问':
+							this.icon = '/static/icons/question-circle.svg';
+							break;
+						default:
+							break;
+					}
+				}
+				// image
+				if (data.title) {
+					this.title = data.title
+				}
+				if (data.content) {
+					console.log(data.content);
+					this.content = data.content;
+				} else {
+					this.content = ''
+				}
+				if (data.cancelText) {
+					this.cancelText = data.cancelText
+				} else {
+					this.cancelText = '取消'
+				}
+				if (data.confirmText) {
+					this.confirmText = data.confirmText
+				} else {
+					this.confirmText = '确定'
+				}
+
+				if (data.showCancel === false || data.showCancel === true) {
+					this.showCancel = data.showCancel
+				} else {
+					this.showCancel = true
+				}
+
+				if (data.confirmColor) {
+					this.confirmColor = data.confirmColor
+				} else {
+					this.confirmColor = '#007aff'
+				}
+
+				if (data.cancelColor) {
+					this.cancelColor = data.cancelColor
+				} else {
+					this.cancelColor = '#666F83'
+				}
+
+				if (data.showConfirmButton === false || data.showConfirmButton === true) {
+					this.showConfirmButton = data.showConfirmButton
+				} else {
+					this.showConfirmButton = true
+				}
+
+				if (data.showConfirmCountdown === false || data.showConfirmCountdown === true) {
+					this.showConfirmCountdown = data.showConfirmCountdown
+				} else {
+					this.showConfirmCountdown = false
+				}
+
+				if (data.showCancelButton === false || data.showCancelButton === true) {
+					this.showCancelButton = data.showCancelButton
+				} else {
+					this.showCancelButton = true
+				}
+
+				if (data.success) {
+					this.success = data.success
+				} else {
+					this.success = () => {}
+				}
+				setTimeout(res => {
+					this.show = true;
+				}, 500)
+				if (this.showConfirmCountdown) {
+					this.startTimer();
+				}
+
+			},
+
+			startTimer() {
+				this.seconds = 3;
+				clearInterval(this.timer)
+				this.timer = setInterval(() => {
+					this.seconds--
+					// console.log("倒计时时间", this.seconds);
+					if (this.seconds <= 0) {
+						this.timeUp()
+						return
+					}
+				}, 1000)
+			},
+
+			timeUp() {
+				// clearInterval(this.timer)
+				console.log('时间到')
+				this.confirmClose();
+			},
+
+		},
+
+
+
+	}
+</script>
+<style lang="scss" scoped>
+	.slot-content {
+		font-size: 36rpx;
+		display: flex; //弹性布局
+		flex-direction: column; //垂直排列
+		align-items: center; //子元素居中
+		// background-image: url()
+	}
+
+	.icon {
+		width: 70rpx;
+		height: 70rpx;
+		opacity: 1; //透明度
+		margin-top: 16px;
+	}
+
+	.title {
+		font-size: 35rpx;
+	}
+
+	.content {
+		margin-top: 16px;
+		margin-bottom: 16px;
+		margin-left: 8px;
+		margin-right: 8px;
+		font-size: 32rpx;
+		text-align: center;
+		word-wrap: break-word;
+		word-break: break-all;
+		white-space: pre-line;
+
+
+	}
+
+	.cance_button {
+		width: 100%;
+		margin-top: 10px;
+		margin-bottom: 10px;
+		font-size: 32rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.confirm_button {
+		width: 100%;
+		margin-top: 10px;
+		margin-bottom: 10px;
+		font-size: 32rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.confirm_text {
+		// color: $uni-color-primary;
+	}
+
+	.def_text {
+		color: $uni-color-primary;
+	}
+</style>
diff --git a/components/tab-nvue/mediaList.vue b/components/tab-nvue/mediaList.vue
new file mode 100644
index 0000000..ea3d224
--- /dev/null
+++ b/components/tab-nvue/mediaList.vue
@@ -0,0 +1,175 @@
+<template>
+	<view class="view">
+		<view class="list-cell view" hover-class="uni-list-cell-hover" @click="bindClick">
+			<view class="media-list view" v-if="options.title">
+				<view class="view" :class="{'media-image-right': options.article_type === 2, 'media-image-left': options.article_type === 1}">
+					<text class="media-title" :class="{'media-title2': options.article_type === 1 || options.article_type === 2}">{{options.title}}</text>
+					<view v-if="options.image_list || options.image_url" class="image-section view" :class="{'image-section-right': options.article_type === 2, 'image-section-left': options.article_type === 1}">
+						<image class="image-list1" :class="{'image-list2': options.article_type === 1 || options.article_type === 2}"
+						 v-if="options.image_url" :src="options.image_url"></image>
+						<image class="image-list3" v-if="options.image_list" :src="source.url" v-for="(source, i) in options.image_list"
+						 :key="i" />
+					</view>
+				</view>
+				<view class="media-foot view">
+					<view class="media-info view">
+						<text class="info-text">{{options.source}}</text>
+						<text class="info-text">{{options.comment_count}}条评论</text>
+						<text class="info-text">{{options.datetime}}</text>
+					</view>
+					<view class="max-close-view view" @click.stop="close">
+						<view class="close-view view"><text class="close">×</text></view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			options: {
+				type: Object,
+				default: function(e) {
+					return {}
+				}
+			}
+		},
+		methods: {
+			close(e) {
+				this.$emit('close');
+			},
+			bindClick() {
+				this.$emit('click');
+			}
+		}
+	}
+</script>
+
+<style>
+	.view {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+	}
+
+	.list-cell {
+		width: 750rpx;
+		padding: 0 30rpx;
+	}
+
+	.uni-list-cell-hover {
+		background-color: #eeeeee;
+	}
+
+	.media-list {
+		flex: 1;
+		flex-direction: column;
+		border-bottom-width: 1rpx;
+		border-bottom-style: solid;
+		border-bottom-color: #c8c7cc;
+		padding: 20rpx 0;
+	}
+
+	.media-image-right {
+		flex-direction: row;
+	}
+
+	.media-image-left {
+		flex-direction: row-reverse;
+	}
+
+	.media-title {
+		flex: 1;
+	}
+
+	.media-title {
+		lines: 3;
+		text-overflow: ellipsis;
+		font-size: 32rpx;
+		color: #555555;
+	}
+
+	.media-title2 {
+		flex: 1;
+		margin-top: 6rpx;
+		line-height: 40rpx;
+	}
+
+	.image-section {
+		margin-top: 20rpx;
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.image-section-right {
+		margin-top: 0rpx;
+		margin-left: 10rpx;
+		width: 225rpx;
+		height: 146rpx;
+	}
+
+	.image-section-left {
+		margin-top: 0rpx;
+		margin-right: 10rpx;
+		width: 225rpx;
+		height: 146rpx;
+	}
+
+	.image-list1 {
+		width: 690rpx;
+		height: 481rpx;
+	}
+
+	.image-list2 {
+		width: 225rpx;
+		height: 146rpx;
+	}
+
+	.image-list3 {
+		width: 225rpx;
+		height: 146rpx;
+	}
+
+	.media-info {
+		flex-direction: row;
+	}
+
+	.info-text {
+		margin-right: 20rpx;
+		color: #999999;
+		font-size: 24rpx;
+	}
+
+	.media-foot {
+		margin-top: 20rpx;
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.max-close-view {
+		align-items: center;
+		justify-content: flex-end;
+		flex-direction: row;
+		height: 40rpx;
+		width: 80rpx;
+	}
+
+	.close-view {
+		border-style: solid;
+		border-width: 1px;
+		border-color: #999999;
+		border-radius: 10rpx;
+		justify-content: center;
+		height: 30rpx;
+		width: 40rpx;
+		line-height: 30rpx;
+	}
+
+	.close {
+		text-align: center;
+		color: #999999;
+		font-size: 28rpx;
+	}
+</style>
diff --git a/components/u-charts/u-charts.js b/components/u-charts/u-charts.js
new file mode 100644
index 0000000..3b1b798
--- /dev/null
+++ b/components/u-charts/u-charts.js
@@ -0,0 +1,5046 @@
+/*
+ * uCharts v1.8.5.20190815
+ * uni-app平台高性能跨全端图表，支持H5、APP、小程序（微信/支付宝/百度/头条/QQ/360）
+ * Copyright (c) 2019 QIUN秋云 https://www.ucharts.cn All rights reserved.
+ * Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+ *
+ * uCharts官方网站
+ * https://www.uCharts.cn
+ *
+ * 开源地址:
+ * https://gitee.com/uCharts/uCharts
+ *
+ * uni-app插件市场地址：
+ * http://ext.dcloud.net.cn/plugin?id=271
+ *
+ */
+
+'use strict';
+
+var config = {
+  yAxisWidth: 15,
+  yAxisSplit: 5,
+  xAxisHeight: 15,
+  xAxisLineHeight: 15,
+  legendHeight: 15,
+  yAxisTitleWidth: 15,
+  padding: [10, 10, 10, 10],
+  pixelRatio: 1,
+  rotate: false,
+  columePadding: 3,
+  fontSize: 13,
+  //dataPointShape: ['diamond', 'circle', 'triangle', 'rect'],
+  dataPointShape: ['circle', 'circle', 'circle', 'circle'],
+  colors: ['#1890ff', '#2fc25b', '#facc14', '#f04864', '#8543e0', '#90ed7d'],
+  pieChartLinePadding: 15,
+  pieChartTextPadding: 5,
+  xAxisTextPadding: 3,
+  titleColor: '#333333',
+  titleFontSize: 20,
+  subtitleColor: '#999999',
+  subtitleFontSize: 15,
+  toolTipPadding: 3,
+  toolTipBackground: '#000000',
+  toolTipOpacity: 0.7,
+  toolTipLineHeight: 20,
+  radarGridCount: 3,
+  radarLabelTextMargin: 15,
+  gaugeLabelTextMargin: 15
+};
+
+let assign;
+if (Object.assign) {
+  assign = Object.assign;
+} else {
+  // 使用polyfill
+  assign = function(target, varArgs) {
+    if (target == null) {
+      throw new TypeError('Cannot convert undefined or null to object');
+    }
+    var to = Object(target);
+    for (var index = 1; index < arguments.length; index++) {
+      var nextSource = arguments[index];
+      if (nextSource != null) {
+        for (var nextKey in nextSource) {
+          if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
+            to[nextKey] = nextSource[nextKey];
+          }
+        }
+      }
+    }
+    return to;
+  }
+}
+
+var util = {
+  toFixed: function toFixed(num, limit) {
+    limit = limit || 2;
+    if (this.isFloat(num)) {
+      num = num.toFixed(limit);
+    }
+    return num;
+  },
+  isFloat: function isFloat(num) {
+    return num % 1 !== 0;
+  },
+  approximatelyEqual: function approximatelyEqual(num1, num2) {
+    return Math.abs(num1 - num2) < 1e-10;
+  },
+  isSameSign: function isSameSign(num1, num2) {
+    return Math.abs(num1) === num1 && Math.abs(num2) === num2 || Math.abs(num1) !== num1 && Math.abs(num2) !== num2;
+  },
+  isSameXCoordinateArea: function isSameXCoordinateArea(p1, p2) {
+    return this.isSameSign(p1.x, p2.x);
+  },
+  isCollision: function isCollision(obj1, obj2) {
+    obj1.end = {};
+    obj1.end.x = obj1.start.x + obj1.width;
+    obj1.end.y = obj1.start.y - obj1.height;
+    obj2.end = {};
+    obj2.end.x = obj2.start.x + obj2.width;
+    obj2.end.y = obj2.start.y - obj2.height;
+    var flag = obj2.start.x > obj1.end.x || obj2.end.x < obj1.start.x || obj2.end.y > obj1.start.y || obj2.start.y < obj1.end.y;
+    return !flag;
+  }
+};
+
+//兼容H5点击事件
+function getH5Offset(e) {
+  e.mp = {
+    changedTouches: []
+  };
+  e.mp.changedTouches.push({
+    x: e.offsetX,
+    y: e.offsetY
+  });
+  return e;
+}
+
+// hex 转 rgba
+function hexToRgb(hexValue, opc) {
+  var rgx = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
+  var hex = hexValue.replace(rgx, function(m, r, g, b) {
+    return r + r + g + g + b + b;
+  });
+  var rgb = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+  var r = parseInt(rgb[1], 16);
+  var g = parseInt(rgb[2], 16);
+  var b = parseInt(rgb[3], 16);
+  return 'rgba(' + r + ',' + g + ',' + b + ',' + opc + ')';
+}
+
+function findRange(num, type, limit) {
+  if (isNaN(num)) {
+    throw new Error('[uCharts] unvalid series data!');
+  }
+  limit = limit || 10;
+  type = type ? type : 'upper';
+  var multiple = 1;
+  while (limit < 1) {
+    limit *= 10;
+    multiple *= 10;
+  }
+  if (type === 'upper') {
+    num = Math.ceil(num * multiple);
+  } else {
+    num = Math.floor(num * multiple);
+  }
+  while (num % limit !== 0) {
+    if (type === 'upper') {
+      num++;
+    } else {
+      num--;
+    }
+  }
+  return num / multiple;
+}
+
+function calCandleMA(dayArr, nameArr, colorArr, kdata) {
+  let seriesTemp = [];
+  for (let k = 0; k < dayArr.length; k++) {
+    let seriesItem = {
+      data: [],
+      name: nameArr[k],
+      color: colorArr[k]
+    };
+    for (let i = 0, len = kdata.length; i < len; i++) {
+      if (i < dayArr[k]) {
+        seriesItem.data.push(null);
+        continue;
+      }
+      let sum = 0;
+      for (let j = 0; j < dayArr[k]; j++) {
+        sum += kdata[i - j][1];
+      }
+      seriesItem.data.push(+(sum / dayArr[k]).toFixed(3));
+    }
+    seriesTemp.push(seriesItem);
+  }
+  return seriesTemp;
+}
+
+function calValidDistance(distance, chartData, config, opts) {
+  var dataChartAreaWidth = opts.width - opts.area[1] - opts.area[3];
+  var dataChartWidth = chartData.eachSpacing * (opts.chartData.xAxisData.xAxisPoints.length-1);
+  var validDistance = distance;
+  if (distance >= 0) {
+    validDistance = 0;
+  } else if (Math.abs(distance) >= dataChartWidth - dataChartAreaWidth) {
+    validDistance = dataChartAreaWidth - dataChartWidth;
+  }
+  return validDistance;
+}
+
+function isInAngleRange(angle, startAngle, endAngle) {
+  function adjust(angle) {
+    while (angle < 0) {
+      angle += 2 * Math.PI;
+    }
+    while (angle > 2 * Math.PI) {
+      angle -= 2 * Math.PI;
+    }
+    return angle;
+  }
+  angle = adjust(angle);
+  startAngle = adjust(startAngle);
+  endAngle = adjust(endAngle);
+  if (startAngle > endAngle) {
+    endAngle += 2 * Math.PI;
+    if (angle < startAngle) {
+      angle += 2 * Math.PI;
+    }
+  }
+  return angle >= startAngle && angle <= endAngle;
+}
+
+function calRotateTranslate(x, y, h) {
+  var xv = x;
+  var yv = h - y;
+  var transX = xv + (h - yv - xv) / Math.sqrt(2);
+  transX *= -1;
+  var transY = (h - yv) * (Math.sqrt(2) - 1) - (h - yv - xv) / Math.sqrt(2);
+  return {
+    transX: transX,
+    transY: transY
+  };
+}
+
+function createCurveControlPoints(points, i) {
+
+  function isNotMiddlePoint(points, i) {
+    if (points[i - 1] && points[i + 1]) {
+      return points[i].y >= Math.max(points[i - 1].y, points[i + 1].y) || points[i].y <= Math.min(points[i - 1].y,
+        points[
+          i + 1].y);
+    } else {
+      return false;
+    }
+  }
+  var a = 0.2;
+  var b = 0.2;
+  var pAx = null;
+  var pAy = null;
+  var pBx = null;
+  var pBy = null;
+  if (i < 1) {
+    pAx = points[0].x + (points[1].x - points[0].x) * a;
+    pAy = points[0].y + (points[1].y - points[0].y) * a;
+  } else {
+    pAx = points[i].x + (points[i + 1].x - points[i - 1].x) * a;
+    pAy = points[i].y + (points[i + 1].y - points[i - 1].y) * a;
+  }
+
+  if (i > points.length - 3) {
+    var last = points.length - 1;
+    pBx = points[last].x - (points[last].x - points[last - 1].x) * b;
+    pBy = points[last].y - (points[last].y - points[last - 1].y) * b;
+  } else {
+    pBx = points[i + 1].x - (points[i + 2].x - points[i].x) * b;
+    pBy = points[i + 1].y - (points[i + 2].y - points[i].y) * b;
+  }
+  if (isNotMiddlePoint(points, i + 1)) {
+    pBy = points[i + 1].y;
+  }
+  if (isNotMiddlePoint(points, i)) {
+    pAy = points[i].y;
+  }
+  return {
+    ctrA: {
+      x: pAx,
+      y: pAy
+    },
+    ctrB: {
+      x: pBx,
+      y: pBy
+    }
+  };
+}
+
+function convertCoordinateOrigin(x, y, center) {
+  return {
+    x: center.x + x,
+    y: center.y - y
+  };
+}
+
+function avoidCollision(obj, target) {
+  if (target) {
+    // is collision test
+    while (util.isCollision(obj, target)) {
+      if (obj.start.x > 0) {
+        obj.start.y--;
+      } else if (obj.start.x < 0) {
+        obj.start.y++;
+      } else {
+        if (obj.start.y > 0) {
+          obj.start.y++;
+        } else {
+          obj.start.y--;
+        }
+      }
+    }
+  }
+  return obj;
+}
+
+function fillSeries(series, opts, config) {
+  var index = 0;
+  return series.map(function(item) {
+    if (!item.color) {
+      item.color = config.colors[index];
+      index = (index + 1) % config.colors.length;
+    }
+    if (!item.type) {
+      item.type = opts.type;
+    }
+    if (typeof item.show == "undefined") {
+      item.show = true;
+    }
+    if (!item.type) {
+      item.type = opts.type;
+    }
+    if (!item.pointShape) {
+      item.pointShape = "circle";
+    }
+    if (!item.legendShape) {
+      switch (item.type) {
+        case 'line':
+          item.legendShape = "line";
+          break;
+        case 'column':
+          item.legendShape = "rect";
+          break;
+        case 'area':
+          item.legendShape = "triangle";
+          break;
+        default:
+          item.legendShape = "circle";
+      }
+    }
+    return item;
+  });
+}
+
+function getDataRange(minData, maxData) {
+  var limit = 0;
+  var range = maxData - minData;
+  if (range >= 10000) {
+    limit = 1000;
+  } else if (range >= 1000) {
+    limit = 100;
+  } else if (range >= 100) {
+    limit = 10;
+  } else if (range >= 10) {
+    limit = 5;
+  } else if (range >= 1) {
+    limit = 1;
+  } else if (range >= 0.1) {
+    limit = 0.1;
+  } else if (range >= 0.01) {
+    limit = 0.01;
+  } else if (range >= 0.001) {
+    limit = 0.001;
+  } else if (range >= 0.0001) {
+    limit = 0.0001;
+  } else if (range >= 0.00001) {
+    limit = 0.00001;
+  } else {
+    limit = 0.000001;
+  }
+  return {
+    minRange: findRange(minData, 'lower', limit),
+    maxRange: findRange(maxData, 'upper', limit)
+  };
+}
+
+function measureText(text) {
+  var fontSize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : config.fontSize;
+  text = String(text);
+  var text = text.split('');
+  var width = 0;
+  for (let i = 0; i < text.length; i++) {
+    let item = text[i];
+    if (/[a-zA-Z]/.test(item)) {
+      width += 7;
+    } else if (/[0-9]/.test(item)) {
+      width += 5.5;
+    } else if (/\./.test(item)) {
+      width += 2.7;
+    } else if (/-/.test(item)) {
+      width += 3.25;
+    } else if (/[\u4e00-\u9fa5]/.test(item)) {
+      width += 10;
+    } else if (/\(|\)/.test(item)) {
+      width += 3.73;
+    } else if (/\s/.test(item)) {
+      width += 2.5;
+    } else if (/%/.test(item)) {
+      width += 8;
+    } else {
+      width += 10;
+    }
+  }
+  return width * fontSize / 10;
+}
+
+function dataCombine(series) {
+  return series.reduce(function(a, b) {
+    return (a.data ? a.data : a).concat(b.data);
+  }, []);
+}
+
+function dataCombineStack(series, len) {
+  var sum = new Array(len);
+  for (var j = 0; j < sum.length; j++) {
+    sum[j] = 0;
+  }
+  for (var i = 0; i < series.length; i++) {
+    for (var j = 0; j < sum.length; j++) {
+      sum[j] += series[i].data[j];
+    }
+  }
+  return series.reduce(function(a, b) {
+    return (a.data ? a.data : a).concat(b.data).concat(sum);
+  }, []);
+}
+
+function getTouches(touches, opts, e) {
+  let x, y;
+  if (touches.clientX) {
+    if (opts.rotate) {
+      y = opts.height - touches.clientX * opts.pixelRatio;
+      x = (touches.pageY - e.currentTarget.offsetTop - (opts.height / opts.pixelRatio / 2) * (opts.pixelRatio - 1)) *
+        opts.pixelRatio;
+    } else {
+      x = touches.clientX * opts.pixelRatio;
+      y = (touches.pageY - e.currentTarget.offsetTop - (opts.height / opts.pixelRatio / 2) * (opts.pixelRatio - 1)) *
+        opts.pixelRatio;
+    }
+  } else {
+    if (opts.rotate) {
+      y = opts.height - touches.x * opts.pixelRatio;
+      x = touches.y * opts.pixelRatio;
+    } else {
+      x = touches.x * opts.pixelRatio;
+      y = touches.y * opts.pixelRatio;
+    }
+  }
+  return {
+    x: x,
+    y: y
+  }
+}
+
+function getSeriesDataItem(series, index) {
+  var data = [];
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    if (item.data[index] !== null && typeof item.data[index] !== 'undefined' && item.show) {
+      let seriesItem = {};
+      seriesItem.color = item.color;
+      seriesItem.type = item.type;
+      seriesItem.style = item.style;
+      seriesItem.pointShape = item.pointShape;
+      seriesItem.disableLegend = item.disableLegend;
+      seriesItem.name = item.name;
+      seriesItem.show = item.show;
+      seriesItem.data = item.format ? item.format(item.data[index]) : item.data[index];
+      data.push(seriesItem);
+    }
+  }
+  return data;
+}
+
+function getMaxTextListLength(list) {
+  var lengthList = list.map(function(item) {
+    return measureText(item);
+  });
+  return Math.max.apply(null, lengthList);
+}
+
+function getRadarCoordinateSeries(length) {
+  var eachAngle = 2 * Math.PI / length;
+  var CoordinateSeries = [];
+  for (var i = 0; i < length; i++) {
+    CoordinateSeries.push(eachAngle * i);
+  }
+
+  return CoordinateSeries.map(function(item) {
+    return -1 * item + Math.PI / 2;
+  });
+}
+
+function getToolTipData(seriesData, calPoints, index, categories) {
+  var option = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+
+  var textList = seriesData.map(function(item) {
+    return {
+      text: option.format ? option.format(item, categories[index]) : item.name + ': ' + item.data,
+      color: item.color
+    };
+  });
+  var validCalPoints = [];
+  var offset = {
+    x: 0,
+    y: 0
+  };
+  for (let i = 0; i < calPoints.length; i++) {
+    let points = calPoints[i];
+    if (typeof points[index] !== 'undefined' && points[index] !== null) {
+      validCalPoints.push(points[index]);
+    }
+  }
+  for (let i = 0; i < validCalPoints.length; i++) {
+    let item = validCalPoints[i];
+    offset.x = Math.round(item.x);
+    offset.y += item.y;
+  }
+  offset.y /= validCalPoints.length;
+  return {
+    textList: textList,
+    offset: offset
+  };
+}
+
+function getMixToolTipData(seriesData, calPoints, index, categories) {
+  var option = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+  var textList = seriesData.map(function(item) {
+    return {
+      text: option.format ? option.format(item, categories[index]) : item.name + ': ' + item.data,
+      color: item.color,
+      disableLegend: item.disableLegend ? true : false
+    };
+  });
+  textList = textList.filter(function(item) {
+    if (item.disableLegend !== true) {
+      return item;
+    }
+  });
+  var validCalPoints = [];
+  var offset = {
+    x: 0,
+    y: 0
+  };
+  for (let i = 0; i < calPoints.length; i++) {
+    let points = calPoints[i];
+    if (typeof points[index] !== 'undefined' && points[index] !== null) {
+      validCalPoints.push(points[index]);
+    }
+  }
+  for (let i = 0; i < validCalPoints.length; i++) {
+    let item = validCalPoints[i];
+    offset.x = Math.round(item.x);
+    offset.y += item.y;
+  }
+  offset.y /= validCalPoints.length;
+  return {
+    textList: textList,
+    offset: offset
+  };
+}
+
+function getCandleToolTipData(series, seriesData, calPoints, index, categories, extra) {
+  var option = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
+  let upColor = extra.color.upFill;
+  let downColor = extra.color.downFill;
+  //颜色顺序为开盘，收盘，最低，最高
+  let color = [upColor, upColor, downColor, upColor];
+  var textList = [];
+  let text0 = {
+    text: categories[index],
+    color: null
+  };
+  textList.push(text0);
+  seriesData.map(function(item) {
+    if (index == 0 && item.data[1] - item.data[0] < 0) {
+      color[1] = downColor;
+    } else {
+      if (item.data[0] < series[index - 1][1]) {
+        color[0] = downColor;
+      }
+      if (item.data[1] < item.data[0]) {
+        color[1] = downColor;
+      }
+      if (item.data[2] > series[index - 1][1]) {
+        color[2] = upColor;
+      }
+      if (item.data[3] < series[index - 1][1]) {
+        color[3] = downColor;
+      }
+    }
+    let text1 = {
+      text: '开盘：' + item.data[0],
+      color: color[0]
+    };
+    let text2 = {
+      text: '收盘：' + item.data[1],
+      color: color[1]
+    };
+    let text3 = {
+      text: '最低：' + item.data[2],
+      color: color[2]
+    };
+    let text4 = {
+      text: '最高：' + item.data[3],
+      color: color[3]
+    };
+    textList.push(text1, text2, text3, text4);
+  });
+  var validCalPoints = [];
+  var offset = {
+    x: 0,
+    y: 0
+  };
+  for (let i = 0; i < calPoints.length; i++) {
+    let points = calPoints[i];
+    if (typeof points[index] !== 'undefined' && points[index] !== null) {
+      validCalPoints.push(points[index]);
+    }
+  }
+  offset.x = Math.round(validCalPoints[0][0].x);
+  return {
+    textList: textList,
+    offset: offset
+  };
+}
+
+function filterSeries(series) {
+  let tempSeries = [];
+  for (let i = 0; i < series.length; i++) {
+    if (series[i].show == true) {
+      tempSeries.push(series[i])
+    }
+  }
+  return tempSeries;
+}
+
+function findCurrentIndex(currentPoints, xAxisPoints, opts, config) {
+  var offset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+  var currentIndex = -1;
+  var spacing = 0;
+  if((opts.type=='line' || opts.type=='area') && opts.xAxis.boundaryGap=='justify'){
+    spacing = opts.chartData.eachSpacing/2;
+  }
+  if (isInExactChartArea(currentPoints, opts, config)) {
+    xAxisPoints.forEach(function(item, index) {
+      if (currentPoints.x + offset + spacing > item) {
+        currentIndex = index;
+      }
+    });
+  }
+  return currentIndex;
+}
+
+function findLegendIndex(currentPoints, legendData, opts) {
+  let currentIndex = -1;
+  if (isInExactLegendArea(currentPoints, legendData.area)) {
+    let points = legendData.points;
+    let index = -1;
+    for (let i = 0, len = points.length; i < len; i++) {
+      let item = points[i];
+      for (let j = 0; j < item.length; j++) {
+        index += 1;
+        let area = item[j]['area'];
+        if (currentPoints.x > area[0] && currentPoints.x < area[2] && currentPoints.y > area[1] && currentPoints.y < area[3]) {
+          currentIndex = index;
+          break;
+        }
+      }
+    }
+    return currentIndex;
+  }
+  return currentIndex;
+}
+
+function isInExactLegendArea(currentPoints, area) {
+  return currentPoints.x > area.start.x && currentPoints.x < area.end.x && currentPoints.y > area.start.y &&
+    currentPoints.y < area.end.y;
+}
+
+function isInExactChartArea(currentPoints, opts, config) {
+  return currentPoints.x < opts.width - opts.area[1] + 10 && currentPoints.x > opts.area[3] -10 && currentPoints.y > opts.area[0] && currentPoints.y < opts.height - opts.area[2];
+}
+
+function findRadarChartCurrentIndex(currentPoints, radarData, count) {
+  var eachAngleArea = 2 * Math.PI / count;
+  var currentIndex = -1;
+  if (isInExactPieChartArea(currentPoints, radarData.center, radarData.radius)) {
+    var fixAngle = function fixAngle(angle) {
+      if (angle < 0) {
+        angle += 2 * Math.PI;
+      }
+      if (angle > 2 * Math.PI) {
+        angle -= 2 * Math.PI;
+      }
+      return angle;
+    };
+
+    var angle = Math.atan2(radarData.center.y - currentPoints.y, currentPoints.x - radarData.center.x);
+    angle = -1 * angle;
+    if (angle < 0) {
+      angle += 2 * Math.PI;
+    }
+
+    var angleList = radarData.angleList.map(function(item) {
+      item = fixAngle(-1 * item);
+
+      return item;
+    });
+
+    angleList.forEach(function(item, index) {
+      var rangeStart = fixAngle(item - eachAngleArea / 2);
+      var rangeEnd = fixAngle(item + eachAngleArea / 2);
+      if (rangeEnd < rangeStart) {
+        rangeEnd += 2 * Math.PI;
+      }
+      if (angle >= rangeStart && angle <= rangeEnd || angle + 2 * Math.PI >= rangeStart && angle + 2 * Math.PI <=
+        rangeEnd) {
+        currentIndex = index;
+      }
+    });
+  }
+
+  return currentIndex;
+}
+
+function findFunnelChartCurrentIndex(currentPoints, funnelData) {
+  var currentIndex = -1;
+  for (var i = 0, len = funnelData.series.length; i < len; i++) {
+    var item = funnelData.series[i];
+    if (currentPoints.x > item.funnelArea[0] && currentPoints.x < item.funnelArea[2] && currentPoints.y > item.funnelArea[1] && currentPoints.y < item.funnelArea[3]) {
+      currentIndex = i;
+      break;
+    }
+  }
+  return currentIndex;
+}
+
+function findWordChartCurrentIndex(currentPoints, wordData) {
+  var currentIndex = -1;
+  for (var i = 0, len = wordData.length; i < len; i++) {
+    var item = wordData[i];
+    if (currentPoints.x > item.area[0] && currentPoints.x < item.area[2] && currentPoints.y > item.area[1] && currentPoints.y < item.area[3]) {
+      currentIndex = i;
+      break;
+    }
+  }
+  return currentIndex;
+}
+
+function findMapChartCurrentIndex(currentPoints, opts) {
+  var currentIndex = -1;
+  var cData=opts.chartData.mapData;
+  var data=opts.series;
+  var tmp=pointToCoordinate(currentPoints.y, currentPoints.x,cData.bounds,cData.scale,cData.xoffset,cData.yoffset);
+  var poi=[tmp.x, tmp.y];
+  for (var i = 0, len = data.length; i < len; i++) {
+    var item = data[i].geometry.coordinates;
+    if(isPoiWithinPoly(poi,item)){
+      currentIndex = i;
+      break;
+    }
+  }
+  return currentIndex;
+}
+
+function findPieChartCurrentIndex(currentPoints, pieData) {
+  var currentIndex = -1;
+  if (isInExactPieChartArea(currentPoints, pieData.center, pieData.radius)) {
+    var angle = Math.atan2(pieData.center.y - currentPoints.y, currentPoints.x - pieData.center.x);
+    angle = -angle;
+    for (var i = 0, len = pieData.series.length; i < len; i++) {
+      var item = pieData.series[i];
+      if (isInAngleRange(angle, item._start_, item._start_ + item._proportion_ * 2 * Math.PI)) {
+        currentIndex = i;
+        break;
+      }
+    }
+  }
+
+  return currentIndex;
+}
+
+function isInExactPieChartArea(currentPoints, center, radius) {
+  return Math.pow(currentPoints.x - center.x, 2) + Math.pow(currentPoints.y - center.y, 2) <= Math.pow(radius, 2);
+}
+
+function splitPoints(points) {
+  var newPoints = [];
+  var items = [];
+  points.forEach(function(item, index) {
+    if (item !== null) {
+      items.push(item);
+    } else {
+      if (items.length) {
+        newPoints.push(items);
+      }
+      items = [];
+    }
+  });
+  if (items.length) {
+    newPoints.push(items);
+  }
+
+  return newPoints;
+}
+
+function calLegendData(series, opts, config, chartData) {
+  let legendData = {
+    area: {
+      start: {
+        x: 0,
+        y: 0
+      },
+      end: {
+        x: 0,
+        y: 0
+      },
+      width: 0,
+      height: 0,
+      wholeWidth: 0,
+      wholeHeight: 0
+    },
+    points: [],
+    widthArr: [],
+    heightArr: []
+  };
+  if (opts.legend.show === false) {
+    chartData.legendData = legendData;
+    return legendData;
+  }
+
+  let padding = opts.legend.padding;
+  let margin = opts.legend.margin;
+  let fontSize = opts.legend.fontSize;
+  let shapeWidth = 15 * opts.pixelRatio;
+  let shapeRight = 5 * opts.pixelRatio;
+  let lineHeight = Math.max(opts.legend.lineHeight * opts.pixelRatio, fontSize);
+  if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
+    let legendList = [];
+    let widthCount = 0;
+    let widthCountArr = [];
+    let currentRow = [];
+    for (let i = 0; i < series.length; i++) {
+      let item = series[i];
+      let itemWidth = shapeWidth + shapeRight + measureText(item.name || 'undefined', fontSize) + opts.legend.itemGap;
+      if (widthCount + itemWidth > opts.width - opts.padding[1] - opts.padding[3]) {
+        legendList.push(currentRow);
+        widthCountArr.push(widthCount - opts.legend.itemGap);
+        widthCount = itemWidth;
+        currentRow = [item];
+      } else {
+        widthCount += itemWidth;
+        currentRow.push(item);
+      }
+    }
+    if (currentRow.length) {
+      legendList.push(currentRow);
+      widthCountArr.push(widthCount - opts.legend.itemGap);
+      legendData.widthArr = widthCountArr;
+      let legendWidth = Math.max.apply(null, widthCountArr);
+      switch (opts.legend.float) {
+        case 'left':
+          legendData.area.start.x = opts.padding[3];
+          legendData.area.end.x = opts.padding[3] + 2 * padding;
+          break;
+        case 'right':
+          legendData.area.start.x = opts.width - opts.padding[1] - legendWidth - 2 * padding;
+          legendData.area.end.x = opts.width - opts.padding[1];
+          break;
+        default:
+          legendData.area.start.x = (opts.width - legendWidth) / 2 - padding;
+          legendData.area.end.x = (opts.width + legendWidth) / 2 + padding;
+      }
+      legendData.area.width = legendWidth + 2 * padding;
+      legendData.area.wholeWidth = legendWidth + 2 * padding;
+      legendData.area.height = legendList.length * lineHeight + 2 * padding;
+      legendData.area.wholeHeight = legendList.length * lineHeight + 2 * padding + 2 * margin;
+      legendData.points = legendList;
+    }
+  } else {
+    let len = series.length;
+    let maxHeight = opts.height - opts.padding[0] - opts.padding[2] - 2 * margin - 2 * padding;
+    let maxLength = Math.min(Math.floor(maxHeight / lineHeight), len);
+    legendData.area.height = maxLength * lineHeight + padding * 2;
+    legendData.area.wholeHeight = maxLength * lineHeight + padding * 2;
+    switch (opts.legend.float) {
+      case 'top':
+        legendData.area.start.y = opts.padding[0] + margin;
+        legendData.area.end.y = opts.padding[0] + margin + legendData.area.height;
+        break;
+      case 'bottom':
+        legendData.area.start.y = opts.height - opts.padding[2] - margin - legendData.area.height;
+        legendData.area.end.y = opts.height - opts.padding[2] - margin;
+        break;
+      default:
+        legendData.area.start.y = (opts.height - legendData.area.height) / 2;
+        legendData.area.end.y = (opts.height + legendData.area.height) / 2;
+    }
+    let lineNum = len % maxLength === 0 ? len / maxLength : Math.floor((len / maxLength) + 1);
+    let currentRow = [];
+    for (let i = 0; i < lineNum; i++) {
+      let temp = series.slice(i * maxLength, i * maxLength + maxLength);
+      currentRow.push(temp);
+    }
+
+    legendData.points = currentRow;
+
+    if (currentRow.length) {
+      for (let i = 0; i < currentRow.length; i++) {
+        let item = currentRow[i];
+        let maxWidth = 0;
+        for (let j = 0; j < item.length; j++) {
+          let itemWidth = shapeWidth + shapeRight + measureText(item[j].name || 'undefined', fontSize) + opts.legend.itemGap;
+          if (itemWidth > maxWidth) {
+            maxWidth = itemWidth;
+          }
+        }
+        legendData.widthArr.push(maxWidth);
+        legendData.heightArr.push(item.length * lineHeight + padding * 2);
+      }
+      let legendWidth = 0
+      for (let i = 0; i < legendData.widthArr.length; i++) {
+        legendWidth += legendData.widthArr[i];
+      }
+      legendData.area.width = legendWidth - opts.legend.itemGap + 2 * padding;
+      legendData.area.wholeWidth = legendData.area.width + padding;
+    }
+  }
+
+  switch (opts.legend.position) {
+    case 'top':
+      legendData.area.start.y = opts.padding[0] + margin;
+      legendData.area.end.y = opts.padding[0] + margin + legendData.area.height;
+      break;
+    case 'bottom':
+      legendData.area.start.y = opts.height - opts.padding[2] - legendData.area.height - margin;
+      legendData.area.end.y = opts.height - opts.padding[2] - margin;
+      break;
+    case 'left':
+      legendData.area.start.x = opts.padding[3];
+      legendData.area.end.x = opts.padding[3] + legendData.area.width;
+      break;
+    case 'right':
+      legendData.area.start.x = opts.width - opts.padding[1] - legendData.area.width;
+      legendData.area.end.x = opts.width - opts.padding[1];
+      break;
+  }
+  chartData.legendData = legendData;
+  return legendData;
+}
+
+function calCategoriesData(categories, opts, config, eachSpacing) {
+  var result = {
+    angle: 0,
+    xAxisHeight: config.xAxisHeight
+  };
+  var categoriesTextLenth = categories.map(function(item) {
+    return measureText(item);
+  });
+  var maxTextLength = Math.max.apply(this, categoriesTextLenth);
+
+  if (opts.xAxis.rotateLabel == true && maxTextLength + 2 * config.xAxisTextPadding > eachSpacing) {
+    result.angle = 45 * Math.PI / 180;
+    result.xAxisHeight = 2 * config.xAxisTextPadding + maxTextLength * Math.sin(result.angle);
+  }
+  return result;
+}
+
+function getRadarDataPoints(angleList, center, radius, series, opts) {
+  var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+
+  var radarOption = opts.extra.radar || {};
+  radarOption.max = radarOption.max || 0;
+  var maxData = Math.max(radarOption.max, Math.max.apply(null, dataCombine(series)));
+
+  var data = [];
+  for (let i = 0; i < series.length; i++) {
+    let each = series[i];
+    let listItem = {};
+    listItem.color = each.color;
+    listItem.data = [];
+    each.data.forEach(function(item, index) {
+      let tmp = {};
+      tmp.angle = angleList[index];
+
+      tmp.proportion = item / maxData;
+      tmp.position = convertCoordinateOrigin(radius * tmp.proportion * process * Math.cos(tmp.angle), radius * tmp.proportion *
+        process * Math.sin(tmp.angle), center);
+      listItem.data.push(tmp);
+    });
+
+    data.push(listItem);
+  }
+
+  return data;
+}
+
+function getPieDataPoints(series, radius) {
+  var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+
+  var count = 0;
+  var _start_ = 0;
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    count += item.data;
+  }
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    if (count === 0) {
+      item._proportion_ = 1 / series.length * process;
+    } else {
+      item._proportion_ = item.data / count * process;
+    }
+    item._radius_ = radius;
+  }
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item._start_ = _start_;
+    _start_ += 2 * item._proportion_ * Math.PI;
+  }
+
+  return series;
+}
+
+function getFunnelDataPoints(series, radius) {
+  var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  series = series.sort(function(a,b){return parseInt(b.data)-parseInt(a.data);});
+  for (let i = 0; i < series.length; i++) {
+    series[i].radius = series[i].data/series[0].data*radius*process;
+    series[i]._proportion_ = series[i].data/series[0].data;
+  }
+  return series.reverse();
+}
+
+function getRoseDataPoints(series, type, minRadius, radius) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var count = 0;
+  var _start_ = 0;
+
+  var dataArr = [];
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    count += item.data;
+    dataArr.push(item.data);
+  }
+
+  var minData = Math.min.apply(null, dataArr);
+  var maxData = Math.max.apply(null, dataArr);
+  var radiusLength = radius - minRadius;
+
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    if (count === 0 || type == 'area') {
+      item._proportion_ = item.data / count * process;
+      item._rose_proportion_ = 1 / series.length * process;
+    } else {
+      item._proportion_ = item.data / count * process;
+      item._rose_proportion_ = item.data / count * process;
+    }
+    item._radius_ = minRadius + radiusLength * ((item.data - minData) / (maxData - minData));
+  }
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item._start_ = _start_;
+    _start_ += 2 * item._rose_proportion_ * Math.PI;
+  }
+
+  return series;
+}
+
+function getArcbarDataPoints(series, arcbarOption) {
+  var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  if (process == 1) {
+    process = 0.999999;
+  }
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    let totalAngle;
+    if (arcbarOption.type == 'default') {
+      if (arcbarOption.endAngle < arcbarOption.startAngle) {
+        totalAngle = 2 + arcbarOption.endAngle - arcbarOption.startAngle;
+      } else{
+        totalAngle = arcbarOption.startAngle - arcbarOption.endAngle;
+      }
+    } else {
+      totalAngle = 2;
+    }
+    item._proportion_ = totalAngle * item.data * process + arcbarOption.startAngle;
+    if (item._proportion_ >= 2) {
+      item._proportion_ = item._proportion_ % 2;
+    }
+  }
+  return series;
+}
+
+function getGaugeAxisPoints(categories, startAngle, endAngle) {
+  let totalAngle = startAngle - endAngle + 1;
+  let tempStartAngle = startAngle;
+  for (let i = 0; i < categories.length; i++) {
+    categories[i].value = categories[i].value === null ? 0 : categories[i].value;
+    categories[i]._startAngle_ = tempStartAngle;
+    categories[i]._endAngle_ = totalAngle * categories[i].value + startAngle;
+    if (categories[i]._endAngle_ >= 2) {
+      categories[i]._endAngle_ = categories[i]._endAngle_ % 2;
+    }
+    tempStartAngle = categories[i]._endAngle_;
+  }
+  return categories;
+}
+
+function getGaugeDataPoints(series, categories, gaugeOption) {
+  let process = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    if (gaugeOption.pointer.color == 'auto') {
+      for (let i = 0; i < categories.length; i++) {
+        if (item.data <= categories[i].value) {
+          item.color = categories[i].color;
+          break;
+        }
+      }
+    } else {
+      item.color = gaugeOption.pointer.color;
+    }
+    let totalAngle = gaugeOption.startAngle - gaugeOption.endAngle + 1;
+    item._endAngle_ = totalAngle * item.data + gaugeOption.startAngle;
+    item._oldAngle_ = gaugeOption.oldAngle;
+    if (gaugeOption.oldAngle < gaugeOption.endAngle) {
+      item._oldAngle_ += 2;
+    }
+    if (item.data >= gaugeOption.oldData) {
+      item._proportion_ = (item._endAngle_ - item._oldAngle_) * process + gaugeOption.oldAngle;
+    } else {
+      item._proportion_ = item._oldAngle_ - (item._oldAngle_ - item._endAngle_) * process;
+    }
+    if (item._proportion_ >= 2) {
+      item._proportion_ = item._proportion_ % 2;
+    }
+  }
+  return series;
+}
+
+function getPieTextMaxLength(series) {
+  series = getPieDataPoints(series);
+  let maxLength = 0;
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    let text = item.format ? item.format(+item._proportion_.toFixed(2)) : util.toFixed(item._proportion_ * 100) + '%';
+    maxLength = Math.max(maxLength, measureText(text));
+  }
+
+  return maxLength;
+}
+
+function fixColumeData(points, eachSpacing, columnLen, index, config, opts) {
+  return points.map(function(item) {
+    if (item === null) {
+      return null;
+    }
+    item.width = Math.ceil((eachSpacing - 2 * config.columePadding) / columnLen);
+
+    if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
+      item.width = Math.min(item.width, +opts.extra.column.width);
+    }
+    if (item.width <= 0) {
+      item.width = 1;
+    }
+    item.x += (index + 0.5 - columnLen / 2) * item.width;
+    return item;
+  });
+}
+
+function fixColumeMeterData(points, eachSpacing, columnLen, index, config, opts, border) {
+  return points.map(function(item) {
+    if (item === null) {
+      return null;
+    }
+    item.width = Math.ceil((eachSpacing - 2 * config.columePadding) / 2);
+
+    if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
+      item.width = Math.min(item.width, +opts.extra.column.width);
+    }
+
+    if (index > 0) {
+      item.width -= 2 * border;
+    }
+    return item;
+  });
+}
+
+function fixColumeStackData(points, eachSpacing, columnLen, index, config, opts, series) {
+
+  return points.map(function(item, indexn) {
+
+    if (item === null) {
+      return null;
+    }
+    item.width = Math.ceil((eachSpacing - 2 * config.columePadding) / 2);
+
+    if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
+      item.width = Math.min(item.width, +opts.extra.column.width);
+    }
+    return item;
+  });
+}
+
+function getXAxisPoints(categories, opts, config) {
+  var yAxisTotalWidth = config.yAxisWidth + config.yAxisTitleWidth;
+  var spacingValid = opts.width - opts.area[1] - opts.area[3];
+  var dataCount = opts.enableScroll ? Math.min(opts.xAxis.itemCount, categories.length) : categories.length;
+  if((opts.type=='line' || opts.type=='area') && dataCount>1 && opts.xAxis.boundaryGap=='justify'){
+    dataCount -=1;
+  }
+  var eachSpacing = spacingValid / dataCount;
+
+  var xAxisPoints = [];
+  var startX = opts.area[3];
+  var endX = opts.width - opts.area[1];
+  categories.forEach(function(item, index) {
+    xAxisPoints.push(startX + index * eachSpacing);
+  });
+  if(opts.xAxis.boundaryGap !=='justify'){
+    if (opts.enableScroll === true) {
+      xAxisPoints.push(startX + categories.length * eachSpacing);
+    } else {
+      xAxisPoints.push(endX);
+    }
+  }
+  return {
+    xAxisPoints: xAxisPoints,
+    startX: startX,
+    endX: endX,
+    eachSpacing: eachSpacing
+  };
+}
+
+function getCandleDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config) {
+  var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+  var points = [];
+  var validHeight = opts.height - opts.area[0] - opts.area[2];
+  data.forEach(function(item, index) {
+    if (item === null) {
+      points.push(null);
+    } else {
+      var cPoints = [];
+      item.forEach(function(items, indexs) {
+        var point = {};
+        point.x = xAxisPoints[index] + Math.round(eachSpacing / 2);
+        var value = items.value || items;
+        var height = validHeight * (value - minRange) / (maxRange - minRange);
+        height *= process;
+        point.y = opts.height - Math.round(height) - opts.area[2];
+        cPoints.push(point);
+      });
+      points.push(cPoints);
+    }
+  });
+
+  return points;
+}
+
+function getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config) {
+  var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+  var boundaryGap='center';
+  if (opts.type == 'line'||opts.type == 'area'){
+    boundaryGap=opts.xAxis.boundaryGap;
+  }
+  var points = [];
+  var validHeight = opts.height - opts.area[0] - opts.area[2];
+  data.forEach(function(item, index) {
+    if (item === null) {
+      points.push(null);
+    } else {
+      var point = {};
+      point.color = item.color;
+      point.x = xAxisPoints[index];
+      if(boundaryGap=='center'){
+        point.x += Math.round(eachSpacing / 2);
+      }
+      var value = item;
+      if (typeof item === 'object' && item !== null) {
+        value = item.value
+      }
+      var height = validHeight * (value - minRange) / (maxRange - minRange);
+      height *= process;
+      point.y = opts.height - Math.round(height) - opts.area[2];
+      points.push(point);
+    }
+  });
+
+  return points;
+}
+
+function getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, stackSeries) {
+  var process = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : 1;
+  var points = [];
+  var validHeight = opts.height - opts.area[0] - opts.area[2];
+
+  data.forEach(function(item, index) {
+    if (item === null) {
+      points.push(null);
+    } else {
+      var point = {};
+      point.color = item.color;
+      point.x = xAxisPoints[index] + Math.round(eachSpacing / 2);
+
+      if (seriesIndex > 0) {
+        var value = 0;
+        for (let i = 0; i <= seriesIndex; i++) {
+          value += stackSeries[i].data[index];
+        }
+        var value0 = value - item;
+        var height = validHeight * (value - minRange) / (maxRange - minRange);
+        var height0 = validHeight * (value0 - minRange) / (maxRange - minRange);
+      } else {
+        var value = item;
+        var height = validHeight * (value - minRange) / (maxRange - minRange);
+        var height0 = 0;
+      }
+      var heightc = height0;
+      height *= process;
+      heightc *= process;
+      point.y = opts.height - Math.round(height) - opts.area[2];
+      point.y0 = opts.height - Math.round(heightc) - opts.area[2];
+      points.push(point);
+    }
+  });
+
+  return points;
+}
+
+function getYAxisTextList(series, opts, config, stack) {
+  var data;
+  if (stack == 'stack') {
+    data = dataCombineStack(series, opts.categories.length);
+  } else {
+    data = dataCombine(series);
+  }
+  var sorted = [];
+  // remove null from data
+  data = data.filter(function(item) {
+    //return item !== null;
+    if (typeof item === 'object' && item !== null) {
+      if (Array.isArray(item)) {
+        return item !== null;
+      } else {
+        return item.value !== null;
+      }
+    } else {
+      return item !== null;
+    }
+  });
+  data.map(function(item) {
+    if (typeof item === 'object') {
+      if (Array.isArray(item)) {
+        item.map(function(subitem) {
+          sorted.push(subitem);
+        })
+      } else {
+        sorted.push(item.value);
+      }
+    } else {
+      sorted.push(item);
+    }
+  })
+  var minData = 0;
+  var maxData = 0;
+  if (sorted.length > 0) {
+    minData = Math.min.apply(this, sorted);
+    maxData = Math.max.apply(this, sorted);
+  }
+  if (typeof opts.yAxis.min === 'number') {
+    minData = Math.min(opts.yAxis.min, minData);
+  }
+  if (typeof opts.yAxis.max === 'number') {
+    maxData = Math.max(opts.yAxis.max, maxData);
+  }
+
+  if (minData === maxData) {
+    var rangeSpan = maxData || 10;
+    maxData += rangeSpan;
+  }
+
+  var dataRange = getDataRange(minData, maxData);
+  var minRange = dataRange.minRange;
+  var maxRange = dataRange.maxRange;
+
+  var range = [];
+  var eachRange = (maxRange - minRange) / config.yAxisSplit;
+
+  for (var i = 0; i <= config.yAxisSplit; i++) {
+    range.push(minRange + eachRange * i);
+  }
+  return range.reverse();
+}
+
+function calYAxisData(series, opts, config) {
+  //堆叠图重算Y轴
+  var columnstyle = assign({}, {
+    type: ""
+  }, opts.extra.column);
+  var ranges = getYAxisTextList(series, opts, config, columnstyle.type);
+  var yAxisWidth = config.yAxisWidth;
+  var yAxisFontSize = opts.yAxis.fontSize || config.fontSize;
+  var rangesFormat = ranges.map(function(item) {
+    item = util.toFixed(item, 6);
+    item = opts.yAxis.format ? opts.yAxis.format(Number(item)) : item;
+    yAxisWidth = Math.max(yAxisWidth, measureText(item, yAxisFontSize) + 5);
+    return item;
+  });
+  if (opts.yAxis.disabled === true) {
+    yAxisWidth = 0;
+  }
+
+  return {
+    rangesFormat: rangesFormat,
+    ranges: ranges,
+    yAxisWidth: yAxisWidth
+  };
+}
+
+function calTooltipYAxisData(point, series, opts, config, eachSpacing) {
+  var ranges = getYAxisTextList(series, opts, config);
+  var spacingValid = opts.height - opts.area[0] - opts.area[2];
+  let maxVal = ranges[0];
+  let minVal = ranges[ranges.length - 1];
+  let minAxis = opts.padding[3];
+  let maxAxis = opts.padding[1] + spacingValid;
+  let item = maxVal - (maxVal - minVal) * (point - minAxis) / (maxAxis - minAxis);
+  item = opts.yAxis.format ? opts.yAxis.format(Number(item)) : item;
+  return item;
+}
+
+function calMarkLineData(minRange, maxRange, points, opts) {
+  let spacingValid = opts.height - opts.area[0] - opts.area[2];
+  for (let i = 0; i < points.length; i++) {
+    let height = spacingValid * (points[i].value - minRange) / (maxRange - minRange);
+    points[i].y = opts.height - Math.round(height) - opts.area[2];
+  }
+  return points;
+}
+
+function contextRotate(context, opts) {
+  if (opts.rotateLock !== true) {
+    context.translate(opts.height, 0);
+    context.rotate(90 * Math.PI / 180);
+  } else if (opts._rotate_ !== true) {
+    context.translate(opts.height, 0);
+    context.rotate(90 * Math.PI / 180);
+    opts._rotate_ = true;
+  }
+}
+
+function drawPointShape(points, color, shape, context, opts) {
+  context.beginPath();
+  context.setStrokeStyle("#ffffff");
+  context.setLineWidth(1 * opts.pixelRatio);
+  context.setFillStyle(color);
+  if (shape === 'diamond') {
+    points.forEach(function(item, index) {
+      if (item !== null) {
+        context.moveTo(item.x, item.y - 4.5);
+        context.lineTo(item.x - 4.5, item.y);
+        context.lineTo(item.x, item.y + 4.5);
+        context.lineTo(item.x + 4.5, item.y);
+        context.lineTo(item.x, item.y - 4.5);
+      }
+    });
+  } else if (shape === 'circle') {
+    points.forEach(function(item, index) {
+      if (item !== null) {
+        context.moveTo(item.x + 3.5 * opts.pixelRatio, item.y);
+        context.arc(item.x, item.y, 4 * opts.pixelRatio, 0, 2 * Math.PI, false);
+      }
+    });
+  } else if (shape === 'rect') {
+    points.forEach(function(item, index) {
+      if (item !== null) {
+        context.moveTo(item.x - 3.5, item.y - 3.5);
+        context.rect(item.x - 3.5, item.y - 3.5, 7, 7);
+      }
+    });
+  } else if (shape === 'triangle') {
+    points.forEach(function(item, index) {
+      if (item !== null) {
+        context.moveTo(item.x, item.y - 4.5);
+        context.lineTo(item.x - 4.5, item.y + 4.5);
+        context.lineTo(item.x + 4.5, item.y + 4.5);
+        context.lineTo(item.x, item.y - 4.5);
+      }
+    });
+  }
+  context.closePath();
+  context.fill();
+  context.stroke();
+}
+
+function drawRingTitle(opts, config, context, center) {
+  var titlefontSize = opts.title.fontSize || config.titleFontSize;
+  var subtitlefontSize = opts.subtitle.fontSize || config.subtitleFontSize;
+  var title = opts.title.name || '';
+  var subtitle = opts.subtitle.name || '';
+  var titleFontColor = opts.title.color || config.titleColor;
+  var subtitleFontColor = opts.subtitle.color || config.subtitleColor;
+  var titleHeight = title ? titlefontSize : 0;
+  var subtitleHeight = subtitle ? subtitlefontSize : 0;
+  var margin = 5;
+
+  if (subtitle) {
+    var textWidth = measureText(subtitle, subtitlefontSize);
+    var startX = center.x - textWidth / 2 + (opts.subtitle.offsetX || 0);
+    var startY = center.y + subtitlefontSize / 2 + (opts.subtitle.offsetY || 0);
+    if (title) {
+      startY += (titleHeight + margin) / 2;
+    }
+    context.beginPath();
+    context.setFontSize(subtitlefontSize);
+    context.setFillStyle(subtitleFontColor);
+    context.fillText(subtitle, startX, startY);
+    context.closePath();
+    context.stroke();
+  }
+  if (title) {
+    var _textWidth = measureText(title, titlefontSize);
+    var _startX = center.x - _textWidth / 2 + (opts.title.offsetX || 0);
+    var _startY = center.y + titlefontSize / 2 + (opts.title.offsetY || 0);
+    if (subtitle) {
+      _startY -= (subtitleHeight + margin) / 2;
+    }
+    context.beginPath();
+    context.setFontSize(titlefontSize);
+    context.setFillStyle(titleFontColor);
+    context.fillText(title, _startX, _startY);
+    context.closePath();
+    context.stroke();
+  }
+}
+
+function drawPointText(points, series, config, context) {
+  // 绘制数据文案
+  var data = series.data;
+  points.forEach(function(item, index) {
+    if (item !== null) {
+      //var formatVal = series.format ? series.format(data[index]) : data[index];
+      context.beginPath();
+      context.setFontSize(series.textSize || config.fontSize);
+      context.setFillStyle(series.textColor || '#666666');
+      var value = data[index]
+      if (typeof data[index] === 'object' && data[index] !== null) {
+        value = data[index].value
+      }
+      var formatVal = series.format ? series.format(value) : value;
+      context.fillText(String(formatVal), item.x - measureText(formatVal, series.textSize || config.fontSize) / 2, item.y -
+        2);
+      context.closePath();
+      context.stroke();
+    }
+  });
+
+}
+
+function drawGaugeLabel(gaugeOption, radius, centerPosition, opts, config, context) {
+  radius -= gaugeOption.width / 2 + config.gaugeLabelTextMargin;
+
+  let totalAngle = gaugeOption.startAngle - gaugeOption.endAngle + 1;
+  let splitAngle = totalAngle / gaugeOption.splitLine.splitNumber;
+  let totalNumber = gaugeOption.endNumber - gaugeOption.startNumber;
+  let splitNumber = totalNumber / gaugeOption.splitLine.splitNumber;
+  let nowAngle = gaugeOption.startAngle;
+  let nowNumber = gaugeOption.startNumber;
+  for (let i = 0; i < gaugeOption.splitLine.splitNumber + 1; i++) {
+    var pos = {
+      x: radius * Math.cos(nowAngle * Math.PI),
+      y: radius * Math.sin(nowAngle * Math.PI)
+    };
+    var labelText = gaugeOption.labelFormat ? gaugeOption.labelFormat(nowNumber) : nowNumber;
+    pos.x += centerPosition.x - measureText(labelText) / 2;
+    pos.y += centerPosition.y;
+    var startX = pos.x;
+    var startY = pos.y;
+    context.beginPath();
+    context.setFontSize(config.fontSize);
+    context.setFillStyle(gaugeOption.labelColor || '#666666');
+    context.fillText(labelText, startX, startY + config.fontSize / 2);
+    context.closePath();
+    context.stroke();
+
+    nowAngle += splitAngle;
+    if (nowAngle >= 2) {
+      nowAngle = nowAngle % 2;
+    }
+    nowNumber += splitNumber;
+  }
+
+}
+
+function drawRadarLabel(angleList, radius, centerPosition, opts, config, context) {
+  var radarOption = opts.extra.radar || {};
+  radius += config.radarLabelTextMargin;
+
+  angleList.forEach(function(angle, index) {
+    var pos = {
+      x: radius * Math.cos(angle),
+      y: radius * Math.sin(angle)
+    };
+    var posRelativeCanvas = convertCoordinateOrigin(pos.x, pos.y, centerPosition);
+    var startX = posRelativeCanvas.x;
+    var startY = posRelativeCanvas.y;
+    if (util.approximatelyEqual(pos.x, 0)) {
+      startX -= measureText(opts.categories[index] || '') / 2;
+    } else if (pos.x < 0) {
+      startX -= measureText(opts.categories[index] || '');
+    }
+    context.beginPath();
+    context.setFontSize(config.fontSize);
+    context.setFillStyle(radarOption.labelColor || '#666666');
+    context.fillText(opts.categories[index] || '', startX, startY + config.fontSize / 2);
+    context.closePath();
+    context.stroke();
+  });
+
+}
+
+function drawPieText(series, opts, config, context, radius, center) {
+  var lineRadius = config.pieChartLinePadding;
+  var textObjectCollection = [];
+  var lastTextObject = null;
+
+  var seriesConvert = series.map(function(item) {
+    var text = item.format ? item.format(+item._proportion_.toFixed(2)) : util.toFixed(item._proportion_.toFixed(4) * 100) +'%';
+    if(item._rose_proportion_) item._proportion_=item._rose_proportion_;
+    var arc = 2 * Math.PI - (item._start_ + 2 * Math.PI * item._proportion_ / 2);
+    var color = item.color;
+    var radius = item._radius_;
+    return {
+      arc: arc,
+      text: text,
+      color: color,
+      radius: radius,
+      textColor: item.textColor,
+      textSize: item.textSize,
+    };
+  });
+  for (let i = 0; i < seriesConvert.length; i++) {
+    let item = seriesConvert[i];
+    // line end
+    let orginX1 = Math.cos(item.arc) * (item.radius + lineRadius);
+    let orginY1 = Math.sin(item.arc) * (item.radius + lineRadius);
+
+    // line start
+    let orginX2 = Math.cos(item.arc) * item.radius;
+    let orginY2 = Math.sin(item.arc) * item.radius;
+
+    // text start
+    let orginX3 = orginX1 >= 0 ? orginX1 + config.pieChartTextPadding : orginX1 - config.pieChartTextPadding;
+    let orginY3 = orginY1;
+    let textWidth = measureText(item.text);
+    let startY = orginY3;
+
+    if (lastTextObject && util.isSameXCoordinateArea(lastTextObject.start, {
+        x: orginX3
+      })) {
+      if (orginX3 > 0) {
+        startY = Math.min(orginY3, lastTextObject.start.y);
+      } else if (orginX1 < 0) {
+        startY = Math.max(orginY3, lastTextObject.start.y);
+      } else {
+        if (orginY3 > 0) {
+          startY = Math.max(orginY3, lastTextObject.start.y);
+        } else {
+          startY = Math.min(orginY3, lastTextObject.start.y);
+        }
+      }
+    }
+    if (orginX3 < 0) {
+      orginX3 -= textWidth;
+    }
+
+    let textObject = {
+      lineStart: {
+        x: orginX2,
+        y: orginY2
+      },
+      lineEnd: {
+        x: orginX1,
+        y: orginY1
+      },
+      start: {
+        x: orginX3,
+        y: startY
+      },
+      width: textWidth,
+      height: config.fontSize,
+      text: item.text,
+      color: item.color,
+      textColor: item.textColor,
+      textSize: item.textSize
+    };
+    lastTextObject = avoidCollision(textObject, lastTextObject);
+    textObjectCollection.push(lastTextObject);
+  }
+
+  for (let i = 0; i < textObjectCollection.length; i++) {
+    let item = textObjectCollection[i];
+    let lineStartPoistion = convertCoordinateOrigin(item.lineStart.x, item.lineStart.y, center);
+    let lineEndPoistion = convertCoordinateOrigin(item.lineEnd.x, item.lineEnd.y, center);
+    let textPosition = convertCoordinateOrigin(item.start.x, item.start.y, center);
+    context.setLineWidth(1 * opts.pixelRatio);
+    context.setFontSize(config.fontSize);
+    context.beginPath();
+    context.setStrokeStyle(item.color);
+    context.setFillStyle(item.color);
+    context.moveTo(lineStartPoistion.x, lineStartPoistion.y);
+    let curveStartX = item.start.x < 0 ? textPosition.x + item.width : textPosition.x;
+    let textStartX = item.start.x < 0 ? textPosition.x - 5 : textPosition.x + 5;
+    context.quadraticCurveTo(lineEndPoistion.x, lineEndPoistion.y, curveStartX, textPosition.y);
+    context.moveTo(lineStartPoistion.x, lineStartPoistion.y);
+    context.stroke();
+    context.closePath();
+    context.beginPath();
+    context.moveTo(textPosition.x + item.width, textPosition.y);
+    context.arc(curveStartX, textPosition.y, 2, 0, 2 * Math.PI);
+    context.closePath();
+    context.fill();
+    context.beginPath();
+    context.setFontSize(item.textSize || config.fontSize);
+    context.setFillStyle(item.textColor || '#666666');
+    context.fillText(item.text, textStartX, textPosition.y + 3);
+    context.closePath();
+    context.stroke();
+    context.closePath();
+  }
+}
+
+function drawToolTipSplitLine(offsetX, opts, config, context) {
+  var toolTipOption = opts.extra.tooltip || {};
+  toolTipOption.gridType = toolTipOption.gridType == undefined ? 'solid' : toolTipOption.gridType;
+  toolTipOption.dashLength = toolTipOption.dashLength == undefined ? 4 : toolTipOption.dashLength;
+  var startY = opts.area[0];
+  var endY = opts.height - opts.area[2];
+
+  if (toolTipOption.gridType == 'dash') {
+    context.setLineDash([toolTipOption.dashLength, toolTipOption.dashLength]);
+  }
+  context.setStrokeStyle(toolTipOption.gridColor || '#cccccc');
+  context.setLineWidth(1 * opts.pixelRatio);
+  context.beginPath();
+  context.moveTo(offsetX, startY);
+  context.lineTo(offsetX, endY);
+  context.stroke();
+  context.setLineDash([]);
+
+  if (toolTipOption.xAxisLabel) {
+    let labelText = opts.categories[opts.tooltip.index];
+    context.setFontSize(config.fontSize);
+    let textWidth = measureText(labelText, config.fontSize);
+
+    let textX = offsetX - 0.5 * textWidth;
+    let textY = endY;
+    context.beginPath();
+    context.setFillStyle(hexToRgb(toolTipOption.labelBgColor || config.toolTipBackground, toolTipOption.labelBgOpacity || config.toolTipOpacity));
+    context.setStrokeStyle(toolTipOption.labelBgColor || config.toolTipBackground);
+    context.setLineWidth(1 * opts.pixelRatio);
+    context.rect(textX - config.toolTipPadding, textY, textWidth + 2 * config.toolTipPadding, config.fontSize + 2 * config.toolTipPadding);
+    context.closePath();
+    context.stroke();
+    context.fill();
+
+    context.beginPath();
+    context.setFontSize(config.fontSize);
+    context.setFillStyle(toolTipOption.labelFontColor || config.fontColor);
+    context.fillText(String(labelText), textX, textY + config.toolTipPadding + config.fontSize);
+    context.closePath();
+    context.stroke();
+  }
+}
+
+function drawMarkLine(minRange, maxRange, opts, config, context) {
+  let markLineOption = assign({}, {
+    type: 'solid',
+    dashLength: 4,
+    data: []
+  }, opts.extra.markLine);
+  let startX = opts.area[3];
+  let endX = opts.width - opts.padding[1];
+  let points = calMarkLineData(minRange, maxRange, markLineOption.data, opts);
+
+  for (let i = 0; i < points.length; i++) {
+    let item = assign({}, {
+      lineColor: '#DE4A42',
+      showLabel: false,
+      labelFontColor: '#666666',
+      labelBgColor: '#DFE8FF',
+      labelBgOpacity: 0.8,
+      yAxisIndex: 0
+    }, points[i]);
+
+    if (markLineOption.type == 'dash') {
+      context.setLineDash([markLineOption.dashLength, markLineOption.dashLength]);
+    }
+    context.setStrokeStyle(item.lineColor);
+    context.setLineWidth(1 * opts.pixelRatio);
+    context.beginPath();
+    context.moveTo(startX, item.y);
+    context.lineTo(endX, item.y);
+    context.stroke();
+    context.setLineDash([]);
+    if (item.showLabel) {
+      let labelText = opts.yAxis.format ? opts.yAxis.format(Number(item.value)) : item.value;
+      context.setFontSize(config.fontSize);
+      let textWidth = measureText(labelText, config.fontSize);
+      let bgStartX = opts.padding[3] + config.yAxisTitleWidth - config.toolTipPadding;
+      let bgEndX = Math.max(opts.area[3], textWidth + config.toolTipPadding * 2);
+      let bgWidth = bgEndX - bgStartX;
+
+      let textX = bgStartX + (bgWidth - textWidth) / 2;
+      let textY = item.y;
+      context.setFillStyle(hexToRgb(item.labelBgColor, item.labelBgOpacity));
+      context.setStrokeStyle(item.labelBgColor);
+      context.setLineWidth(1 * opts.pixelRatio);
+      context.beginPath();
+      context.rect(bgStartX, textY - 0.5 * config.fontSize - config.toolTipPadding, bgWidth, config.fontSize + 2 * config.toolTipPadding);
+      context.closePath();
+      context.stroke();
+      context.fill();
+
+      context.beginPath();
+      context.setFontSize(config.fontSize);
+      context.setFillStyle(item.labelFontColor);
+      context.fillText(String(labelText), textX, textY + 0.5 * config.fontSize);
+      context.stroke();
+    }
+  }
+}
+
+function drawToolTipHorizentalLine(opts, config, context, eachSpacing, xAxisPoints) {
+  var toolTipOption = assign({}, {
+    gridType: 'solid',
+    dashLength: 4
+  }, opts.extra.tooltip);
+
+  var startX = opts.area[3];
+  var endX = opts.width - opts.padding[1];
+
+  if (toolTipOption.gridType == 'dash') {
+    context.setLineDash([toolTipOption.dashLength, toolTipOption.dashLength]);
+  }
+  context.setStrokeStyle(toolTipOption.gridColor || '#cccccc');
+  context.setLineWidth(1 * opts.pixelRatio);
+  context.beginPath();
+  context.moveTo(startX, opts.tooltip.offset.y);
+  context.lineTo(endX, opts.tooltip.offset.y);
+  context.stroke();
+  context.setLineDash([]);
+
+  if (toolTipOption.yAxisLabel) {
+    let labelText = calTooltipYAxisData(opts.tooltip.offset.y, opts.series, opts, config, eachSpacing);
+    context.setFontSize(config.fontSize);
+    let textWidth = measureText(labelText, config.fontSize);
+    let bgStartX = opts.padding[3] + config.yAxisTitleWidth - config.toolTipPadding;
+    let bgEndX = Math.max(opts.area[3], textWidth + config.toolTipPadding * 2);
+    let bgWidth = bgEndX - bgStartX;
+
+    let textX = bgStartX + (bgWidth - textWidth) / 2;
+    let textY = opts.tooltip.offset.y;
+    context.beginPath();
+    context.setFillStyle(hexToRgb(toolTipOption.labelBgColor || config.toolTipBackground, toolTipOption.labelBgOpacity || config.toolTipOpacity));
+    context.setStrokeStyle(toolTipOption.labelBgColor || config.toolTipBackground);
+    context.setLineWidth(1 * opts.pixelRatio);
+    context.rect(bgStartX, textY - 0.5 * config.fontSize - config.toolTipPadding, bgWidth, config.fontSize + 2 * config.toolTipPadding);
+    context.closePath();
+    context.stroke();
+    context.fill();
+
+    context.beginPath();
+    context.setFontSize(config.fontSize);
+    context.setFillStyle(toolTipOption.labelFontColor || config.fontColor);
+    context.fillText(labelText, textX, textY + 0.5 * config.fontSize);
+    context.closePath();
+    context.stroke();
+  }
+}
+
+function drawToolTipSplitArea(offsetX, opts, config, context, eachSpacing) {
+  var toolTipOption = assign({}, {
+    activeBgColor: '#000000',
+    activeBgOpacity: 0.08
+  }, opts.extra.tooltip);
+  var startY = opts.area[0];
+  var endY = opts.height - opts.area[2];
+  context.beginPath();
+  context.setFillStyle(hexToRgb(toolTipOption.activeBgColor, toolTipOption.activeBgOpacity));
+  context.rect(offsetX - eachSpacing / 2, startY, eachSpacing, endY - startY);
+  context.closePath();
+  context.fill();
+}
+
+function drawToolTip(textList, offset, opts, config, context, eachSpacing, xAxisPoints) {
+  var toolTipOption = assign({}, {
+    bgColor: '#000000',
+    bgOpacity: 0.7,
+    fontColor: '#FFFFFF'
+  }, opts.extra.tooltip);
+  var legendWidth = 4 * opts.pixelRatio;
+  var legendMarginRight = 5 * opts.pixelRatio;
+  var arrowWidth = 8 * opts.pixelRatio;
+  var isOverRightBorder = false;
+  if (opts.type == 'line' || opts.type == 'area' || opts.type == 'candle' || opts.type == 'mix') {
+    drawToolTipSplitLine(opts.tooltip.offset.x, opts, config, context);
+  }
+
+  offset = assign({
+    x: 0,
+    y: 0
+  }, offset);
+  offset.y -= 8 * opts.pixelRatio;
+  var textWidth = textList.map(function(item) {
+    return measureText(item.text, config.fontSize);
+  });
+  var toolTipWidth = legendWidth + legendMarginRight + 4 * config.toolTipPadding + Math.max.apply(null, textWidth);
+  var toolTipHeight = 2 * config.toolTipPadding + textList.length * config.toolTipLineHeight;
+
+  // if beyond the right border
+  if (offset.x - Math.abs(opts._scrollDistance_) + arrowWidth + toolTipWidth > opts.width) {
+    isOverRightBorder = true;
+  }
+  if (toolTipHeight + offset.y > opts.height) {
+    offset.y = opts.height - toolTipHeight;
+  }
+  // draw background rect
+  context.beginPath();
+  context.setFillStyle(hexToRgb(toolTipOption.bgColor || config.toolTipBackground, toolTipOption.bgOpacity || config.toolTipOpacity));
+  if (isOverRightBorder) {
+    context.moveTo(offset.x, offset.y + 10 * opts.pixelRatio);
+    context.lineTo(offset.x - arrowWidth, offset.y + 10 * opts.pixelRatio - 5 * opts.pixelRatio);
+    context.lineTo(offset.x - arrowWidth, offset.y);
+    context.lineTo(offset.x - arrowWidth - Math.round(toolTipWidth), offset.y);
+    context.lineTo(offset.x - arrowWidth - Math.round(toolTipWidth), offset.y + toolTipHeight);
+    context.lineTo(offset.x - arrowWidth, offset.y + toolTipHeight);
+    context.lineTo(offset.x - arrowWidth, offset.y + 10 * opts.pixelRatio + 5 * opts.pixelRatio);
+    context.lineTo(offset.x, offset.y + 10 * opts.pixelRatio);
+  } else {
+    context.moveTo(offset.x, offset.y + 10 * opts.pixelRatio);
+    context.lineTo(offset.x + arrowWidth, offset.y + 10 * opts.pixelRatio - 5 * opts.pixelRatio);
+    context.lineTo(offset.x + arrowWidth, offset.y);
+    context.lineTo(offset.x + arrowWidth + Math.round(toolTipWidth), offset.y);
+    context.lineTo(offset.x + arrowWidth + Math.round(toolTipWidth), offset.y + toolTipHeight);
+    context.lineTo(offset.x + arrowWidth, offset.y + toolTipHeight);
+    context.lineTo(offset.x + arrowWidth, offset.y + 10 * opts.pixelRatio + 5 * opts.pixelRatio);
+    context.lineTo(offset.x, offset.y + 10 * opts.pixelRatio);
+  }
+
+  context.closePath();
+  context.fill();
+
+  // draw legend
+  textList.forEach(function(item, index) {
+    if (item.color !== null) {
+      context.beginPath();
+      context.setFillStyle(item.color);
+      var startX = offset.x + arrowWidth + 2 * config.toolTipPadding;
+      var startY = offset.y + (config.toolTipLineHeight - config.fontSize) / 2 + config.toolTipLineHeight * index +
+        config.toolTipPadding + 1;
+      if (isOverRightBorder) {
+        startX = offset.x - toolTipWidth - arrowWidth + 2 * config.toolTipPadding;
+      }
+      context.fillRect(startX, startY, legendWidth, config.fontSize);
+      context.closePath();
+    }
+  });
+
+  // draw text list
+
+  textList.forEach(function(item, index) {
+    var startX = offset.x + arrowWidth + 2 * config.toolTipPadding + legendWidth + legendMarginRight;
+    if (isOverRightBorder) {
+      startX = offset.x - toolTipWidth - arrowWidth + 2 * config.toolTipPadding + +legendWidth + legendMarginRight;
+    }
+    var startY = offset.y + (config.toolTipLineHeight - config.fontSize) / 2 + config.toolTipLineHeight * index +
+      config.toolTipPadding;
+    context.beginPath();
+    context.setFontSize(config.fontSize);
+    context.setFillStyle(toolTipOption.fontColor);
+    context.fillText(item.text, startX, startY + config.fontSize);
+    context.closePath();
+    context.stroke();
+  });
+}
+
+function drawYAxisTitle(title, opts, config, context) {
+  var startX = config.xAxisHeight + (opts.height - config.xAxisHeight - measureText(title)) / 2;
+  context.save();
+  context.beginPath();
+  context.setFontSize(config.fontSize);
+  context.setFillStyle(opts.yAxis.titleFontColor || '#333333');
+  context.translate(0, opts.height);
+  context.rotate(-90 * Math.PI / 180);
+  context.fillText(title, startX, opts.padding[3] + 0.5 * config.fontSize);
+  context.closePath();
+  context.stroke();
+  context.restore();
+}
+
+function drawColumnDataPoints(series, opts, config, context) {
+  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  let ranges = [].concat(opts.chartData.yAxisData.ranges);
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+  let columnOption = assign({}, {
+    type: 'group',
+    width: eachSpacing / 2,
+    meter: {
+      border: 4,
+      fillColor: '#FFFFFF'
+    }
+  }, opts.extra.column);
+  let minRange = ranges.pop();
+  let maxRange = ranges.shift();
+  let calPoints = [];
+
+  context.save();
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+  }
+  if (opts.tooltip && opts.tooltip.textList && opts.tooltip.textList.length && process === 1) {
+    drawToolTipSplitArea(opts.tooltip.offset.x, opts, config, context, eachSpacing);
+  }
+
+  series.forEach(function(eachSeries, seriesIndex) {
+    var data = eachSeries.data;
+    switch (columnOption.type) {
+      case 'group':
+        var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+        var tooltipPoints = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
+        calPoints.push(tooltipPoints);
+        points = fixColumeData(points, eachSpacing, series.length, seriesIndex, config, opts);
+        points.forEach(function(item, index) {
+          if (item !== null) {
+            context.beginPath();
+            context.setStrokeStyle(item.color || eachSeries.color);
+            context.setLineWidth(1)
+            context.setFillStyle(item.color || eachSeries.color);
+            var startX = item.x - item.width / 2;
+            var height = opts.height - item.y - opts.area[2];
+            context.moveTo(startX-1, item.y);
+            context.lineTo(startX+item.width-2,item.y);
+            context.lineTo(startX+item.width-2,opts.height - opts.area[2]);
+            context.lineTo(startX,opts.height - opts.area[2]);
+            context.lineTo(startX,item.y);
+            //context.rect(startX, item.y, item.width, height);
+            context.closePath();
+            context.stroke();
+            context.fill();
+          }
+        });
+        break;
+      case 'stack':
+        // 绘制堆叠数据图
+        var points = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config,
+          seriesIndex,
+          series, process);
+        calPoints.push(points);
+        points = fixColumeStackData(points, eachSpacing, series.length, seriesIndex, config, opts, series);
+
+        points.forEach(function(item, index) {
+          if (item !== null) {
+            context.beginPath();
+            context.setFillStyle(item.color || eachSeries.color);
+            var startX = item.x - item.width / 2 + 1;
+            var height = opts.height - item.y - opts.area[2];
+            var height0 = opts.height - item.y0 - opts.area[2];
+            if (seriesIndex > 0) {
+              height -= height0;
+            }
+            context.moveTo(startX, item.y);
+            context.fillRect(startX, item.y, item.width - 2, height);
+            context.closePath();
+            context.fill();
+          }
+        });
+        break;
+      case 'meter':
+        // 绘制温度计数据图
+        var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+        calPoints.push(points);
+        points = fixColumeMeterData(points, eachSpacing, series.length, seriesIndex, config, opts, columnOption.meter
+          .border);
+        if (seriesIndex == 0) {
+          points.forEach(function(item, index) {
+            if (item !== null) {
+              //画背景颜色
+              context.beginPath();
+              context.setFillStyle(columnOption.meter.fillColor);
+              var startX = item.x - item.width / 2;
+              var height = opts.height - item.y - opts.area[2];
+              context.moveTo(startX, item.y);
+              context.fillRect(startX, item.y, item.width, height);
+              context.closePath();
+              context.fill();
+              //画边框线
+              if (columnOption.meter.border > 0) {
+                context.beginPath();
+                context.setStrokeStyle(eachSeries.color);
+                context.setLineWidth(columnOption.meter.border * opts.pixelRatio);
+                context.moveTo(startX + columnOption.meter.border * 0.5, item.y + height);
+                context.lineTo(startX + columnOption.meter.border * 0.5, item.y + columnOption.meter.border * 0.5);
+                context.lineTo(startX + item.width - columnOption.meter.border * 0.5, item.y + columnOption.meter.border * 0.5);
+                context.lineTo(startX + item.width - columnOption.meter.border * 0.5, item.y + height);
+                context.stroke();
+              }
+            }
+          });
+        } else {
+          points.forEach(function(item, index) {
+            if (item !== null) {
+              context.beginPath();
+              context.setFillStyle(item.color || eachSeries.color);
+              var startX = item.x - item.width / 2;
+              var height = opts.height - item.y - opts.area[2];
+              context.moveTo(startX, item.y);
+              context.fillRect(startX, item.y, item.width, height);
+              context.closePath();
+              context.fill();
+            }
+          });
+        }
+        break;
+    }
+  });
+
+  if (opts.dataLabel !== false && process === 1) {
+    series.forEach(function(eachSeries, seriesIndex) {
+      var data = eachSeries.data;
+      switch (columnOption.type) {
+        case 'group':
+          var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+          points = fixColumeData(points, eachSpacing, series.length, seriesIndex, config, opts);
+
+          drawPointText(points, eachSeries, config, context);
+          break;
+        case 'stack':
+          var points = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config,
+            seriesIndex,
+            series, process);
+          drawPointText(points, eachSeries, config, context);
+          break;
+        case 'meter':
+          var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+          drawPointText(points, eachSeries, config, context);
+          break;
+      }
+    });
+  }
+
+  context.restore();
+
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing,
+    minRange: minRange,
+    maxRange: maxRange
+  };
+}
+
+function drawCandleDataPoints(series, seriesMA, opts, config, context) {
+  var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+  var candleOption = assign({}, {
+    color: {},
+    average: {}
+  }, opts.extra.candle);
+  candleOption.color = assign({}, {
+    upLine: '#f04864',
+    upFill: '#f04864',
+    downLine: '#2fc25b',
+    downFill: '#2fc25b'
+  }, candleOption.color);
+  candleOption.average = assign({}, {
+    show: false,
+    name: [],
+    day: [],
+    color: config.colors
+  }, candleOption.average);
+  opts.extra.candle = candleOption;
+
+  let ranges = [].concat(opts.chartData.yAxisData.ranges);
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+
+  let minRange = ranges.pop();
+  let maxRange = ranges.shift();
+  let calPoints = [];
+
+  context.save();
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+  }
+  //画均线
+  if (candleOption.average.show) {
+    seriesMA.forEach(function(eachSeries, seriesIndex) {
+      var data = eachSeries.data;
+      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+      //calPoints.push(points);
+      var splitPointList = splitPoints(points);
+
+      splitPointList.forEach(function(points, index) {
+        context.beginPath();
+        context.setStrokeStyle(eachSeries.color);
+        context.setLineWidth(1);
+        if (points.length === 1) {
+          context.moveTo(points[0].x, points[0].y);
+          context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
+        } else {
+          context.moveTo(points[0].x, points[0].y);
+          points.forEach(function(item, index) {
+            if (index > 0) {
+              var ctrlPoint = createCurveControlPoints(points, index - 1);
+              context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y,
+                item.x, item
+                .y);
+            }
+          });
+          context.moveTo(points[0].x, points[0].y);
+        }
+        context.closePath();
+        context.stroke();
+      });
+    });
+  }
+  //画K线
+  series.forEach(function(eachSeries, seriesIndex) {
+    var data = eachSeries.data;
+    var points = getCandleDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+    calPoints.push(points);
+    var splitPointList = splitPoints(points);
+    splitPointList = splitPointList[0];
+
+    splitPointList.forEach(function(points, index) {
+      context.beginPath();
+      //如果上涨
+      if (data[index][1] - data[index][0] > 0) {
+        context.setStrokeStyle(candleOption.color.upLine);
+        context.setFillStyle(candleOption.color.upFill);
+        context.setLineWidth(1 * opts.pixelRatio);
+        context.moveTo(points[3].x, points[3].y); //顶点
+        context.lineTo(points[1].x, points[1].y); //收盘中间点
+        context.lineTo(points[1].x - eachSpacing / 4, points[1].y); //收盘左侧点
+        context.lineTo(points[0].x - eachSpacing / 4, points[0].y); //开盘左侧点
+        context.lineTo(points[0].x, points[0].y); //开盘中间点
+        context.lineTo(points[2].x, points[2].y); //底点
+        context.lineTo(points[0].x, points[0].y); //开盘中间点
+        context.lineTo(points[0].x + eachSpacing / 4, points[0].y); //开盘右侧点
+        context.lineTo(points[1].x + eachSpacing / 4, points[1].y); //收盘右侧点
+        context.lineTo(points[1].x, points[1].y); //收盘中间点
+        context.moveTo(points[3].x, points[3].y); //顶点
+      } else {
+        context.setStrokeStyle(candleOption.color.downLine);
+        context.setFillStyle(candleOption.color.downFill);
+        context.setLineWidth(1 * opts.pixelRatio);
+        context.moveTo(points[3].x, points[3].y); //顶点
+        context.lineTo(points[0].x, points[0].y); //开盘中间点
+        context.lineTo(points[0].x - eachSpacing / 4, points[0].y); //开盘左侧点
+        context.lineTo(points[1].x - eachSpacing / 4, points[1].y); //收盘左侧点
+        context.lineTo(points[1].x, points[1].y); //收盘中间点
+        context.lineTo(points[2].x, points[2].y); //底点
+        context.lineTo(points[1].x, points[1].y); //收盘中间点
+        context.lineTo(points[1].x + eachSpacing / 4, points[1].y); //收盘右侧点
+        context.lineTo(points[0].x + eachSpacing / 4, points[0].y); //开盘右侧点
+        context.lineTo(points[0].x, points[0].y); //开盘中间点
+        context.moveTo(points[3].x, points[3].y); //顶点
+      }
+      context.closePath();
+      context.fill();
+      context.stroke();
+    });
+  });
+
+  context.restore();
+
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing,
+    minRange: minRange,
+    maxRange: maxRange
+  };
+}
+
+function drawAreaDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var areaOption = assign({},{
+    type: 'straight',
+    opacity: 0.2,
+    addLine: false,
+    width: 2
+  },opts.extra.area);
+
+  let ranges = [].concat(opts.chartData.yAxisData.ranges);
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+
+  let minRange = ranges.pop();
+  let maxRange = ranges.shift();
+  let endY = opts.height - opts.area[2];
+  let calPoints = [];
+
+  context.save();
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+  }
+
+  series.forEach(function(eachSeries, seriesIndex) {
+    let data = eachSeries.data;
+    let points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+    calPoints.push(points);
+
+    let splitPointList = splitPoints(points);
+
+    for (let i = 0; i < splitPointList.length; i++) {
+      let points = splitPointList[i];
+      // 绘制区域数
+      context.beginPath();
+      context.setStrokeStyle(hexToRgb(eachSeries.color, areaOption.opacity));
+      context.setFillStyle(hexToRgb(eachSeries.color, areaOption.opacity));
+      context.setLineWidth(areaOption.width * opts.pixelRatio);
+      if (points.length > 1) {
+        let firstPoint = points[0];
+        let lastPoint = points[points.length - 1];
+
+        context.moveTo(firstPoint.x, firstPoint.y);
+        if (areaOption.type === 'curve') {
+          points.forEach(function(item, index) {
+            if (index > 0) {
+              let ctrlPoint = createCurveControlPoints(points, index - 1);
+              context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y,item.x, item.y);
+            }
+          });
+        } else {
+          points.forEach(function(item, index) {
+            if (index > 0) {
+              context.lineTo(item.x, item.y);
+            }
+          });
+        }
+
+        context.lineTo(lastPoint.x, endY);
+        context.lineTo(firstPoint.x, endY);
+        context.lineTo(firstPoint.x, firstPoint.y);
+      } else {
+        let item = points[0];
+        context.moveTo(item.x - eachSpacing / 2, item.y);
+        context.lineTo(item.x + eachSpacing / 2, item.y);
+        context.lineTo(item.x + eachSpacing / 2, endY);
+        context.lineTo(item.x - eachSpacing / 2, endY);
+        context.moveTo(item.x - eachSpacing / 2, item.y);
+      }
+      context.closePath();
+      context.fill();
+
+      //画连线
+      if (areaOption.addLine) {
+        context.beginPath();
+        context.setStrokeStyle(eachSeries.color);
+        context.setLineWidth(areaOption.width * opts.pixelRatio);
+        if (points.length === 1) {
+          context.moveTo(points[0].x, points[0].y);
+          context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
+        } else {
+          context.moveTo(points[0].x, points[0].y);
+          if (areaOption.type === 'curve') {
+            points.forEach(function(item, index) {
+              if (index > 0) {
+                let ctrlPoint = createCurveControlPoints(points, index - 1);
+                context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y,item.x,item.y);
+              }
+            });
+          } else {
+            points.forEach(function(item, index) {
+              if (index > 0) {
+                context.lineTo(item.x, item.y);
+              }
+            });
+          }
+          context.moveTo(points[0].x, points[0].y);
+        }
+        context.closePath();
+        context.stroke();
+      }
+    }
+
+    //画点
+    if (opts.dataPointShape !== false) {
+      var shape = config.dataPointShape[seriesIndex % config.dataPointShape.length];
+      drawPointShape(points, eachSeries.color, shape, context, opts);
+    }
+
+  });
+
+  if (opts.dataLabel !== false && process === 1) {
+    series.forEach(function(eachSeries, seriesIndex) {
+      var data = eachSeries.data;
+      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+      drawPointText(points, eachSeries, config, context);
+    });
+  }
+
+  context.restore();
+
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing,
+    minRange: minRange,
+    maxRange: maxRange
+  };
+}
+
+function drawLineDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var lineOption = opts.extra.line || {
+    type: 'straight',
+    width: 2
+  };
+  lineOption.type = lineOption.type ? lineOption.type : 'straight';
+  lineOption.width = lineOption.width ? lineOption.width : 2;
+
+  let ranges = [].concat(opts.chartData.yAxisData.ranges);
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+
+  var minRange = ranges.pop();
+  var maxRange = ranges.shift();
+  var calPoints = [];
+
+  context.save();
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+  }
+
+  series.forEach(function(eachSeries, seriesIndex) {
+    var data = eachSeries.data;
+    var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+    calPoints.push(points);
+    var splitPointList = splitPoints(points);
+
+    splitPointList.forEach(function(points, index) {
+      context.beginPath();
+      context.setStrokeStyle(eachSeries.color);
+      context.setLineWidth(lineOption.width * opts.pixelRatio);
+      if (points.length === 1) {
+        context.moveTo(points[0].x, points[0].y);
+        context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
+      } else {
+        context.moveTo(points[0].x, points[0].y);
+        if (lineOption.type === 'curve') {
+          points.forEach(function(item, index) {
+            if (index > 0) {
+              var ctrlPoint = createCurveControlPoints(points, index - 1);
+              context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y,
+                item.x, item
+                .y);
+            }
+          });
+        } else {
+          points.forEach(function(item, index) {
+            if (index > 0) {
+              context.lineTo(item.x, item.y);
+            }
+          });
+        }
+        context.moveTo(points[0].x, points[0].y);
+      }
+      context.closePath();
+      context.stroke();
+    });
+
+    if (opts.dataPointShape !== false) {
+      var shape = config.dataPointShape[seriesIndex % config.dataPointShape.length];
+      drawPointShape(points, eachSeries.color, shape, context, opts);
+    }
+  });
+
+  if (opts.dataLabel !== false && process === 1) {
+    series.forEach(function(eachSeries, seriesIndex) {
+      var data = eachSeries.data;
+      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+      drawPointText(points, eachSeries, config, context);
+    });
+  }
+
+  context.restore();
+
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing,
+    minRange: minRange,
+    maxRange: maxRange
+  };
+}
+
+function drawMixDataPoints(series, opts, config, context) {
+  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  let ranges = [].concat(opts.chartData.yAxisData.ranges);
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+
+  let minRange = ranges.pop();
+  let maxRange = ranges.shift();
+  let endY = opts.height - opts.area[2];
+  let calPoints = [];
+
+  var columnIndex = 0;
+  var columnLength = 0;
+  series.forEach(function(eachSeries, seriesIndex) {
+    if (eachSeries.type == 'column') {
+      columnLength += 1;
+    }
+  });
+  context.save();
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+  }
+
+  series.forEach(function(eachSeries, seriesIndex) {
+    var data = eachSeries.data;
+    var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+    calPoints.push(points);
+
+    // 绘制柱状数据图
+    if (eachSeries.type == 'column') {
+      points = fixColumeData(points, eachSpacing, columnLength, columnIndex, config, opts);
+      points.forEach(function(item, index) {
+        if (item !== null) {
+          context.beginPath();
+          context.setStrokeStyle(item.color || eachSeries.color);
+          context.setLineWidth(1)
+          context.setFillStyle(item.color || eachSeries.color);
+          var startX = item.x - item.width / 2;
+          var height = opts.height - item.y - opts.area[2];
+          context.moveTo(startX, item.y);
+          context.moveTo(startX-1, item.y);
+          context.lineTo(startX+item.width-2,item.y);
+          context.lineTo(startX+item.width-2,opts.height - opts.area[2]);
+          context.lineTo(startX,opts.height - opts.area[2]);
+          context.lineTo(startX,item.y);
+          //context.rect(startX, item.y, item.width, height);
+          context.closePath();
+          context.stroke();
+          context.fill();
+          context.closePath();
+          context.fill();
+        }
+      });
+      columnIndex += 1;
+    }
+
+    //绘制区域图数据
+
+    if (eachSeries.type == 'area') {
+      let splitPointList = splitPoints(points);
+      for (let i = 0; i < splitPointList.length; i++) {
+        let points = splitPointList[i];
+        // 绘制区域数据
+        context.beginPath();
+        context.setStrokeStyle(eachSeries.color);
+        context.setFillStyle(hexToRgb(eachSeries.color, 0.2));
+        context.setLineWidth(2 * opts.pixelRatio);
+        if (points.length > 1) {
+          var firstPoint = points[0];
+          let lastPoint = points[points.length - 1];
+          context.moveTo(firstPoint.x, firstPoint.y);
+          if (eachSeries.style === 'curve') {
+            points.forEach(function(item, index) {
+              if (index > 0) {
+                var ctrlPoint = createCurveControlPoints(points, index - 1);
+                context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x, item.y);
+              }
+            });
+          } else {
+            points.forEach(function(item, index) {
+              if (index > 0) {
+                context.lineTo(item.x, item.y);
+              }
+            });
+          }
+          context.lineTo(lastPoint.x, endY);
+          context.lineTo(firstPoint.x, endY);
+          context.lineTo(firstPoint.x, firstPoint.y);
+        } else {
+          let item = points[0];
+          context.moveTo(item.x - eachSpacing / 2, item.y);
+          context.lineTo(item.x + eachSpacing / 2, item.y);
+          context.lineTo(item.x + eachSpacing / 2, endY);
+          context.lineTo(item.x - eachSpacing / 2, endY);
+          context.moveTo(item.x - eachSpacing / 2, item.y);
+        }
+        context.closePath();
+        context.fill();
+      }
+    }
+
+    // 绘制折线数据图
+    if (eachSeries.type == 'line') {
+      var splitPointList = splitPoints(points);
+      splitPointList.forEach(function(points, index) {
+        context.beginPath();
+        context.setStrokeStyle(eachSeries.color);
+        context.setLineWidth(2 * opts.pixelRatio);
+        if (points.length === 1) {
+          context.moveTo(points[0].x, points[0].y);
+          context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
+        } else {
+          context.moveTo(points[0].x, points[0].y);
+          if (eachSeries.style == 'curve') {
+            points.forEach(function(item, index) {
+              if (index > 0) {
+                var ctrlPoint = createCurveControlPoints(points, index - 1);
+                context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y,
+                  item.x,
+                  item.y);
+              }
+            });
+          } else {
+            points.forEach(function(item, index) {
+              if (index > 0) {
+                context.lineTo(item.x, item.y);
+              }
+            });
+          }
+          context.moveTo(points[0].x, points[0].y);
+        }
+        context.closePath();
+        context.stroke();
+      });
+    }
+
+    // 绘制点数据图
+    if (eachSeries.type == 'point') {
+      points.forEach(function(pointsa, index) {
+        if (pointsa) {
+          context.beginPath();
+          context.setFillStyle(eachSeries.color);
+          context.setStrokeStyle('#FFFFFF');
+          context.setLineWidth(1 * opts.pixelRatio);
+          context.moveTo(pointsa.x + 3.5 * opts.pixelRatio, pointsa.y);
+          context.arc(pointsa.x, pointsa.y, 4 * opts.pixelRatio, 0, 2 * Math.PI);
+          context.closePath();
+          context.fill();
+          context.stroke();
+        }
+      });
+    }
+
+    if (eachSeries.addPoint == true && eachSeries.type !== 'column') {
+      var shape = config.dataPointShape[seriesIndex % config.dataPointShape.length];
+      drawPointShape(points, eachSeries.color, shape, context, opts);
+    }
+  });
+  if (opts.dataLabel !== false && process === 1) {
+    var columnIndex = 0;
+    series.forEach(function(eachSeries, seriesIndex) {
+      var data = eachSeries.data;
+      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+      if (eachSeries.type !== 'column') {
+        drawPointText(points, eachSeries, config, context);
+      } else {
+        points = fixColumeData(points, eachSpacing, columnLength, columnIndex, config, opts);
+        drawPointText(points, eachSeries, config, context);
+        columnIndex += 1;
+      }
+
+    });
+  }
+
+  context.restore();
+
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing,
+    minRange: minRange,
+    maxRange: maxRange
+  };
+}
+
+function drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints) {
+  var toolTipOption = opts.extra.tooltip || {};
+  if (toolTipOption.horizentalLine && opts.tooltip && process === 1 && (opts.type == 'line' || opts.type == 'area' || opts.type == 'column' || opts.type == 'candle' || opts.type == 'mix')) {
+    drawToolTipHorizentalLine(opts, config, context, eachSpacing, xAxisPoints)
+  }
+  context.save();
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+  }
+  if (opts.tooltip && opts.tooltip.textList && opts.tooltip.textList.length && process === 1) {
+    drawToolTip(opts.tooltip.textList, opts.tooltip.offset, opts, config, context, eachSpacing, xAxisPoints);
+  }
+  context.restore();
+
+}
+
+function drawXAxis(categories, opts, config, context) {
+
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    startX = xAxisData.startX,
+    endX = xAxisData.endX,
+    eachSpacing = xAxisData.eachSpacing;
+  var boundaryGap='center';
+  if (opts.type == 'line'||opts.type == 'area'){
+    boundaryGap=opts.xAxis.boundaryGap;
+  }
+  var startY = opts.height - opts.area[2];
+  var endY = opts.area[0];
+
+  //绘制滚动条
+  if (opts.enableScroll && opts.xAxis.scrollShow) {
+    var scrollY = opts.height - opts.area[2] + config.xAxisHeight;
+    var scrollScreenWidth = endX - startX;
+    var scrollTotalWidth = eachSpacing * (xAxisPoints.length - 1);
+    var scrollWidth = scrollScreenWidth * scrollScreenWidth / scrollTotalWidth;
+    var scrollLeft = 0;
+    if (opts._scrollDistance_) {
+      scrollLeft = -opts._scrollDistance_ * (scrollScreenWidth) / scrollTotalWidth;
+    }
+    context.beginPath();
+    context.setLineCap('round');
+    context.setLineWidth(6 * opts.pixelRatio);
+    context.setStrokeStyle(opts.xAxis.scrollBackgroundColor || "#EFEBEF");
+    context.moveTo(startX, scrollY);
+    context.lineTo(endX, scrollY);
+    context.stroke();
+    context.closePath();
+    context.beginPath();
+    context.setLineCap('round');
+    context.setLineWidth(6 * opts.pixelRatio);
+    context.setStrokeStyle(opts.xAxis.scrollColor || "#A6A6A6");
+    context.moveTo(startX + scrollLeft, scrollY);
+    context.lineTo(startX + scrollLeft + scrollWidth, scrollY);
+    context.stroke();
+    context.closePath();
+    context.setLineCap('butt');
+  }
+
+  context.save();
+
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0) {
+    context.translate(opts._scrollDistance_, 0);
+  }
+
+
+  if (opts.xAxis.disableGrid !== true) {
+    context.setStrokeStyle(opts.xAxis.gridColor || "#cccccc");
+    context.setLineCap('butt');
+    context.setLineWidth(1 * opts.pixelRatio);
+    if (opts.xAxis.gridType == 'dash') {
+      context.setLineDash([opts.xAxis.dashLength, opts.xAxis.dashLength]);
+    }
+    if (opts.xAxis.type === 'calibration') {
+      xAxisPoints.forEach(function(item, index) {
+        if (index > 0) {
+          context.beginPath();
+          context.moveTo(item - eachSpacing / 2, startY);
+          context.lineTo(item - eachSpacing / 2, startY + 4 * opts.pixelRatio);
+          context.closePath();
+          context.stroke();
+        }
+      });
+    } else {
+      opts.xAxis.gridEval = opts.xAxis.gridEval || 1;
+      xAxisPoints.forEach(function(item, index) {
+        if (index % opts.xAxis.gridEval == 0) {
+          context.beginPath();
+          context.moveTo(item, startY);
+          context.lineTo(item, endY);
+          context.stroke();
+        }
+      });
+    }
+    context.setLineDash([]);
+  }
+
+
+  //不绘制X轴
+  if (opts.xAxis.disabled !== true) {
+    // 对X轴列表做抽稀处理
+    let validWidth = opts.width - opts.padding[1] - opts.padding[3] - config.yAxisWidth - config.yAxisTitleWidth;
+    //默认全部显示X轴标签
+    let maxXAxisListLength = categories.length;
+    //如果设置了X轴单屏数量
+    if (opts.xAxis.labelCount) {
+      //如果设置X轴密度
+      if (opts.xAxis.itemCount) {
+        maxXAxisListLength = Math.ceil(categories.length / opts.xAxis.itemCount * opts.xAxis.labelCount);
+      } else {
+        maxXAxisListLength = opts.xAxis.labelCount;
+      }
+      maxXAxisListLength -= 1;
+    }
+
+    let ratio = Math.ceil(categories.length / maxXAxisListLength);
+
+    let newCategories = [];
+    let cgLength = categories.length;
+    for (let i = 0; i < cgLength; i++) {
+      if (i % ratio !== 0) {
+        newCategories.push("");
+      } else {
+        newCategories.push(categories[i]);
+      }
+    }
+    newCategories[cgLength - 1] = categories[cgLength - 1];
+
+    var xAxisFontSize = opts.xAxis.fontSize || config.fontSize;
+    if (config._xAxisTextAngle_ === 0) {
+      newCategories.forEach(function(item, index) {
+        var offset = - measureText(item, xAxisFontSize) / 2;
+        if(boundaryGap == 'center'){
+          offset+=eachSpacing / 2;
+        }
+        context.beginPath();
+        context.setFontSize(xAxisFontSize);
+        context.setFillStyle(opts.xAxis.fontColor || '#666666');
+        context.fillText(item, xAxisPoints[index] + offset, startY + xAxisFontSize + (config.xAxisHeight - xAxisFontSize) / 2);
+        context.closePath();
+        context.stroke();
+      });
+
+    } else {
+      newCategories.forEach(function(item, index) {
+        context.save();
+        context.beginPath();
+        context.setFontSize(xAxisFontSize);
+        context.setFillStyle(opts.xAxis.fontColor || '#666666');
+        var textWidth = measureText(item);
+        var offset = - textWidth;
+        if(boundaryGap == 'center'){
+          offset+=eachSpacing / 2;
+        }
+        var _calRotateTranslate = calRotateTranslate(xAxisPoints[index] + eachSpacing / 2, startY + xAxisFontSize / 2 + 5, opts.height),
+          transX = _calRotateTranslate.transX,
+          transY = _calRotateTranslate.transY;
+
+        context.rotate(-1 * config._xAxisTextAngle_);
+        context.translate(transX, transY);
+        context.fillText(item, xAxisPoints[index] + offset, startY + xAxisFontSize + 5);
+        context.closePath();
+        context.stroke();
+        context.restore();
+      });
+    }
+  }
+  context.restore();
+
+}
+
+function drawYAxisGrid(categories, opts, config, context) {
+  if (opts.yAxis.disableGrid === true) {
+    return;
+  }
+  let spacingValid = opts.height - opts.area[0] - opts.area[2];
+  let eachSpacing = spacingValid / config.yAxisSplit;
+  let startX = opts.area[3];
+  let xAxisPoints = opts.chartData.xAxisData.xAxisPoints,
+    xAxiseachSpacing = opts.chartData.xAxisData.eachSpacing;
+  let TotalWidth = xAxiseachSpacing * (xAxisPoints.length - 1);
+  let endX = startX + TotalWidth;
+
+  let points = [];
+  for (let i = 0; i < config.yAxisSplit + 1; i++) {
+    points.push(opts.height - opts.area[2] - eachSpacing * i);
+  }
+
+  context.save();
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0) {
+    context.translate(opts._scrollDistance_, 0);
+  }
+
+  if (opts.yAxis.gridType == 'dash') {
+    context.setLineDash([opts.yAxis.dashLength, opts.yAxis.dashLength]);
+  }
+  context.setStrokeStyle(opts.yAxis.gridColor || "#cccccc");
+  context.setLineWidth(1 * opts.pixelRatio);
+  points.forEach(function(item, index) {
+    context.beginPath();
+    context.moveTo(startX, item);
+    context.lineTo(endX, item);
+    context.stroke();
+  });
+  context.setLineDash([]);
+
+  context.restore();
+}
+
+function drawYAxis(series, opts, config, context) {
+  if (opts.yAxis.disabled === true) {
+    return;
+  }
+  let rangesFormat = opts.chartData.yAxisData.rangesFormat;
+  var spacingValid = opts.height - opts.area[0] - opts.area[2];
+  var eachSpacing = Math.floor(spacingValid / config.yAxisSplit);
+  var startX = opts.area[3];
+  var endX = opts.width - opts.area[1];
+  var endY = opts.height - opts.area[2];
+  var fillEndY = endY + config.xAxisHeight;
+  if (opts.xAxis.scrollShow) {
+    fillEndY -= 3 * opts.pixelRatio;
+  }
+  // set YAxis background
+  context.beginPath();
+  context.setFillStyle(opts.background || '#ffffff');
+  if (opts._scrollDistance_ < 0) {
+    context.fillRect(0, 0, startX, fillEndY);
+  }
+  if(opts.enableScroll == true){
+    context.fillRect(endX, 0, opts.width, fillEndY);
+  }
+  context.closePath();
+  context.stroke();
+
+  var points = [];
+  for (var i = 0; i <= config.yAxisSplit; i++) {
+    points.push(opts.area[0] + eachSpacing * i);
+  }
+
+  var yAxisFontSize = opts.yAxis.fontSize || config.fontSize;
+  rangesFormat.forEach(function(item, index) {
+    var pos = points[index] ? points[index] : endY;
+    context.beginPath();
+    context.setFontSize(yAxisFontSize);
+    context.setFillStyle(opts.yAxis.fontColor || '#666666');
+    context.fillText(String(item), opts.area[3] - config.yAxisWidth, pos + yAxisFontSize / 2);
+    context.closePath();
+    context.stroke();
+  });
+
+  if (opts.yAxis.title) {
+    drawYAxisTitle(opts.yAxis.title, opts, config, context);
+  }
+}
+
+function drawLegend(series, opts, config, context, chartData) {
+  if (opts.legend.show === false) {
+    return;
+  }
+  let legendData = chartData.legendData;
+  let legendList = legendData.points;
+  let legendArea = legendData.area;
+  let padding = opts.legend.padding;
+  let fontSize = opts.legend.fontSize;
+  let shapeWidth = 15 * opts.pixelRatio;
+  let shapeRight = 5 * opts.pixelRatio;
+  let itemGap = opts.legend.itemGap;
+  let lineHeight = Math.max(opts.legend.lineHeight * opts.pixelRatio, fontSize);
+
+  //画背景及边框
+  context.beginPath();
+  context.setLineWidth(opts.legend.borderWidth);
+  context.setStrokeStyle(opts.legend.borderColor);
+  context.setFillStyle(opts.legend.backgroundColor);
+  context.moveTo(legendArea.start.x, legendArea.start.y);
+  context.rect(legendArea.start.x, legendArea.start.y, legendArea.width, legendArea.height);
+  context.closePath();
+  context.fill();
+  context.stroke();
+
+  legendList.forEach(function(itemList, listIndex) {
+    let width = 0;
+    let height = 0;
+    width = legendData.widthArr[listIndex];
+    height = legendData.heightArr[listIndex];
+    let startX = 0;
+    let startY = 0;
+    if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
+      startX = legendArea.start.x + (legendArea.width - width) / 2;
+      startY = legendArea.start.y + padding + listIndex * lineHeight;
+    } else {
+      if (listIndex == 0) {
+        width = 0;
+      } else {
+        width = legendData.widthArr[listIndex - 1];
+      }
+      startX = legendArea.start.x + padding + width;
+      startY = legendArea.start.y + padding + (legendArea.height - height) / 2;
+    }
+
+    context.setFontSize(config.fontSize);
+    for (let i = 0; i < itemList.length; i++) {
+      let item = itemList[i];
+      item.area = [0, 0, 0, 0];
+      item.area[0] = startX;
+      item.area[1] = startY;
+      item.area[3] = startY + lineHeight;
+      context.beginPath();
+      context.setLineWidth(1 * opts.pixelRatio);
+      context.setStrokeStyle(item.show ? item.color : opts.legend.hiddenColor);
+      context.setFillStyle(item.show ? item.color : opts.legend.hiddenColor);
+      switch (item.legendShape) {
+        case 'line':
+          context.moveTo(startX, startY + 0.5 * lineHeight - 2 * opts.pixelRatio);
+          context.fillRect(startX, startY + 0.5 * lineHeight - 2 * opts.pixelRatio, 15 * opts.pixelRatio, 4 * opts.pixelRatio);
+          break;
+        case 'triangle':
+          context.moveTo(startX + 7.5 * opts.pixelRatio, startY + 0.5 * lineHeight - 5 * opts.pixelRatio);
+          context.lineTo(startX + 2.5 * opts.pixelRatio, startY + 0.5 * lineHeight + 5 * opts.pixelRatio);
+          context.lineTo(startX + 12.5 * opts.pixelRatio, startY + 0.5 * lineHeight + 5 * opts.pixelRatio);
+          context.lineTo(startX + 7.5 * opts.pixelRatio, startY + 0.5 * lineHeight - 5 * opts.pixelRatio);
+          break;
+        case 'diamond':
+          context.moveTo(startX + 7.5 * opts.pixelRatio, startY + 0.5 * lineHeight - 5 * opts.pixelRatio);
+          context.lineTo(startX + 2.5 * opts.pixelRatio, startY + 0.5 * lineHeight);
+          context.lineTo(startX + 7.5 * opts.pixelRatio, startY + 0.5 * lineHeight + 5 * opts.pixelRatio);
+          context.lineTo(startX + 12.5 * opts.pixelRatio, startY + 0.5 * lineHeight);
+          context.lineTo(startX + 7.5 * opts.pixelRatio, startY + 0.5 * lineHeight - 5 * opts.pixelRatio);
+          break;
+        case 'circle':
+          context.moveTo(startX + 7.5 * opts.pixelRatio, startY + 0.5 * lineHeight);
+          context.arc(startX + 7.5 * opts.pixelRatio, startY + 0.5 * lineHeight, 5 * opts.pixelRatio, 0, 2 * Math.PI);
+          break;
+        case 'rect':
+          context.moveTo(startX, startY + 0.5 * lineHeight - 5 * opts.pixelRatio);
+          context.fillRect(startX, startY + 0.5 * lineHeight - 5 * opts.pixelRatio, 15 * opts.pixelRatio, 10 * opts.pixelRatio);
+          break;
+        default:
+          context.moveTo(startX, startY + 0.5 * lineHeight - 5 * opts.pixelRatio);
+          context.fillRect(startX, startY + 0.5 * lineHeight - 5 * opts.pixelRatio, 15 * opts.pixelRatio, 10 * opts.pixelRatio);
+      }
+      context.closePath();
+      context.fill();
+      context.stroke();
+
+      startX += shapeWidth + shapeRight;
+      let fontTrans = 0.5 * lineHeight + 0.5 * fontSize - 2;
+      context.beginPath();
+      context.setFontSize(fontSize);
+      context.setFillStyle(item.show ? opts.legend.fontColor : opts.legend.hiddenColor);
+      context.fillText(item.name, startX, startY + fontTrans);
+      context.closePath();
+      context.stroke();
+      if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
+        startX += measureText(item.name, fontSize) + itemGap;
+        item.area[2] = startX;
+      } else {
+        item.area[2] = startX + measureText(item.name, fontSize) + itemGap;;
+        startX -= shapeWidth + shapeRight;
+        startY += lineHeight;
+      }
+    }
+  });
+}
+
+function drawPieDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var pieOption = assign({}, {
+    activeOpacity: 0.5,
+    activeRadius: 10 * opts.pixelRatio,
+    offsetAngle: 0,
+    labelWidth: 15 * opts.pixelRatio,
+    ringWidth: 0,
+    border:false,
+    borderWidth:2,
+    borderColor:'#FFFFFF'
+  }, opts.extra.pie);
+  var centerPosition = {
+    x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
+    y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
+  };
+  if (config.pieChartLinePadding == 0) {
+    config.pieChartLinePadding = pieOption.activeRadius;
+  }
+
+  var radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding - config._pieTextMaxLength_, (opts.height - opts.area[0] - opts.area[2]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding);
+
+  series = getPieDataPoints(series, radius, process);
+
+  var activeRadius = pieOption.activeRadius;
+
+  series = series.map(function(eachSeries) {
+    eachSeries._start_ += (pieOption.offsetAngle) * Math.PI / 180;
+    return eachSeries;
+  });
+  series.forEach(function(eachSeries, seriesIndex) {
+    if (opts.tooltip) {
+      if (opts.tooltip.index == seriesIndex) {
+        context.beginPath();
+        context.setFillStyle(hexToRgb(eachSeries.color, opts.extra.pie.activeOpacity || 0.5));
+        context.moveTo(centerPosition.x, centerPosition.y);
+        context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_ + activeRadius, eachSeries._start_,
+          eachSeries._start_ + 2 *
+          eachSeries._proportion_ * Math.PI);
+        context.closePath();
+        context.fill();
+      }
+    }
+    context.beginPath();
+    context.setLineWidth(pieOption.borderWidth * opts.pixelRatio);
+    context.lineJoin = "round";
+    context.setStrokeStyle(pieOption.borderColor);
+    context.setFillStyle(eachSeries.color);
+    context.moveTo(centerPosition.x, centerPosition.y);
+    context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_, eachSeries._start_, eachSeries._start_ + 2 * eachSeries._proportion_ * Math.PI);
+    context.closePath();
+    context.fill();
+    if (pieOption.border == true) {
+      context.stroke();
+    }
+  });
+
+  if (opts.type === 'ring') {
+    var innerPieWidth = radius * 0.6;
+    if (typeof opts.extra.pie.ringWidth === 'number' && opts.extra.pie.ringWidth > 0) {
+      innerPieWidth = Math.max(0, radius - opts.extra.pie.ringWidth);
+    }
+    context.beginPath();
+    context.setFillStyle(opts.background || '#ffffff');
+    context.moveTo(centerPosition.x, centerPosition.y);
+    context.arc(centerPosition.x, centerPosition.y, innerPieWidth, 0, 2 * Math.PI);
+    context.closePath();
+    context.fill();
+  }
+
+  if (opts.dataLabel !== false && process === 1) {
+    var valid = false;
+    for (var i = 0, len = series.length; i < len; i++) {
+      if (series[i].data > 0) {
+        valid = true;
+        break;
+      }
+    }
+
+    if (valid) {
+      drawPieText(series, opts, config, context, radius, centerPosition);
+    }
+  }
+
+  if (process === 1 && opts.type === 'ring') {
+    drawRingTitle(opts, config, context, centerPosition);
+  }
+
+  return {
+    center: centerPosition,
+    radius: radius,
+    series: series
+  };
+}
+
+function drawRoseDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var roseOption = assign({}, {
+    type: 'area',
+    activeOpacity: 0.5,
+    activeRadius: 10 * opts.pixelRatio,
+    offsetAngle: 0,
+    labelWidth: 15 * opts.pixelRatio,
+    border:false,
+    borderWidth:2,
+    borderColor:'#FFFFFF'
+  }, opts.extra.rose);
+  if (config.pieChartLinePadding == 0) {
+    config.pieChartLinePadding = roseOption.activeRadius;
+  }
+  var centerPosition = {
+    x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
+    y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
+  };
+   var radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding - config._pieTextMaxLength_, (opts.height - opts.area[0] - opts.area[2]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding);
+  var minRadius = roseOption.minRadius || radius * 0.5;
+
+  series = getRoseDataPoints(series, roseOption.type, minRadius, radius, process);
+
+  var activeRadius = roseOption.activeRadius;
+
+  series = series.map(function(eachSeries) {
+    eachSeries._start_ += (roseOption.offsetAngle || 0) * Math.PI / 180;
+    return eachSeries;
+  });
+
+  series.forEach(function(eachSeries, seriesIndex) {
+    if (opts.tooltip) {
+      if (opts.tooltip.index == seriesIndex) {
+        context.beginPath();
+        context.setFillStyle(hexToRgb(eachSeries.color, roseOption.activeOpacity || 0.5));
+        context.moveTo(centerPosition.x, centerPosition.y);
+        context.arc(centerPosition.x, centerPosition.y, activeRadius + eachSeries._radius_, eachSeries._start_,
+          eachSeries._start_ + 2 * eachSeries._rose_proportion_ * Math.PI);
+        context.closePath();
+        context.fill();
+      }
+    }
+    context.beginPath();
+    context.setLineWidth(roseOption.borderWidth * opts.pixelRatio);
+    context.lineJoin = "round";
+    context.setStrokeStyle(roseOption.borderColor);
+    context.setFillStyle(eachSeries.color);
+    context.moveTo(centerPosition.x, centerPosition.y);
+    context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_, eachSeries._start_, eachSeries._start_ + 2 *
+      eachSeries._rose_proportion_ * Math.PI);
+    context.closePath();
+    context.fill();
+    if (roseOption.border == true) {
+      context.stroke();
+    }
+  });
+
+  if (opts.dataLabel !== false && process === 1) {
+    var valid = false;
+    for (var i = 0, len = series.length; i < len; i++) {
+      if (series[i].data > 0) {
+        valid = true;
+        break;
+      }
+    }
+
+    if (valid) {
+      drawPieText(series, opts, config, context, radius, centerPosition);
+    }
+  }
+
+  return {
+    center: centerPosition,
+    radius: radius,
+    series: series
+  };
+}
+
+function drawArcbarDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var arcbarOption = assign({}, {
+    startAngle: 0.75,
+    endAngle: 0.25,
+    type: 'default',
+    width: 12 * opts.pixelRatio
+  }, opts.extra.arcbar);
+
+  series = getArcbarDataPoints(series, arcbarOption, process);
+  var centerPosition = {
+    x: opts.width / 2,
+    y: opts.height / 2
+  };
+  var radius = Math.min(centerPosition.x, centerPosition.y);
+  radius -= 5 * opts.pixelRatio;
+  radius -= arcbarOption.width / 2;
+
+  //背景颜色
+  context.setLineWidth(arcbarOption.width);
+  context.setStrokeStyle(arcbarOption.backgroundColor || '#E9E9E9');
+  context.setLineCap('round');
+  context.beginPath();
+  if (arcbarOption.type == 'default') {
+    context.arc(centerPosition.x, centerPosition.y, radius, arcbarOption.startAngle * Math.PI, arcbarOption.endAngle *
+      Math.PI, false);
+  } else {
+    context.arc(centerPosition.x, centerPosition.y, radius, 0, 2 * Math.PI, false);
+  }
+  context.stroke();
+
+  for (let i = 0; i < series.length; i++) {
+    let eachSeries = series[i];
+    context.setLineWidth(arcbarOption.width);
+    context.setStrokeStyle(eachSeries.color);
+    context.setLineCap('round');
+    context.beginPath();
+    context.arc(centerPosition.x, centerPosition.y, radius, arcbarOption.startAngle * Math.PI, eachSeries._proportion_ *
+      Math.PI, false);
+    context.stroke();
+  }
+
+  drawRingTitle(opts, config, context, centerPosition);
+
+  return {
+    center: centerPosition,
+    radius: radius,
+    series: series
+  };
+}
+
+function drawGaugeDataPoints(categories, series, opts, config, context) {
+  var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+  var gaugeOption = assign({}, {
+    startAngle: 0.75,
+    endAngle: 0.25,
+    width: 15,
+    splitLine: {
+      fixRadius: 0,
+      splitNumber: 10,
+      width: 15,
+      color: '#FFFFFF',
+      childNumber: 5,
+      childWidth: 5
+    },
+    pointer: {
+      width: 15,
+      color: 'auto'
+    }
+  }, opts.extra.gauge);
+
+  if (gaugeOption.oldAngle == undefined) {
+    gaugeOption.oldAngle = gaugeOption.startAngle;
+  }
+  if (gaugeOption.oldData == undefined) {
+    gaugeOption.oldData = 0;
+  }
+  categories = getGaugeAxisPoints(categories, gaugeOption.startAngle, gaugeOption.endAngle);
+
+  var centerPosition = {
+    x: opts.width / 2,
+    y: opts.height / 2
+  };
+  var radius = Math.min(centerPosition.x, centerPosition.y);
+  radius -= 5 * opts.pixelRatio;
+  radius -= gaugeOption.width / 2;
+  var innerRadius = radius - gaugeOption.width;
+
+  //画背景
+  context.setLineWidth(gaugeOption.width);
+  context.setLineCap('butt');
+  for (let i = 0; i < categories.length; i++) {
+    let eachCategories = categories[i];
+    context.beginPath();
+    context.setStrokeStyle(eachCategories.color);
+    context.arc(centerPosition.x, centerPosition.y, radius, eachCategories._startAngle_ * Math.PI, eachCategories._endAngle_ *
+      Math.PI, false);
+    context.stroke();
+  }
+  context.save();
+
+  //画刻度线
+  let totalAngle = gaugeOption.startAngle - gaugeOption.endAngle + 1;
+  let splitAngle = totalAngle / gaugeOption.splitLine.splitNumber;
+  let childAngle = totalAngle / gaugeOption.splitLine.splitNumber / gaugeOption.splitLine.childNumber;
+  let startX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius;
+  let endX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine.width;
+  let childendX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine.childWidth;
+
+  context.translate(centerPosition.x, centerPosition.y);
+  context.rotate((gaugeOption.startAngle - 1) * Math.PI);
+
+  for (let i = 0; i < gaugeOption.splitLine.splitNumber + 1; i++) {
+    context.beginPath();
+    context.setStrokeStyle(gaugeOption.splitLine.color);
+    context.setLineWidth(2 * opts.pixelRatio);
+    context.moveTo(startX, 0);
+    context.lineTo(endX, 0);
+    context.stroke();
+    context.rotate(splitAngle * Math.PI);
+  }
+  context.restore();
+
+  context.save();
+  context.translate(centerPosition.x, centerPosition.y);
+  context.rotate((gaugeOption.startAngle - 1) * Math.PI);
+
+  for (let i = 0; i < gaugeOption.splitLine.splitNumber * gaugeOption.splitLine.childNumber + 1; i++) {
+    context.beginPath();
+    context.setStrokeStyle(gaugeOption.splitLine.color);
+    context.setLineWidth(1 * opts.pixelRatio);
+    context.moveTo(startX, 0);
+    context.lineTo(childendX, 0);
+    context.stroke();
+    context.rotate(childAngle * Math.PI);
+  }
+  context.restore();
+
+  //画指针
+  series = getGaugeDataPoints(series, categories, gaugeOption, process);
+
+  for (let i = 0; i < series.length; i++) {
+    let eachSeries = series[i];
+    context.save();
+    context.translate(centerPosition.x, centerPosition.y);
+    context.rotate((eachSeries._proportion_ - 1) * Math.PI);
+    context.beginPath();
+    context.setFillStyle(eachSeries.color);
+    context.moveTo(gaugeOption.pointer.width, 0);
+    context.lineTo(0, -gaugeOption.pointer.width / 2);
+    context.lineTo(-innerRadius, 0);
+    context.lineTo(0, gaugeOption.pointer.width / 2);
+    context.lineTo(gaugeOption.pointer.width, 0);
+    context.closePath();
+    context.fill();
+    context.beginPath();
+    context.setFillStyle('#FFFFFF');
+    context.arc(0, 0, gaugeOption.pointer.width / 6, 0, 2 * Math.PI, false);
+    context.fill();
+    context.restore();
+  }
+
+  if (opts.dataLabel !== false) {
+    drawGaugeLabel(gaugeOption, radius, centerPosition, opts, config, context);
+  }
+
+  drawRingTitle(opts, config, context, centerPosition);
+
+  if (process === 1 && opts.type === 'gauge') {
+    opts.extra.gauge.oldAngle = series[0]._proportion_;
+    opts.extra.gauge.oldData = series[0].data;
+  }
+  return {
+    center: centerPosition,
+    radius: radius,
+    innerRadius: innerRadius,
+    categories: categories,
+    totalAngle: totalAngle
+  };
+}
+
+function drawRadarDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var radarOption = assign({},{
+    gridColor: '#cccccc',
+    labelColor: '#666666',
+    opacity: 0.2
+  },opts.extra.radar);
+
+  var coordinateAngle = getRadarCoordinateSeries(opts.categories.length);
+
+  var centerPosition = {
+    x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
+    y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
+  };
+
+  var radius = Math.min(centerPosition.x - (getMaxTextListLength(opts.categories) + config.radarLabelTextMargin),
+    centerPosition.y - config.radarLabelTextMargin);
+  //TODO逻辑不对
+  radius -= opts.padding[1];
+
+  // draw grid
+  context.beginPath();
+  context.setLineWidth(1 * opts.pixelRatio);
+  context.setStrokeStyle(radarOption.gridColor);
+  coordinateAngle.forEach(function(angle) {
+    var pos = convertCoordinateOrigin(radius * Math.cos(angle), radius * Math.sin(angle), centerPosition);
+    context.moveTo(centerPosition.x, centerPosition.y);
+    context.lineTo(pos.x, pos.y);
+  });
+  context.stroke();
+  context.closePath();
+  // draw split line grid
+
+  var _loop = function _loop(i) {
+    var startPos = {};
+    context.beginPath();
+    context.setLineWidth(1 * opts.pixelRatio);
+    context.setStrokeStyle(radarOption.gridColor);
+    coordinateAngle.forEach(function(angle, index) {
+      var pos = convertCoordinateOrigin(radius / config.radarGridCount * i * Math.cos(angle), radius / config.radarGridCount *
+        i * Math.sin(angle), centerPosition);
+      if (index === 0) {
+        startPos = pos;
+        context.moveTo(pos.x, pos.y);
+      } else {
+        context.lineTo(pos.x, pos.y);
+      }
+    });
+    context.lineTo(startPos.x, startPos.y);
+    context.stroke();
+    context.closePath();
+  };
+
+  for (var i = 1; i <= config.radarGridCount; i++) {
+    _loop(i);
+  }
+
+  var radarDataPoints = getRadarDataPoints(coordinateAngle, centerPosition, radius, series, opts, process);
+
+  radarDataPoints.forEach(function(eachSeries, seriesIndex) {
+    // 绘制区域数据
+    context.beginPath();
+    context.setFillStyle(hexToRgb(eachSeries.color, radarOption.opacity));
+    eachSeries.data.forEach(function(item, index) {
+      if (index === 0) {
+        context.moveTo(item.position.x, item.position.y);
+      } else {
+        context.lineTo(item.position.x, item.position.y);
+      }
+    });
+    context.closePath();
+    context.fill();
+
+    if (opts.dataPointShape !== false) {
+      var shape = config.dataPointShape[seriesIndex % config.dataPointShape.length];
+      var points = eachSeries.data.map(function(item) {
+        return item.position;
+      });
+      drawPointShape(points, eachSeries.color, shape, context, opts);
+    }
+  });
+  // draw label text
+  drawRadarLabel(coordinateAngle, radius, centerPosition, opts, config, context);
+
+  return {
+    center: centerPosition,
+    radius: radius,
+    angleList: coordinateAngle
+  };
+}
+
+function normalInt(min, max, iter) {
+    iter = iter==0?1:iter;
+    var arr = [];
+    for (var i = 0; i < iter; i++) {
+        arr[i] = Math.random();
+    };
+    return  Math.floor(arr.reduce(function(i,j){return i+j})/iter*(max-min))+min;
+};
+
+function collisionNew(area,points,width,height){
+    var isIn=false;
+    for(let i=0;i<points.length;i++){
+      if(points[i].area){
+        if(area[3]<points[i].area[1]||area[0]>points[i].area[2]||area[1]>points[i].area[3]||area[2]<points[i].area[0]){
+          if(area[0]<0 || area[1]<0 || area[2]>width || area[3]>height){
+            isIn=true;
+            break;
+          }else{
+            isIn=false;
+          }
+        }else{
+          isIn=true;
+          break;
+        }
+      }
+    }
+    return isIn;
+};
+
+function getBoundingBox(data) {
+  var bounds = {}, coords;
+  bounds.xMin = 180;
+  bounds.xMax = 0;
+  bounds.yMin = 90;
+  bounds.yMax = 0
+  for (var i = 0; i < data.length; i++) {
+      var coorda = data[i].geometry.coordinates
+      for (var k = 0; k < coorda.length; k++) {
+          coords = coorda[k];
+          if (coords.length == 1) {
+              coords = coords[0]
+          }
+          for (var j = 0; j < coords.length; j++) {
+              var longitude = coords[j][0];
+              var latitude = coords[j][1];
+              var point = {
+                  x: longitude,
+                  y: latitude
+              }
+              bounds.xMin = bounds.xMin < point.x ? bounds.xMin : point.x;
+              bounds.xMax = bounds.xMax > point.x ? bounds.xMax : point.x;
+              bounds.yMin = bounds.yMin < point.y ? bounds.yMin : point.y;
+              bounds.yMax = bounds.yMax > point.y ? bounds.yMax : point.y;
+          }
+      }
+  }
+  return bounds;
+}
+
+function coordinateToPoint(latitude, longitude,bounds,scale,xoffset,yoffset) {
+  return {
+      x: (longitude - bounds.xMin) * scale+xoffset,
+      y: (bounds.yMax - latitude) * scale+yoffset
+  };
+}
+
+function pointToCoordinate(pointY, pointX,bounds,scale,xoffset,yoffset) {
+  return {
+      x: (pointX-xoffset)/scale+bounds.xMin,
+      y: bounds.yMax - (pointY-yoffset)/scale
+  };
+}
+
+function isRayIntersectsSegment(poi,s_poi,e_poi){
+      if (s_poi[1]==e_poi[1]){return false;}
+      if (s_poi[1]>poi[1] && e_poi[1]>poi[1]){return false;}
+      if (s_poi[1]<poi[1] && e_poi[1]<poi[1]){return false;}
+      if (s_poi[1]==poi[1] && e_poi[1]>poi[1]){return false;}
+      if (e_poi[1]==poi[1] && s_poi[1]>poi[1]){return false;}
+      if (s_poi[0]<poi[0] && e_poi[1]<poi[1]){return false;}
+      let xseg=e_poi[0]-(e_poi[0]-s_poi[0])*(e_poi[1]-poi[1])/(e_poi[1]-s_poi[1]);
+      if (xseg<poi[0]){
+        return false;
+      }else{
+        return true;
+      }
+}
+
+function isPoiWithinPoly(poi,poly){
+  let sinsc=0;
+  for (let i=0;i<poly.length;i++){
+    let epoly=poly[i][0];
+    if (poly.length == 1) {
+      epoly = poly[i][0]
+    }
+    for(let j=0;j<epoly.length-1;j++){
+      let s_poi=epoly[j];
+      let e_poi=epoly[j+1];
+      if (isRayIntersectsSegment(poi,s_poi,e_poi)){
+        sinsc+=1;
+      }
+    }
+  }
+
+  if(sinsc%2==1){
+    return true;
+  }else{
+    return false;
+  }
+}
+
+
+function drawMapDataPoints(series, opts, config, context) {
+  var mapOption=assign({},{
+    border:true,
+    borderWidth:1,
+    borderColor:'#666666',
+    fillOpacity:0.6,
+    activeBorderColor:'#f04864',
+    activeFillColor:'#facc14',
+    activeFillOpacity:1
+  },opts.extra.map);
+  var coords, point;
+  var data = series;
+  var bounds= getBoundingBox(data);
+  var xScale = opts.width / Math.abs(bounds.xMax - bounds.xMin);
+  var yScale = opts.height / Math.abs(bounds.yMax - bounds.yMin);
+  var scale = xScale < yScale ? xScale : yScale;
+  var xoffset=opts.width/2-Math.abs(bounds.xMax - bounds.xMin)/2*scale;
+  var yoffset=opts.height/2-Math.abs(bounds.yMax - bounds.yMin)/2*scale;
+  context.beginPath();
+  context.clearRect(0, 0, opts.width, opts.height);
+  context.setFillStyle(opts.background||'#FFFFFF');
+  context.rect(0,0,opts.width,opts.height);
+  context.fill();
+  for (var i = 0; i < data.length; i++) {
+    context.beginPath();
+    context.setLineWidth(mapOption.borderWidth * opts.pixelRatio);
+    context.setStrokeStyle(mapOption.borderColor);
+    context.setFillStyle(hexToRgb(series[i].color, mapOption.fillOpacity));
+    if (opts.tooltip) {
+      if (opts.tooltip.index == i ) {
+        context.setStrokeStyle(mapOption.activeBorderColor);
+        context.setFillStyle(hexToRgb(mapOption.activeFillColor, mapOption.activeFillOpacity));
+      }
+    }
+    var coorda = data[i].geometry.coordinates
+    for (var k = 0; k < coorda.length; k++) {
+      coords = coorda[k];
+      if (coords.length == 1) {
+        coords = coords[0]
+      }
+      for (var j = 0; j < coords.length; j++) {
+        point = coordinateToPoint(coords[j][1], coords[j][0],bounds,scale,xoffset,yoffset)
+        if (j === 0) {
+          context.beginPath();
+          context.moveTo(point.x, point.y);
+        } else {
+          context.lineTo(point.x, point.y);
+        }
+      }
+      context.fill();
+      if(mapOption.border == true){
+        context.stroke();
+      }
+    }
+    if(opts.dataLabel == true){
+      var centerPoint = data[i].properties.centroid;
+      if(centerPoint){
+        point = coordinateToPoint(centerPoint[1], centerPoint[0],bounds,scale,xoffset,yoffset);
+        let fontSize=data[i].textSize||config.fontSize;
+        let text=data[i].properties.name;
+        context.beginPath();
+        context.setFontSize(fontSize)
+        context.setFillStyle(data[i].textColor||'#666666')
+        context.fillText(text, point.x-measureText(text,fontSize)/2, point.y+fontSize/2);
+        context.closePath();
+        context.stroke();
+      }
+    }
+  }
+  opts.chartData.mapData={
+    bounds:bounds,
+    scale:scale,
+    xoffset:xoffset,
+    yoffset:yoffset
+  }
+  drawToolTipBridge(opts, config, context,1);
+  context.draw();
+}
+
+function getWordCloudPoint(opts,type){
+  let points = opts.series.sort(function(a,b){return parseInt(b.textSize)-parseInt(a.textSize);});
+  switch (type) {
+    case 'normal':
+      for (let i = 0; i < points.length; i++) {
+        let text = points[i].name;
+        let tHeight = points[i].textSize;
+        let tWidth = measureText(text,tHeight);
+        let x,y;
+        let area;
+        let breaknum=0;
+        while(true) {
+            breaknum++;
+            x = normalInt(-opts.width/2, opts.width/2,5) - tWidth/2;
+            y = normalInt(-opts.height/2, opts.height/2,5) + tHeight/2;
+            area=[x-5+opts.width/2,y-5-tHeight+opts.height/2,x+tWidth+5+opts.width/2,y+5+opts.height/2];
+            let isCollision = collisionNew(area,points,opts.width,opts.height);
+            if (!isCollision) break;
+            if (breaknum==1000){
+              area=[-100,-100,-100,-100];
+              break;
+            }
+        };
+        points[i].area=area;
+      }
+    break;
+    case 'vertical':
+      function Spin(){
+        //获取均匀随机值，是否旋转，旋转的概率为（1-0.5）
+        if (Math.random()>0.7) {
+            return true;
+        }else {return false};
+      };
+      for (let i = 0; i < points.length; i++) {
+        let text = points[i].name;
+        let tHeight = points[i].textSize;
+        let tWidth = measureText(text,tHeight);
+        let isSpin = Spin();
+        let x,y,area,areav;
+        let breaknum=0;
+        while(true) {
+          breaknum++;
+          let isCollision;
+          if (isSpin) {
+              x = normalInt(-opts.width/2, opts.width/2,5) - tWidth/2;
+              y = normalInt(-opts.height/2, opts.height/2,5)+tHeight/2;
+              area=[y-5-tWidth+opts.width/2,(-x-5+opts.height/2),y+5+opts.width/2,(-x+tHeight+5+opts.height/2)];
+              areav=[opts.width-(opts.width/2-opts.height/2)-(-x+tHeight+5+opts.height/2)-5,(opts.height/2-opts.width/2)+(y-5-tWidth+opts.width/2)-5,opts.width-(opts.width/2-opts.height/2)-(-x+tHeight+5+opts.height/2)+tHeight,(opts.height/2-opts.width/2)+(y-5-tWidth+opts.width/2)+tWidth+5];
+              isCollision = collisionNew(areav,points,opts.height,opts.width);
+          }else{
+            x = normalInt(-opts.width/2, opts.width/2,5) - tWidth/2;
+            y = normalInt(-opts.height/2, opts.height/2,5)+tHeight/2;
+            area=[x-5+opts.width/2,y-5-tHeight+opts.height/2,x+tWidth+5+opts.width/2,y+5+opts.height/2];
+            isCollision = collisionNew(area,points,opts.width,opts.height);
+          }
+          if (!isCollision) break;
+          if (breaknum==1000){
+            area=[-1000,-1000,-1000,-1000];
+            break;
+          }
+        };
+        if (isSpin) {
+          points[i].area=areav;
+          points[i].areav=area;
+        }else{
+          points[i].area=area;
+        }
+        points[i].rotate=isSpin;
+      };
+    break;
+  }
+  return points;
+}
+
+
+function drawWordCloudDataPoints(series, opts, config, context) {
+  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  let wordOption = assign({},{
+    type: 'normal',
+    autoColors: true
+  },opts.extra.word);
+
+  context.beginPath();
+  context.setFillStyle(opts.background||'#FFFFFF');
+  context.rect(0,0,opts.width,opts.height);
+  context.fill();
+  context.save();
+  let points = opts.chartData.wordCloudData;
+  context.translate(opts.width/2,opts.height/2);
+
+  for(let i=0;i<points.length;i++){
+      context.save();
+      if(points[i].rotate){
+        context.rotate(90 * Math.PI / 180);
+      }
+      let text = points[i].name;
+      let tHeight = points[i].textSize;
+      let tWidth = measureText(text,tHeight);
+      context.beginPath();
+      context.setStrokeStyle(points[i].color);
+      context.setFillStyle(points[i].color);
+      context.setFontSize(tHeight);
+      if(points[i].rotate){
+        if(points[i].areav[0]>0){
+          if (opts.tooltip) {
+            if (opts.tooltip.index == i) {
+              context.strokeText(text,(points[i].areav[0]+5-opts.width/2)*process-tWidth*(1-process)/2,(points[i].areav[1]+5+tHeight-opts.height/2)*process);
+              }else{
+                context.fillText(text,(points[i].areav[0]+5-opts.width/2)*process-tWidth*(1-process)/2,(points[i].areav[1]+5+tHeight-opts.height/2)*process);
+              }
+          }else{
+            context.fillText(text,(points[i].areav[0]+5-opts.width/2)*process-tWidth*(1-process)/2,(points[i].areav[1]+5+tHeight-opts.height/2)*process);
+          }
+        }
+      }else{
+        if(points[i].area[0]>0){
+          if (opts.tooltip) {
+            if (opts.tooltip.index == i) {
+              context.strokeText(text,(points[i].area[0]+5-opts.width/2)*process-tWidth*(1-process)/2,(points[i].area[1]+5+tHeight-opts.height/2)*process);
+            }else{
+              context.fillText(text,(points[i].area[0]+5-opts.width/2)*process-tWidth*(1-process)/2,(points[i].area[1]+5+tHeight-opts.height/2)*process);
+            }
+          }else{
+            context.fillText(text,(points[i].area[0]+5-opts.width/2)*process-tWidth*(1-process)/2,(points[i].area[1]+5+tHeight-opts.height/2)*process);
+          }
+
+        }
+      }
+
+      context.stroke();
+      context.restore();
+  }
+  context.restore();
+}
+
+function drawFunnelDataPoints(series, opts, config, context) {
+  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  let funnelOption = assign({},{
+    activeWidth:10,
+    activeOpacity:0.3,
+    border:false,
+    borderWidth:2,
+    borderColor:'#FFFFFF',
+    fillOpacity:1,
+    labelAlign:'right'
+  },opts.extra.funnel);
+  let eachSpacing = (opts.height - opts.area[0] - opts.area[2])/series.length;
+  let centerPosition = {
+    x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
+    y: opts.height-opts.area[2]
+  };
+  let activeWidth = funnelOption.activeWidth;
+  let radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - activeWidth, (opts.height - opts.area[0] - opts.area[2]) / 2 - activeWidth);
+  series = getFunnelDataPoints(series, radius, process);
+  context.save();
+  context.translate(centerPosition.x,centerPosition.y);
+  for(let i=0;i<series.length;i++){
+    if(i==0){
+      if (opts.tooltip) {
+        if (opts.tooltip.index == i) {
+          context.beginPath();
+          context.setFillStyle(hexToRgb(series[i].color, funnelOption.activeOpacity));
+          context.moveTo(-activeWidth, 0);
+          context.lineTo(-series[i].radius-activeWidth, -eachSpacing);
+          context.lineTo(series[i].radius+activeWidth, -eachSpacing);
+          context.lineTo(activeWidth, 0);
+          context.lineTo(-activeWidth, 0);
+          context.closePath();
+          context.fill();
+        }
+      }
+      series[i].funnelArea=[centerPosition.x-series[i].radius,centerPosition.y-eachSpacing,centerPosition.x+series[i].radius,centerPosition.y];
+      context.beginPath();
+      context.setLineWidth(funnelOption.borderWidth * opts.pixelRatio);
+      context.setStrokeStyle(funnelOption.borderColor);
+      context.setFillStyle(hexToRgb(series[i].color, funnelOption.fillOpacity));
+      context.moveTo(0, 0);
+      context.lineTo(-series[i].radius, -eachSpacing);
+      context.lineTo(series[i].radius, -eachSpacing);
+      context.lineTo(0, 0);
+      context.closePath();
+      context.fill();
+      if(funnelOption.border == true){
+        context.stroke();
+      }
+    }else{
+      if (opts.tooltip) {
+        if (opts.tooltip.index == i) {
+          context.beginPath();
+          context.setFillStyle(hexToRgb(series[i].color, funnelOption.activeOpacity));
+          context.moveTo(0, 0);
+          context.lineTo(-series[i-1].radius-activeWidth, 0);
+          context.lineTo(-series[i].radius-activeWidth, -eachSpacing);
+          context.lineTo(series[i].radius+activeWidth, -eachSpacing);
+          context.lineTo(series[i-1].radius+activeWidth, 0);
+          context.lineTo(0, 0);
+          context.closePath();
+          context.fill();
+          context.closePath();
+          context.fill();
+        }
+      }
+      series[i].funnelArea=[centerPosition.x-series[i].radius,centerPosition.y-eachSpacing*(i+1),centerPosition.x+series[i].radius,centerPosition.y-eachSpacing*i];
+      context.beginPath();
+      context.setLineWidth(funnelOption.borderWidth * opts.pixelRatio);
+      context.setStrokeStyle(funnelOption.borderColor);
+      context.setFillStyle(hexToRgb(series[i].color, funnelOption.fillOpacity));
+      context.moveTo(0, 0);
+      context.lineTo(-series[i-1].radius, 0);
+      context.lineTo(-series[i].radius, -eachSpacing);
+      context.lineTo(series[i].radius, -eachSpacing);
+      context.lineTo(series[i-1].radius, 0);
+      context.lineTo(0, 0);
+      context.closePath();
+      context.fill();
+      if(funnelOption.border == true){
+        context.stroke();
+      }
+    }
+    context.translate(0,-eachSpacing)
+  }
+  context.restore();
+
+  if (opts.dataLabel !== false && process === 1) {
+    drawFunnelText(series, opts, context, eachSpacing, funnelOption.labelAlign, activeWidth, centerPosition);
+  }
+
+  return {
+    center: centerPosition,
+    radius: radius,
+    series: series
+  };
+}
+
+function drawFunnelText(series, opts, context, eachSpacing, labelAlign,activeWidth, centerPosition){
+  for(let i=0;i<series.length;i++){
+    let item = series[i];
+    let startX,endX,startY,fontSize;
+    let text = item.format ? item.format(+item._proportion_.toFixed(2)) : util.toFixed(item._proportion_ * 100) +'%';
+    if(labelAlign == 'right'){
+      if(i==0){
+        startX=(item.funnelArea[2]+centerPosition.x)/2;
+      }else{
+        startX=(item.funnelArea[2]+series[i-1].funnelArea[2])/2;
+      }
+      endX=startX+activeWidth*2;
+      startY=item.funnelArea[1]+eachSpacing/2;
+      fontSize = item.textSize || opts.fontSize;
+      context.setLineWidth(1 * opts.pixelRatio);
+      context.setStrokeStyle(item.color);
+      context.setFillStyle(item.color);
+      context.beginPath();
+      context.moveTo(startX,startY );
+      context.lineTo(endX,startY);
+      context.stroke();
+      context.closePath();
+      context.beginPath();
+      context.moveTo(endX, startY);
+      context.arc(endX, startY, 2, 0, 2 * Math.PI);
+      context.closePath();
+      context.fill();
+      context.beginPath();
+      context.setFontSize(fontSize);
+      context.setFillStyle(item.textColor || '#666666');
+      context.fillText(text, endX+5, startY + fontSize/2 -2);
+      context.closePath();
+      context.stroke();
+      context.closePath();
+    }else{
+      if(i==0){
+        startX=(item.funnelArea[0]+centerPosition.x)/2;
+      }else{
+        startX=(item.funnelArea[0]+series[i-1].funnelArea[0])/2;
+      }
+      endX=startX-activeWidth*2;
+      startY=item.funnelArea[1]+eachSpacing/2;
+      fontSize = item.textSize || opts.fontSize;
+      context.setLineWidth(1 * opts.pixelRatio);
+      context.setStrokeStyle(item.color);
+      context.setFillStyle(item.color);
+      context.beginPath();
+      context.moveTo(startX,startY );
+      context.lineTo(endX,startY);
+      context.stroke();
+      context.closePath();
+      context.beginPath();
+      context.moveTo(endX, startY);
+      context.arc(endX, startY, 2, 0, 2 * Math.PI);
+      context.closePath();
+      context.fill();
+      context.beginPath();
+      context.setFontSize(fontSize);
+      context.setFillStyle(item.textColor || '#666666');
+      context.fillText(text, endX-5-measureText(text), startY + fontSize/2 -2);
+      context.closePath();
+      context.stroke();
+      context.closePath();
+    }
+
+  }
+}
+
+
+function drawCanvas(opts, context) {
+  context.draw();
+}
+
+var Timing = {
+  easeIn: function easeIn(pos) {
+    return Math.pow(pos, 3);
+  },
+  easeOut: function easeOut(pos) {
+    return Math.pow(pos - 1, 3) + 1;
+  },
+  easeInOut: function easeInOut(pos) {
+    if ((pos /= 0.5) < 1) {
+      return 0.5 * Math.pow(pos, 3);
+    } else {
+      return 0.5 * (Math.pow(pos - 2, 3) + 2);
+    }
+  },
+  linear: function linear(pos) {
+    return pos;
+  }
+};
+
+function Animation(opts) {
+  this.isStop = false;
+  opts.duration = typeof opts.duration === 'undefined' ? 1000 : opts.duration;
+  opts.timing = opts.timing || 'linear';
+  var delay = 17;
+
+  function createAnimationFrame() {
+    if (typeof setTimeout !== 'undefined') {
+      return function(step, delay) {
+        setTimeout(function() {
+          var timeStamp = +new Date();
+          step(timeStamp);
+        }, delay);
+      };
+    } else if (typeof requestAnimationFrame !== 'undefined') {
+      return requestAnimationFrame;
+    } else {
+      return function(step) {
+        step(null);
+      };
+    }
+  };
+  var animationFrame = createAnimationFrame();
+  var startTimeStamp = null;
+  var _step = function step(timestamp) {
+    if (timestamp === null || this.isStop === true) {
+      opts.onProcess && opts.onProcess(1);
+      opts.onAnimationFinish && opts.onAnimationFinish();
+      return;
+    }
+    if (startTimeStamp === null) {
+      startTimeStamp = timestamp;
+    }
+    if (timestamp - startTimeStamp < opts.duration) {
+      var process = (timestamp - startTimeStamp) / opts.duration;
+      var timingFunction = Timing[opts.timing];
+      process = timingFunction(process);
+
+      opts.onProcess && opts.onProcess(process);
+      animationFrame(_step, delay);
+    } else {
+      opts.onProcess && opts.onProcess(1);
+      opts.onAnimationFinish && opts.onAnimationFinish();
+    }
+  };
+  _step = _step.bind(this);
+  animationFrame(_step, delay);
+}
+
+// stop animation immediately
+// and tigger onAnimationFinish
+Animation.prototype.stop = function() {
+  this.isStop = true;
+};
+
+function drawCharts(type, opts, config, context) {
+  var _this = this;
+  var series = opts.series;
+  var categories = opts.categories;
+  series = fillSeries(series, opts, config);
+  var duration = opts.animation ? opts.duration : 0;
+  this.animationInstance && this.animationInstance.stop();
+  var seriesMA = null;
+  if (type == 'candle') {
+    let average = assign({}, opts.extra.candle.average);
+    if (average.show) {
+      seriesMA = calCandleMA(average.day, average.name, average.color, series[0].data);
+      seriesMA = fillSeries(seriesMA, opts, config);
+      opts.seriesMA = seriesMA;
+    } else if (opts.seriesMA) {
+      seriesMA = opts.seriesMA = fillSeries(opts.seriesMA, opts, config);
+    } else {
+      seriesMA = series;
+    }
+  } else {
+    seriesMA = series;
+  }
+
+  /* 过滤掉show=false的series */
+  opts._series_ = series = filterSeries(series);
+
+  //重新计算图表区域
+
+  opts.area = new Array(4);
+  //复位绘图区域
+  for (let j = 0; j < 4; j++) {
+    opts.area[j] = opts.padding[j];
+  }
+
+  //通过计算三大区域：图例、X轴、Y轴的大小，确定绘图区域
+  var _calLegendData = calLegendData(seriesMA, opts, config, opts.chartData),
+    legendHeight = _calLegendData.area.wholeHeight,
+    legendWidth = _calLegendData.area.wholeWidth;
+  //TODO废弃config.legendHeight参数
+  config.legendHeight = legendHeight;
+  switch (opts.legend.position) {
+    case 'top':
+      opts.area[0] += legendHeight;
+      break;
+    case 'bottom':
+      opts.area[2] += legendHeight;
+      break;
+    case 'left':
+      opts.area[3] += legendWidth;
+      break;
+    case 'right':
+      opts.area[1] += legendWidth;
+      break;
+  }
+
+  let _calYAxisData = {},yAxisWidth = 0;
+  if (opts.type === 'line' || opts.type === 'column' || opts.type === 'area' || opts.type === 'mix' || opts.type === 'candle') {
+    _calYAxisData = calYAxisData(series, opts, config);
+    yAxisWidth = _calYAxisData.yAxisWidth;
+    config.yAxisWidth = yAxisWidth;
+    opts.area[3] += yAxisWidth;
+  } else {
+    config.yAxisWidth = yAxisWidth;
+  }
+  opts.chartData.yAxisData = _calYAxisData;
+
+  if (opts.categories && opts.categories.length) {
+    opts.chartData.xAxisData = getXAxisPoints(opts.categories, opts, config);
+    let _calCategoriesData = calCategoriesData(opts.categories, opts, config, opts.chartData.xAxisData.eachSpacing),
+      xAxisHeight = _calCategoriesData.xAxisHeight,
+      angle = _calCategoriesData.angle;
+    config.xAxisHeight = xAxisHeight;
+    config._xAxisTextAngle_ = angle;
+    opts.area[2] += xAxisHeight;
+    opts.chartData.categoriesData = _calCategoriesData;
+  }
+
+  //计算右对齐偏移距离
+  if (opts.enableScroll && opts.xAxis.scrollAlign == 'right' && opts._scrollDistance_ === undefined) {
+    let offsetLeft = 0,
+      xAxisPoints = opts.chartData.xAxisData.xAxisPoints,
+      startX = opts.chartData.xAxisData.startX,
+      endX = opts.chartData.xAxisData.endX,
+      eachSpacing = opts.chartData.xAxisData.eachSpacing;
+    let totalWidth = eachSpacing * (xAxisPoints.length - 1);
+    let screenWidth = endX - startX;
+    offsetLeft = screenWidth - totalWidth;
+    _this.scrollOption = {
+      currentOffset: offsetLeft,
+      startTouchX: offsetLeft,
+      distance: 0,
+      lastMoveTime: 0
+    };
+    opts._scrollDistance_ = offsetLeft;
+  }
+
+  if (type === 'pie' || type === 'ring' || type === 'rose') {
+    config._pieTextMaxLength_ = opts.dataLabel === false ? 0 : getPieTextMaxLength(seriesMA);
+  }
+
+  switch (type) {
+    case 'word':
+      let wordOption = assign({},{
+        type: 'normal',
+        autoColors: true
+      },opts.extra.word);
+      if(opts.updateData==true || opts.updateData==undefined){
+        opts.chartData.wordCloudData=getWordCloudPoint(opts,wordOption.type);
+      }
+      this.animationInstance = new Animation({
+        timing: 'easeInOut',
+        duration: duration,
+        onProcess: function(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawWordCloudDataPoints(series, opts, config, context,process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+    break;
+    case 'map':
+      context.clearRect(0, 0, opts.width, opts.height);
+      drawMapDataPoints(series, opts, config, context);
+    break;
+    case 'funnel':
+      this.animationInstance = new Animation({
+        timing: 'easeInOut',
+        duration: duration,
+        onProcess: function(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.funnelData = drawFunnelDataPoints(series, opts, config, context, process);
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+    break;
+    case 'line':
+      this.animationInstance = new Animation({
+        timing: 'easeIn',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawLineDataPoints = drawLineDataPoints(series, opts, config, context, process),
+            xAxisPoints = _drawLineDataPoints.xAxisPoints,
+            calPoints = _drawLineDataPoints.calPoints,
+            eachSpacing = _drawLineDataPoints.eachSpacing,
+            minRange = _drawLineDataPoints.minRange,
+            maxRange = _drawLineDataPoints.maxRange;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(minRange, maxRange, opts, config, context);
+          }
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'mix':
+      this.animationInstance = new Animation({
+        timing: 'easeIn',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawMixDataPoints = drawMixDataPoints(series, opts, config, context, process),
+            xAxisPoints = _drawMixDataPoints.xAxisPoints,
+            calPoints = _drawMixDataPoints.calPoints,
+            eachSpacing = _drawMixDataPoints.eachSpacing,
+            minRange = _drawMixDataPoints.minRange,
+            maxRange = _drawMixDataPoints.maxRange;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(minRange, maxRange, opts, config, context);
+          }
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'column':
+      this.animationInstance = new Animation({
+        timing: 'easeIn',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawColumnDataPoints = drawColumnDataPoints(series, opts, config, context, process),
+            xAxisPoints = _drawColumnDataPoints.xAxisPoints,
+            calPoints = _drawColumnDataPoints.calPoints,
+            eachSpacing = _drawColumnDataPoints.eachSpacing,
+            minRange = _drawColumnDataPoints.minRange,
+            maxRange = _drawColumnDataPoints.maxRange;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(minRange, maxRange, opts, config, context);
+          }
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'area':
+      this.animationInstance = new Animation({
+        timing: 'easeIn',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawAreaDataPoints = drawAreaDataPoints(series, opts, config, context, process),
+            xAxisPoints = _drawAreaDataPoints.xAxisPoints,
+            calPoints = _drawAreaDataPoints.calPoints,
+            eachSpacing = _drawAreaDataPoints.eachSpacing,
+            minRange = _drawAreaDataPoints.minRange,
+            maxRange = _drawAreaDataPoints.maxRange;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(minRange, maxRange, opts, config, context);
+          }
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'ring':
+    case 'pie':
+      this.animationInstance = new Animation({
+        timing: 'easeInOut',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.pieData = drawPieDataPoints(series, opts, config, context, process);
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'rose':
+      this.animationInstance = new Animation({
+        timing: 'easeInOut',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.pieData = drawRoseDataPoints(series, opts, config, context, process);
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'radar':
+      this.animationInstance = new Animation({
+        timing: 'easeInOut',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.radarData = drawRadarDataPoints(series, opts, config, context, process);
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'arcbar':
+      this.animationInstance = new Animation({
+        timing: 'easeInOut',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.arcbarData = drawArcbarDataPoints(series, opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'gauge':
+      this.animationInstance = new Animation({
+        timing: 'easeInOut',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.gaugeData = drawGaugeDataPoints(categories, series, opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'candle':
+      this.animationInstance = new Animation({
+        timing: 'easeIn',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawCandleDataPoints = drawCandleDataPoints(series, seriesMA, opts, config, context, process),
+            xAxisPoints = _drawCandleDataPoints.xAxisPoints,
+            calPoints = _drawCandleDataPoints.calPoints,
+            eachSpacing = _drawCandleDataPoints.eachSpacing,
+            minRange = _drawCandleDataPoints.minRange,
+            maxRange = _drawCandleDataPoints.maxRange;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(minRange, maxRange, opts, config, context);
+          }
+          if (seriesMA) {
+            drawLegend(seriesMA, opts, config, context, opts.chartData);
+          } else {
+            drawLegend(opts.series, opts, config, context, opts.chartData);
+          }
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+  }
+}
+
+// simple event implement
+
+function Event() {
+  this.events = {};
+}
+
+Event.prototype.addEventListener = function(type, listener) {
+  this.events[type] = this.events[type] || [];
+  this.events[type].push(listener);
+};
+
+Event.prototype.trigger = function() {
+  for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+    args[_key] = arguments[_key];
+  }
+
+  var type = args[0];
+  var params = args.slice(1);
+  if (!!this.events[type]) {
+    this.events[type].forEach(function(listener) {
+      try {
+        listener.apply(null, params);
+      } catch (e) {
+        console.error(e);
+      }
+    });
+  }
+};
+
+var Charts = function Charts(opts) {
+  opts.pixelRatio = opts.pixelRatio ? opts.pixelRatio : 1;
+  opts.fontSize = opts.fontSize ? opts.fontSize * opts.pixelRatio : 13 * opts.pixelRatio;
+  opts.title = assign({}, opts.title);
+  opts.subtitle = assign({}, opts.subtitle);
+  opts.duration = opts.duration ? opts.duration : 1000;
+  opts.yAxis = assign({}, {
+    gridType: 'solid',
+    dashLength: 4 * opts.pixelRatio
+  }, opts.yAxis);
+  opts.xAxis = assign({}, {
+    rotateLabel: false,
+    type: 'calibration',
+    gridType: 'solid',
+    dashLength: 4 * opts.pixelRatio,
+    scrollAlign: 'left',
+    boundaryGap:'center'
+  }, opts.xAxis);
+  opts.legend = assign({}, {
+    show: true,
+    position: 'bottom',
+    float: 'center',
+    backgroundColor: 'rgba(0,0,0,0)',
+    borderColor: 'rgba(0,0,0,0)',
+    borderWidth: 0,
+    padding: 5,
+    margin: 5,
+    itemGap: 10,
+    fontSize: opts.fontSize,
+    lineHeight: opts.fontSize,
+    fontColor: '#333333',
+    format: {},
+    hiddenColor: '#CECECE'
+  }, opts.legend);
+  opts.legend.borderWidth = opts.legend.borderWidth * opts.pixelRatio;
+  opts.legend.itemGap = opts.legend.itemGap * opts.pixelRatio;
+  opts.legend.padding = opts.legend.padding * opts.pixelRatio;
+  opts.legend.margin = opts.legend.margin * opts.pixelRatio;
+  opts.extra = assign({}, opts.extra);
+  opts.rotate = opts.rotate ? true : false;
+  opts.animation = opts.animation ? true : false;
+
+  let config$$1 = JSON.parse(JSON.stringify(config));
+  config$$1.colors = opts.colors ? opts.colors : config$$1.colors;
+  config$$1.yAxisTitleWidth = opts.yAxis.disabled !== true && opts.yAxis.title ? config$$1.yAxisTitleWidth : 0;
+  if (opts.type == 'pie' || opts.type == 'ring') {
+    config$$1.pieChartLinePadding = opts.dataLabel === false ? 0 : opts.extra.pie.labelWidth * opts.pixelRatio || config$$1.pieChartLinePadding * opts.pixelRatio;
+  }
+  if (opts.type == 'rose') {
+    config$$1.pieChartLinePadding = opts.dataLabel === false ? 0 : opts.extra.rose.labelWidth * opts.pixelRatio || config$$1.pieChartLinePadding * opts.pixelRatio;
+  }
+  config$$1.pieChartTextPadding = opts.dataLabel === false ? 0 : config$$1.pieChartTextPadding * opts.pixelRatio;
+  config$$1.yAxisSplit = opts.yAxis.splitNumber ? opts.yAxis.splitNumber : config.yAxisSplit;
+
+  //屏幕旋转
+  config$$1.rotate = opts.rotate;
+  if (opts.rotate) {
+    let tempWidth = opts.width;
+    let tempHeight = opts.height;
+    opts.width = tempHeight;
+    opts.height = tempWidth;
+  }
+
+  //适配高分屏
+  opts.padding = opts.padding ? opts.padding : config$$1.padding;
+  for (let i = 0; i < 4; i++) {
+    opts.padding[i] *= opts.pixelRatio;
+  }
+  config$$1.yAxisWidth = config.yAxisWidth * opts.pixelRatio;
+  config$$1.xAxisHeight = config.xAxisHeight * opts.pixelRatio;
+  if (opts.enableScroll && opts.xAxis.scrollShow) {
+    config$$1.xAxisHeight += 6 * opts.pixelRatio;
+  }
+  config$$1.xAxisLineHeight = config.xAxisLineHeight * opts.pixelRatio;
+  config$$1.legendHeight = config.legendHeight * opts.pixelRatio;
+  config$$1.fontSize = opts.fontSize;
+  config$$1.titleFontSize = config.titleFontSize * opts.pixelRatio;
+  config$$1.subtitleFontSize = config.subtitleFontSize * opts.pixelRatio;
+  config$$1.toolTipPadding = config.toolTipPadding * opts.pixelRatio;
+  config$$1.toolTipLineHeight = config.toolTipLineHeight * opts.pixelRatio;
+  config$$1.columePadding = config.columePadding * opts.pixelRatio;
+  opts.$this = opts.$this ? opts.$this : this;
+
+  this.context = uni.createCanvasContext(opts.canvasId, opts.$this);
+  /* 兼容原生H5
+  this.context = document.getElementById(opts.canvasId).getContext("2d");
+  this.context.setStrokeStyle = function(e){ return this.strokeStyle=e; }
+  this.context.setLineWidth = function(e){ return this.lineWidth=e; }
+  this.context.setLineCap = function(e){ return this.lineCap=e; }
+  this.context.setFontSize = function(e){ return this.font=e+"px sans-serif"; }
+  this.context.setFillStyle = function(e){ return this.fillStyle=e; }
+  this.context.draw = function(){ }
+  */
+
+  opts.chartData = {};
+  this.event = new Event();
+  this.scrollOption = {
+    currentOffset: 0,
+    startTouchX: 0,
+    distance: 0,
+    lastMoveTime: 0
+  };
+
+  this.opts = opts;
+  this.config = config$$1;
+
+  drawCharts.call(this, opts.type, opts, config$$1, this.context);
+};
+
+Charts.prototype.updateData = function() {
+  let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  this.opts = assign({}, this.opts, data);
+  this.opts.updateData = true;
+  let scrollPosition = data.scrollPosition || 'current';
+  switch (scrollPosition) {
+    case 'current':
+      this.opts._scrollDistance_ = this.scrollOption.currentOffset;
+      break;
+    case 'left':
+      this.opts._scrollDistance_ = 0;
+      this.scrollOption = {
+        currentOffset: 0,
+        startTouchX: 0,
+        distance: 0,
+        lastMoveTime: 0
+      };
+      break;
+    case 'right':
+      let _calYAxisData = calYAxisData(this.opts.series, this.opts, this.config),
+        yAxisWidth = _calYAxisData.yAxisWidth;
+      this.config.yAxisWidth = yAxisWidth;
+      let offsetLeft = 0;
+      let _getXAxisPoints0 = getXAxisPoints(this.opts.categories, this.opts, this.config),
+        xAxisPoints = _getXAxisPoints0.xAxisPoints,
+        startX = _getXAxisPoints0.startX,
+        endX = _getXAxisPoints0.endX,
+        eachSpacing = _getXAxisPoints0.eachSpacing;
+      let totalWidth = eachSpacing * (xAxisPoints.length - 1);
+      let screenWidth = endX - startX;
+      offsetLeft = screenWidth - totalWidth;
+      this.scrollOption = {
+        currentOffset: offsetLeft,
+        startTouchX: offsetLeft,
+        distance: 0,
+        lastMoveTime: 0
+      };
+      this.opts._scrollDistance_ = offsetLeft;
+      break;
+  }
+  drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
+};
+
+Charts.prototype.zoom = function() {
+  var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.opts.xAxis.itemCount;
+  if (this.opts.enableScroll !== true) {
+    console.log('请启用滚动条后使用！')
+    return;
+  }
+  //当前屏幕中间点
+  let centerPoint = Math.round(Math.abs(this.scrollOption.currentOffset) / this.opts.chartData.eachSpacing) + Math.round(
+    this.opts.xAxis.itemCount / 2);
+  this.opts.animation = false;
+  this.opts.xAxis.itemCount = val.itemCount;
+  //重新计算x轴偏移距离
+  let _calYAxisData = calYAxisData(this.opts.series, this.opts, this.config),
+    yAxisWidth = _calYAxisData.yAxisWidth;
+  this.config.yAxisWidth = yAxisWidth;
+  let offsetLeft = 0;
+  let _getXAxisPoints0 = getXAxisPoints(this.opts.categories, this.opts, this.config),
+    xAxisPoints = _getXAxisPoints0.xAxisPoints,
+    startX = _getXAxisPoints0.startX,
+    endX = _getXAxisPoints0.endX,
+    eachSpacing = _getXAxisPoints0.eachSpacing;
+  let centerLeft = eachSpacing * centerPoint;
+  let screenWidth = endX - startX;
+  let MaxLeft = screenWidth - eachSpacing * (xAxisPoints.length - 1);
+  offsetLeft = screenWidth / 2 - centerLeft;
+  if (offsetLeft > 0) {
+    offsetLeft = 0;
+  }
+  if (offsetLeft < MaxLeft) {
+    offsetLeft = MaxLeft;
+  }
+  this.scrollOption = {
+    currentOffset: offsetLeft,
+    startTouchX: offsetLeft,
+    distance: 0,
+    lastMoveTime: 0
+  };
+  this.opts._scrollDistance_ = offsetLeft;
+  drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
+};
+
+Charts.prototype.stopAnimation = function() {
+  this.animationInstance && this.animationInstance.stop();
+};
+
+Charts.prototype.addEventListener = function(type, listener) {
+  this.event.addEventListener(type, listener);
+};
+
+Charts.prototype.getCurrentDataIndex = function(e) {
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  if (touches) {
+    let _touches$ = getTouches(touches, this.opts, e);
+    if (this.opts.type === 'pie' || this.opts.type === 'ring' || this.opts.type === 'rose') {
+      return findPieChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.pieData);
+    } else if (this.opts.type === 'radar') {
+      return findRadarChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.radarData, this.opts.categories.length);
+    } else if (this.opts.type === 'funnel') {
+      return findFunnelChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.funnelData);
+    } else if (this.opts.type === 'map') {
+      return findMapChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts);
+    }else if (this.opts.type === 'word') {
+      return findWordChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.wordCloudData);
+    } else {
+      return findCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.xAxisPoints, this.opts, this.config, Math.abs(this.scrollOption.currentOffset));
+    }
+  }
+  return -1;
+};
+
+Charts.prototype.getLegendDataIndex = function(e) {
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  if (touches) {
+    let _touches$ = getTouches(touches, this.opts, e);
+    return findLegendIndex({
+      x: _touches$.x,
+      y: _touches$.y
+    }, this.opts.chartData.legendData);
+  }
+  return -1;
+};
+
+Charts.prototype.touchLegend = function(e) {
+  var option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  if (touches) {
+    var _touches$ = getTouches(touches, this.opts, e);
+    var index = this.getLegendDataIndex(e);
+    if (index >= 0) {
+      this.opts.series[index].show = !this.opts.series[index].show;
+      this.opts.animation = option.animation ? true : false;
+      drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
+    }
+  }
+
+};
+
+Charts.prototype.showToolTip = function(e) {
+  var option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  if (!touches) {
+    console.log("touchError");
+  }
+  var _touches$ = getTouches(touches, this.opts, e);
+  var currentOffset = this.scrollOption.currentOffset;
+  var opts = assign({}, this.opts, {
+    _scrollDistance_: currentOffset,
+    animation: false
+  });
+  if (this.opts.type === 'line' || this.opts.type === 'area' || this.opts.type === 'column') {
+    var index = this.getCurrentDataIndex(e);
+    if (index > -1) {
+      var seriesData = getSeriesDataItem(this.opts.series, index);
+      if (seriesData.length !== 0) {
+        var _getToolTipData = getToolTipData(seriesData, this.opts.chartData.calPoints, index, this.opts.categories,option),
+          textList = _getToolTipData.textList,
+          offset = _getToolTipData.offset;
+        offset.y = _touches$.y;
+        opts.tooltip = {
+          textList: textList,
+          offset: offset,
+          option: option,
+          index: index
+        };
+      }
+    }
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'mix') {
+    var index = this.getCurrentDataIndex(e);
+    if (index > -1) {
+      var currentOffset = this.scrollOption.currentOffset;
+      var opts = assign({}, this.opts, {
+        _scrollDistance_: currentOffset,
+        animation: false
+      });
+      var seriesData = getSeriesDataItem(this.opts.series, index);
+      if (seriesData.length !== 0) {
+        var _getMixToolTipData = getMixToolTipData(seriesData, this.opts.chartData.calPoints, index, this.opts.categories,option),
+          textList = _getMixToolTipData.textList,
+          offset = _getMixToolTipData.offset;
+        offset.y = _touches$.y;
+        opts.tooltip = {
+          textList: textList,
+          offset: offset,
+          option: option,
+          index: index
+        };
+      }
+    }
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'candle') {
+    var index = this.getCurrentDataIndex(e);
+    if (index > -1) {
+      var currentOffset = this.scrollOption.currentOffset;
+      var opts = assign({}, this.opts, {
+        _scrollDistance_: currentOffset,
+        animation: false
+      });
+      var seriesData = getSeriesDataItem(this.opts.series, index);
+      if (seriesData.length !== 0) {
+        var _getToolTipData = getCandleToolTipData(this.opts.series[0].data, seriesData, this.opts.chartData.calPoints,
+            index, this.opts.categories, this.opts.extra.candle, option),
+          textList = _getToolTipData.textList,
+          offset = _getToolTipData.offset;
+        offset.y = _touches$.y;
+        opts.tooltip = {
+          textList: textList,
+          offset: offset,
+          option: option,
+          index: index
+        };
+      }
+    }
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'pie' || this.opts.type === 'ring' || this.opts.type === 'rose'||this.opts.type === 'funnel' ) {
+    var index = this.getCurrentDataIndex(e);
+    if (index > -1) {
+      var currentOffset = this.scrollOption.currentOffset;
+      var opts = assign({}, this.opts, {
+        _scrollDistance_: currentOffset,
+        animation: false
+      });
+      var seriesData = this.opts._series_[index];
+      var textList = [{
+        text: option.format ? option.format(seriesData) : seriesData.name + ': ' + seriesData.data,
+        color: seriesData.color
+      }];
+      var offset = {
+        x: _touches$.x,
+        y: _touches$.y
+      };
+      opts.tooltip = {
+        textList: textList,
+        offset: offset,
+        option: option,
+        index: index
+      };
+    }
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'map'||this.opts.type === 'word') {
+    var index = this.getCurrentDataIndex(e);
+    if (index > -1) {
+      var currentOffset = this.scrollOption.currentOffset;
+      var opts = assign({}, this.opts, {
+        _scrollDistance_: currentOffset,
+        animation: false
+      });
+      var seriesData = this.opts._series_[index];
+      var textList = [{
+        text: option.format ? option.format(seriesData) : seriesData.properties.name ,
+        color: seriesData.color
+      }];
+      var offset = {
+        x: _touches$.x,
+        y: _touches$.y
+      };
+      opts.tooltip = {
+        textList: textList,
+        offset: offset,
+        option: option,
+        index: index
+      };
+    }
+    opts.updateData = false;
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'radar') {
+    var index = this.getCurrentDataIndex(e);
+    if (index > -1) {
+      var currentOffset = this.scrollOption.currentOffset;
+      var opts = assign({}, this.opts, {
+        _scrollDistance_: currentOffset,
+        animation: false
+      });
+      var seriesData = getSeriesDataItem(this.opts.series, index);
+      if (seriesData.length !== 0) {
+        var textList = seriesData.map(function(item) {
+          return {
+            text: option.format ? option.format(item) : item.name + ': ' + item.data,
+            color: item.color
+          };
+        });
+        var offset = {
+          x: _touches$.x,
+          y: _touches$.y
+        };
+        opts.tooltip = {
+          textList: textList,
+          offset: offset,
+          option: option,
+          index: index
+        };
+      }
+    }
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+};
+
+Charts.prototype.translate = function(distance) {
+  this.scrollOption = {
+    currentOffset: distance,
+    startTouchX: distance,
+    distance: 0,
+    lastMoveTime: 0
+  };
+  let opts = assign({}, this.opts, {
+    _scrollDistance_: distance,
+    animation: false
+  });
+  drawCharts.call(this, this.opts.type, opts, this.config, this.context);
+};
+
+Charts.prototype.scrollStart = function(e) {
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  var _touches$ = getTouches(touches, this.opts, e);
+  if (touches && this.opts.enableScroll === true) {
+    this.scrollOption.startTouchX = _touches$.x;
+  }
+};
+
+Charts.prototype.scroll = function(e) {
+  if (this.scrollOption.lastMoveTime === 0) {
+    this.scrollOption.lastMoveTime = Date.now();
+  }
+  let Limit = this.opts.extra.touchMoveLimit || 20;
+  let currMoveTime = Date.now();
+  let duration = currMoveTime - this.scrollOption.lastMoveTime;
+  if (duration < Math.floor(1000 / Limit)) return;
+  this.scrollOption.lastMoveTime = currMoveTime;
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  if (touches && this.opts.enableScroll === true) {
+    var _touches$ = getTouches(touches, this.opts, e);
+    var _distance;
+    _distance = _touches$.x - this.scrollOption.startTouchX;
+    var currentOffset = this.scrollOption.currentOffset;
+    var validDistance = calValidDistance(currentOffset + _distance, this.opts.chartData, this.config, this.opts);
+    this.scrollOption.distance = _distance = validDistance - currentOffset;
+    var opts = assign({}, this.opts, {
+      _scrollDistance_: currentOffset + _distance,
+      animation: false
+    });
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+    return currentOffset + _distance;
+  }
+};
+
+Charts.prototype.scrollEnd = function(e) {
+  if (this.opts.enableScroll === true) {
+    var _scrollOption = this.scrollOption,
+      currentOffset = _scrollOption.currentOffset,
+      distance = _scrollOption.distance;
+    this.scrollOption.currentOffset = currentOffset + distance;
+    this.scrollOption.distance = 0;
+  }
+};
+if (typeof module === "object" && typeof module.exports === "object") {
+  module.exports = Charts;
+  //export default Charts;//建议使用nodejs的module导出方式，如报错请使用export方式导出
+}
diff --git a/components/verifition/Verify.vue b/components/verifition/Verify.vue
new file mode 100644
index 0000000..3fe4d88
--- /dev/null
+++ b/components/verifition/Verify.vue
@@ -0,0 +1,469 @@
+<template>
+	<view :class="mode=='pop'?'mask':''" v-show="showBox">
+		<view :class="mode=='pop'?'verifybox':''" :style="{'max-width':parseInt(imgSize.width)+30+'px'}">
+			<view class="verifybox-top" v-if="mode=='pop'">
+				请完成安全验证
+				<text class="verifybox-close" @click="clickShow = false">
+					<text class="iconfont icon-close"></text>
+				</text>
+			</view>
+			<view class="verifybox-bottom" :style="{padding:mode=='pop'?'15px':'0'}">
+				<!-- 验证码容器 -->
+				<!-- 滑动 -->
+				<view v-if="componentType=='VerifySlide'">
+					<VerifySlide @success="success" :captchaType="captchaType" :type="verifyType" :figure="figure"
+						:arith="arith" :mode="mode" :vSpace="vSpace" :explain="explain" :imgSize="imgSize"
+						:blockSize="blockSize" :barSize="barSize" :defaultImg="defaultImg" ref="instance"></VerifySlide>
+				</view>
+				<!-- 点选 -->
+				<view v-if="componentType=='VerifyPoints'">
+					<VerifyPoint :captchaType="captchaType" :type="verifyType" :figure="figure" :arith="arith"
+						:mode="mode" :vSpace="vSpace" :explain="explain" :imgSize="imgSize" :blockSize="blockSize"
+						:barSize="barSize" :defaultImg="defaultImg" ref="instance"></VerifyPoint>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	/**
+	 * Verify 验证码组件
+	 * @description 分发验证码使用
+	 * */
+	import VerifySlide from './verifySlider/verifySlider'
+	import VerifyPoint from "./verifyPoint/verifyPoint"
+
+	export default {
+		name: 'Vue2Verify',
+		props: {
+			captchaType: {
+				type: String,
+				required: true
+			},
+			figure: {
+				type: Number
+			},
+			arith: {
+				type: Number
+			},
+			mode: {
+				type: String,
+				default: 'pop'
+			},
+			vSpace: {
+				type: Number,
+				default: 5
+			},
+			explain: {
+				type: String,
+				default: '向右滑动完成验证'
+			},
+			imgSize: {
+				type: Object,
+				default () {
+					return {
+						width: '310px',
+						height: '155px'
+					}
+				}
+			},
+			blockSize: {
+				type: Object,
+				default () {
+					return {
+						width: '50px',
+						height: '50px'
+					}
+				}
+			},
+			barSize: {
+				type: Object
+			},
+		},
+		data() {
+			return {
+				// showBox:true,
+				clickShow: false,
+				// 内部类型
+				verifyType: undefined,
+				// 所用组件类型
+				componentType: undefined,
+				defaultImg: require('@/static/images/default.jpg')
+			}
+		},
+		mounted() {
+			this.uuid()
+		},
+		methods: {
+			// 生成 uuid
+			uuid() {
+				var s = [];
+				var hexDigits = "0123456789abcdef";
+				for (var i = 0; i < 36; i++) {
+					s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+				}
+				s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010
+				s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
+				s[8] = s[13] = s[18] = s[23] = "-";
+
+				var slider = 'slider' + '-' + s.join("");
+				var point = 'point' + '-' + s.join("");
+				// 判断下是否存在 slider
+				if (!uni.getStorageSync('slider')) {
+					uni.setStorageSync('slider', slider)
+				}
+				if (!uni.getStorageSync('point')) {
+					uni.setStorageSync("point", point);
+				}
+			},
+			success(e) {
+				this.$emit('success', e)
+			},
+			/**
+			 * refresh
+			 * @description 刷新
+			 * */
+			refresh() {
+				if (this.instance.refresh) {
+					this.instance.refresh()
+				}
+			},
+			show() {
+				if (this.mode == "pop") {
+					this.clickShow = true;
+				}
+			}
+		},
+		computed: {
+			instance() {
+				return this.$refs.instance || {}
+			},
+			showBox() {
+				if (this.mode == 'pop') {
+					return this.clickShow
+				} else {
+					return true;
+				}
+			}
+		},
+		watch: {
+			captchaType: {
+				immediate: true,
+				handler(captchaType) {
+					switch (captchaType.toString()) {
+						case 'blockPuzzle':
+							this.verifyType = '2'
+							this.componentType = 'VerifySlide'
+							break
+						case 'clickWord':
+							this.verifyType = ''
+							this.componentType = 'VerifyPoints'
+							break
+					}
+				}
+			},
+		},
+		components: {
+			VerifySlide,
+			VerifyPoint
+		},
+	}
+</script>
+<style>
+	.verifybox {
+		position: relative;
+		box-sizing: border-box;
+		border-radius: 2px;
+		border: 1px solid #e4e7eb;
+		background-color: #fff;
+		box-shadow: 0 0 10px rgba(0, 0, 0, .3);
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+	}
+
+	.verifybox-top {
+		padding: 0 15px;
+		height: 50px;
+		line-height: 50px;
+		text-align: left;
+		font-size: 16px;
+		color: #45494c;
+		border-bottom: 1px solid #e4e7eb;
+		box-sizing: border-box;
+	}
+
+	.verifybox-bottom {
+		/* padding: 15px; */
+		box-sizing: border-box;
+	}
+
+	.verifybox-close {
+		position: absolute;
+		top: 13px;
+		right: 9px;
+		width: 24px;
+		height: 24px;
+		text-align: center;
+		cursor: pointer;
+	}
+
+	.mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 1001;
+		width: 100%;
+		height: 100vh;
+		background: rgba(0, 0, 0, .3);
+		/* display: none; */
+		transition: all .5s;
+	}
+
+	.verify-tips {
+		position: absolute;
+		left: 0px;
+		bottom: 0px;
+		width: 100%;
+		height: 30px;
+		background-color: rgb(231, 27, 27, .5);
+		line-height: 30px;
+		color: #fff;
+	}
+
+	.tips-enter,
+	.tips-leave-to {
+		bottom: -30px;
+	}
+
+	.tips-enter-active,
+	.tips-leave-active {
+		transition: bottom .5s;
+	}
+
+	/* ---------------------------- */
+	/*常规验证码*/
+	.verify-code {
+		font-size: 20px;
+		text-align: center;
+		cursor: pointer;
+		margin-bottom: 5px;
+		border: 1px solid #ddd;
+	}
+
+	.cerify-code-panel {
+		height: 100%;
+		overflow: hidden;
+	}
+
+	.verify-code-area {
+		float: left;
+	}
+
+	.verify-input-area {
+		float: left;
+		width: 60%;
+		padding-right: 10px;
+
+	}
+
+	.verify-change-area {
+		line-height: 30px;
+		float: left;
+	}
+
+	.varify-input-code {
+		display: inline-block;
+		width: 100%;
+		height: 25px;
+	}
+
+	.verify-change-code {
+		color: #337AB7;
+		cursor: pointer;
+	}
+
+	.verify-btn {
+		width: 200px;
+		height: 30px;
+		background-color: #337AB7;
+		color: #FFFFFF;
+		border: none;
+		margin-top: 10px;
+	}
+
+
+	/*滑动验证码*/
+	.verify-bar-area {
+		position: relative;
+		background: #FFFFFF;
+		text-align: center;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		border: 1px solid #ddd;
+		-webkit-border-radius: 4px;
+	}
+
+	.verify-bar-area .verify-move-block {
+		position: absolute;
+		top: 0px;
+		left: 0;
+		background: #fff;
+		cursor: pointer;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		box-shadow: 0 0 2px #888888;
+		-webkit-border-radius: 1px;
+	}
+
+	.verify-bar-area .verify-move-block:hover {
+		background-color: #337ab7;
+		color: #FFFFFF;
+	}
+
+	.verify-bar-area .verify-left-bar {
+		position: absolute;
+		top: -1px;
+		left: -1px;
+		background: #f0fff0;
+		cursor: pointer;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		border: 1px solid #ddd;
+	}
+
+	.verify-img-panel {
+		margin: 0;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		border-top: 1px solid #ddd;
+		border-bottom: 1px solid #ddd;
+		border-radius: 3px;
+		position: relative;
+	}
+
+	.verify-img-panel .verify-refresh {
+		width: 25px;
+		height: 25px;
+		text-align: center;
+		padding: 5px;
+		cursor: pointer;
+		position: absolute;
+		top: 0;
+		right: 0;
+		z-index: 2;
+	}
+
+	.verify-img-panel .icon-refresh {
+		font-size: 20px;
+		color: #fff;
+	}
+
+	.verify-img-panel .verify-gap {
+		background-color: #fff;
+		position: relative;
+		z-index: 2;
+		border: 1px solid #fff;
+	}
+
+	.verify-bar-area .verify-move-block .verify-sub-block {
+		position: absolute;
+		text-align: center;
+		z-index: 3;
+		/* border: 1px solid #fff; */
+	}
+
+	.verify-bar-area .verify-move-block .verify-icon {
+		font-size: 18px;
+	}
+
+	.verify-bar-area .verify-msg {
+		z-index: 3;
+	}
+
+	/*字体图标的css*/
+	/*@font-face {font-family: "iconfont";*/
+	/*src: url('../fonts/iconfont.eot?t=1508229193188'); !* IE9*!*/
+	/*src: url('../fonts/iconfont.eot?t=1508229193188#iefix') format('embedded-opentype'), !* IE6-IE8 *!*/
+	/*url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'),*/
+	/*url('../fonts/iconfont.ttf?t=1508229193188') format('truetype'), !* chrome, firefox, opera, Safari, Android, iOS 4.2+*!*/
+	/*url('../fonts/iconfont.svg?t=1508229193188#iconfont') format('svg'); !* iOS 4.1- *!*/
+	/*}*/
+
+	.iconfont {
+		font-family: "iconfont" !important;
+		font-size: 16px;
+		font-style: normal;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+	}
+
+	.icon-check:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,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");
+		background-size: contain;
+	}
+
+	.icon-close:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,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");
+		background-size: contain;
+	}
+
+	.icon-right:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		background-size: cover;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,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");
+		background-size: contain;
+	}
+
+	.icon-refresh:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIEAYAAAD9yHLdAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAAMQpJREFUeNrt3XlcVHX3B/Bz7rCISi6IC+ijkpZpIswMyBLgluVuKm4pqWmEuG/hUpr5uFYoiuaSFrklZvroo+jPFRURZgYVxZ1K3HIXUBSGe35/XC9PWpYL8J2B8/6H1wwGn3sb5sz93u/3fAEYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOM/QUUHYCx59F0ddPVTVdXq5YXkxeTF1O3Ll7H63jdzY3eoDfojTp1UIta1FatCm/D2/C2kxPchttwu0oVyIRMyKxShVpSS2pZuTIkQzIklyuHv+Av+IudHURBFERJkvJbKlQo+IWhEAqhsgz2YA/2d+8WPP/oMXWkjtTx4UMMwAAMuH4d2kE7aHf9OoVQCIX8/jvuxJ2489o1WkJLaMmlS+AHfuB37hwmYAImnDtnNBlNRlNGhvJDiUSfX/ZygiiIgqhMmayJWROzJgYF4Xbcjtv9/akX9aJerq7QE3pCTwcHiIEYiMnMxNpYG2ufOYNTcApOOXDAcNZw1nA2KUn0cTwrLiBMKO+z3me9z9asKa+V18prtVr5tHxaPv3mmzgaR+Nod3cYCANhYMOGyr9+9VXla9myonMXFoqmaIp+8ADDMRzDz56FTtAJOh07RgmUQAkGA17Da3jNYMjrldcrr1dKyrGxx8YeG3vvnujc7I8QdbG6WF3skCFUjapRtYkTcSSOxJHVqr3Yz0tNVb6OH280Go1G43//K/oIn3rkogOwkgzR09bT1tPW3V3jrHHWOLdoIRtkg2zw84PTcBpO+/jgGByDY2rWFJ3U0tEiWkSL8vNxDa7BNSdOkAM5kMOuXTgYB+PgnTvz1uStyVuzbx8XmOKh0+q0Oq2tLW2hLbRl9WrsgB2wQ7duhf17aAWtoBWzZpncTe4m94gI0cf9JC4g7KU0oSbUhCpW1FTTVNNUa98eTGACU9u2uAf34J6WLWEuzIW5VauKzlni6UEP+txcZYju0CGoDtWh+pYt+QH5AfkB69cfxaN4FH/9VXTMkkJ3UXdRd3HBAuWKMTy8yH8hAQENH64MeUZFiT5+FRcQ9kwaN27cuHHjSpVsbW1tbW2DgxEREbt2Vb7bvLny1dZWdE721+gz+ow+S06W+kn9pH7r1+fdyruVd2vdOi4sz0f7rvZd7bs+Pvgv/Bf+KyEBjGAEIxb5+yjNp/k0PytLE6mJ1ES+9lpybHJscuzVq6LPBxcQ9hjlJqCNTbY+W5+tb98eFsEiWNS3LxyDY3CsXTvlsb296JzsJT2aHEBdqAt12bULMzADM5YsgQ/hQ/hw0yblk25enuiYlka7XLtcu3zTJozGaIzu2LG4fz85kzM5jxxpijPFmeLmzhV9PriAlHKefp5+nn4uLtgQG2LDQYOwDJbBMh99BIfgEBxycRGdjxUvOkSH6NDVq7gEl+CSFSvMx83Hzcejo49+c/Sbo99cuiQ6nyjKPY8qVchABjJcuYJe6IVeNjbFHqQNtIE2W7YYpxmnGad16CD6vEiiA7DipfwhNG6sS9Wl6lJ/+EF6KD2UHv76K6ZgCqZMmcKFo3RDX/RF3+rVYQWsgBXjx9uQDdlQero2XZuuTV+2zOui10Wvi6+9JjpncaMP6AP6ICBAWOFQc0RQBEXUqSP6fKj4CqSEKxizvY7X8fqkSaADHejati2usVtWwqhDX+2pPbXfsIFqU22qPW1aSl5KXkre0aOi4xUV3QPdA92Df/8b/MEf/CdMEJvmwgVlem/t2qLPC1+BlDAe8R7xHvENGypXGuvWFdzsAwCAdu24cLCXshgWw2JJUqetSv2l/lL/lBT19abfot+i3+LmJjpmYaMbdINu1K0rOgf4gi/4irsCehIXECvX5OMmHzf52NVVO087TzsvJkZzSnNKcyo1FRAQMDiYCwYrUurr69HrTa4iV5GrnDihu6O7o7sze7Y6e090zJeFC3ABLnjRhYGFiICALGe2IxcQK+OT4ZPhk+HgoNPpdDrdp5/agA3YwOnTGIMxGNO3r/oJUXROVjopK+rLlIGW0BJajh1rF2gXaBd4+rRut263bndIyKN/ZX0faHbADthRrpzoGCCDDDIXEPacPL/0/NLzy8DAXKdcp1ynlBTl2alT1Z5OovMx9pcSIRESnZ1hLIyFsd9/rxunG6cbt2+fOtQqOt4zQ0BAC3jj9gIvEHgT/0lcQCyUcqVRubJypfHdd9IZ6Yx0Zu9epWnf66+LzsfYC9kFu2BXQIDmjOaM5ozJpCMd6WjKFLU1iOh4Fo+vQNjfUWdN5Z7OPZ172mBQnv3gA76XwUoUdUGqHvSgnzwZpsJUmJqQoP9C/4X+C/6A9DTkTu7kzlcg7JHg4ODg4GCNRv0kpvwhHTiAn+An+IkFzPpgrDhMhskwWa+nS3SJLhmNWq1Wq9V+9JHoWJYGwzAMwzQa5ZH4e53CA5RW+vv6+/r7tWqlD0oflD5o9271k9jjLxDGShl1nxZERFy8WHtVe1V7deNGtWmn6HiWol5Uvah6UeKHsizmUqi00J3SndKd6tRJNskm2bR8OY7H8Ti+cmXRuUobSqIkSsrJUVYW37sHw2E4DH+Gwn0QDsLBihV5SLF4YDtsh+06dbLxt/G38U9OVu6VdOmi9OpS980oerSX9tJeRGyGzbCZ6LMCUPZh2YdlH6pDWQ8fisrBfwDFRNtH20fbZ8IELItlsey0afwG9ILCIAzCHj6kntSTep49C6thNaw+fRpDMARDTp/GbtgNu506BTNgBsy4cEFpQXHrltnb7G32vnXLYaLDRIeJt24l1kqslVgrJ+d5f/3jzSadneVj8jH5WNWqmmhNtCbaxYXqUT2q5+xMy2k5La9ZU9mBsHFj/Ba/xW8bNVKuNF9/HQxgAIOdnejTaXW8wAu87t3DbMzG7IEDDSsNKw0r164t6l+rzdJmabNMJqWAeHqKPg1mg9lgNlSqpHRTvnNHVA5+Aysij88qWbhQmQY4cKDoXJaODtABOpCeDtfgGlw7cADfw/fwvf37lfN34ICbm5ubm9vZs7GxsbGxsfn5ovM+L/V1kT83f27+3Pr1bZbYLLFZ4u5OJ+kknQwMpP20n/a3aMGz7Z4RAQF99ZVyRTJunPKkLBf2r9Fu0W7RbklJwck4GSd7eIg+bOW4nZ2V475xQ1QMHsIqZMoWra+8kt8zv2d+z9hY5dnWrUXnshjhEA7h2dlwAS7Aha1boTW0htYbN5pjzDHmmPj4ow5HHY46PL3rq9IDSPRBvLiCNumBEAiBaWnKs+rXtWuhLJSFsn/oknwOz+G5Fi0wHuMxvkUL6A29oXeHDkpBrVJF9PEIh4CAo0frknRJuqS6dW1r2NawrdGnz4teYVoLZYtjSVI2cBOXgwtIIVH/4M3VzdXN1bdsUXo7iL/UFev+faX99O7d0AJaQIvY2JwbOTdybmzYkDYlbUralOxsmAJTYIronJYnJSElISXh8mXl0cqV0AAaQIOVK9VZe+nn08+nn/f1LWhZQ0BAvXuX2sISBmEQ1qVLHuVRHu3Z4z7HfY77nI4dlS1+r1172R+P+ZiP+Tzk/CQuIC9JWejXoIHyyXrnTmgGzaCZq6voXMVN3fEOHdERHRcsKN+8fPPyzdet24f7cB8+eADTYBpME53S+j0+dHfggPpVmZUzblyF7yt8X+H7Nm0gEiIhMjQUVsJKWPnOO6XmnhsCAjZtalvHto5tnQMHlL/PNm2UK9fz50XHKyz2SfZJ9knip/GW/BdUEfFM8EzwTKhXT1otrZZW79tXavbReLT3tjLdctMmnIpTceqSJYb2hvaG9jt3io7HHlfwOh0qDZWGDh2q3IT+8MPS0gKHIimSIn//HbpBN+jWurXpmuma6dqxY8/7c3QjdSN1I48ehXiIh3h3d9HHJblJbpJbjRqit7blAvKcvDt4d/DuULeueb15vXn9vn3oh37oV6uW6FxFpWC6axZmYdaCBTZbbbbabP3qq8O9D/c+3Pv330XnY89H2RDKySn/Qv6F/AsffYRDcAgOGTWqpA99USIlUuLNm+iDPujTurVyRWJ65rsHllZAZHvZXrZ3dX18qLP48RDWM1IX/pkTzAnmhF27SmrhoGRKpmSzGebDfJi/Zk2+lC/lS599drTi0YpHK/76q+h87OUk10yumVzz5k3l0YwZDdc1XNdw3fz5DjkOOQ454eFUn+pT/YkTcSgOxaGOjqLzFhalcDg5KY9271b+ntu2NZQ1lDWUVffL+RvxEA/xljMEKLvL7rI7IiRAAvxz+iIjfAzN0qn7bdBb9Ba9tWdPiWsxogMd6IigA3SADuvWaS5rLmsuN2pkGm4abhoeEqLMM+fCUVKldU/rntY9O9v4gfED4wezZtEYGkNjGjSAYAiG4KVLCz5QlCgVKtBaWktrt29X7pE0b/6P/0kgBEIgkejkKvvR9qPtR4svaMIDWCp1Ixw7WztbO9uEBOUSv0ED0bkKjT/4g/+5c8rK6o8+Ui7p9+wRHYtZFrXtunRdui5dX7oUp+N0nO7nJzpXYVGHaKVvpW+lb7t2NXxk+Mjw0bZtT/47pdCo904aNxadW5l1V7u2Mi38wgVRMfgK5AnqSmPb8bbjbcevW1dSCof6SZKaUTNqNnu27VjbsbZj3d25cLC/cyTwSOCRwLQ0U1dTV1PXgAByJmdyHjlS+e79+6LzvSz0Rm/0dnAgIxnJuHGjsrPne++p31c6SAQEwAgYASMsYEfCR+Tecm+5N1+BWBztae1p7emoKOyNvbH30KGi8xQOkwnLYTksN3CgId4Qb4hXN6Ri7MUon8hffVV5tHSp8vUZhoIsXMGQ3VbYCluPH7eYledPUFqZ1K0reoiZC8gjavtotQuo6DwvTL2nYQADGL7+uryxvLG8MSJCWY9R0saymWVA1LvoXfQuI0bIF+WL8sXZs5UmlZazb0VJo3HRuGhc3NySNidtTtr8yy+icpT6ISx9qj5VnxoUpBSOBQtE53lRdJgO0+HMTPkr+Sv5q27dlLHRMWO4cLCiR2S4bLhsuBwZSV/T1/R1y5Z0iA7RIXHrE1jxKLUFRNlfoE4dpVvr+vXKs+L767+Y1FTNVc1VzVUvrxTHFMcUxw0bRCdipVPKmJQxKWPi45V7bTodTaAJNOEZpsmy55IXlBeUF1T4TSOfV6krIGovIRu9jd5G/8MPVruAahksg2U//qg88PFR5vefOSM6FmMA/+vl9SD/Qf6D/ObN6Uf6kX785hvRuUoKzWDNYM1g8QWk1I1Rnrc/b3/e/pNPlGaHb70lOs9z2wSbYFN0tLGmsaax5rBhypPiX0iM/RVlnUlurvIoLEz3ve573fe//gpREAVRM2eKzmet8lvlt8pvJX47g1JzBaIP1AfqAz09ldlIkyeLzvO8aAWtoBWzZimFY8gQ5VkuHMy6FCxYnEbTaFp4OIRCKITy6/h52bjauNq4ij9vJb6AKF1K7e3pHt2je99/by07wdEiWkSL8vPhM/gMPgsLM7mb3E3uERGiczFWGExtTG1MbRYuhMWwGBb37as8m5cnOpe1eOj90PuhNxeQIlehZ4WeFXqql8oWsIL0n6ifyE7BKTj1wQfGTsZOxk48dsxKJmUh6+rVFEIhFNKjR8EHJ/a3bNfYrrFdwwWkyHh+6fml55eBgbARNsJG9V6B5aOVtJJWDhtmCjGFmEJWrRKdh7HioPRe+/lnyIRMyBw9WnQeS2e7yXaT7SYuIIVOnWUl1ZfqS/WjopRLZPEbr/wT8iRP8pwyxRRvijfFR0eLzsOYCKZWplamVvPm0WbaTJvV6fXsSXmd8jrldRJ/pWbxb6zPKz09PT09/aOPYCpMhalNmojO848ezaoyLTMtMy37/HPRcRizBPI5+Zx8bvBg8AEf8Ll+XXQeS1PmtzK/lfmNr0AKjU+GT4ZPRuXKysYxX3whOs8/WgSLYNGGDY9Px2WMAahNHK9fV3b6DA8XncfSZEVkRWRFcAEpNHmYh3k4derjG8dYHppBM2jGmTOaSppKmkr9+yvPin8hMGaJlJY8sbE8pPW4SmMqjak0hoewXpq+j76Pvs+bb5ILuZBLaKjoPE8VDuEQnp0tl5HLyGXeey+pflL9pPqZmaJjMWYNzKvMq8yrwsOVfTBu3BCdR7RsXbYuWye+gFj9SnQ6SSfp5FdfWXr3TzKTmcwffqjuryA6D2N/5BXsFewVXL268qh6dfm8fF4+b2+PU3EqTnV0pMk0mSaXL6+8gf9Fz7gFsAAW2NjQEBpCQ/6wFe7H8DF8fOcOfoPf4DfPsKMfAgLev4+f4+f4+cOHT36belJP6rluHfwIP8KPgweLPm/F7lG3beMS4xLjEvHrZqy2nbtOq9PqtE2bKi+4xETReZ6G3qF36J3ISNN003TT9FGjROdhpZPSPLRiRRudjc5GFxKi/N107qxcGXt5QTREQ3T58qJzsn+gBz3oc3ONi42LjYvt7UXHsdohLNpKW2nr+PGiczzVRJgIE9PSMqtnVs+sbsE5WYmm3abdpt02eLDmoOag5uD580rhmDdP+W7z5lw4rExTaApN1d5i4lnskM/TFNzz+Iw+o886dhSd508erSSXt8vb5e0DB55bfG7xucV/vhRnrCjpZutm62ZHR8MkmASTSuFQT0mlAQ1oxA9dqazuCoReo9fotYgIMIIRjOL3BP6TztAZOkdFpSxOWZyy+NAh0XFY6aIM7Q4bVmrvEZRwVJfqUl3LuQKxmgKi36Lfot/i5kaTaBJN6tFDdJ4/GQtjYeyvv+bszdmbs/fTT0XHYaWLUjgqVFCGOHhBaollYUNYVlNA5GPyMfnYuHEWO9tqNsyG2aGhyv4H2dmi47DShcpTeSrfpw8kQRIkVawoOg8rIjLIIPMQ1jPzPut91vvsK6/gT/gT/qS2fbY0O3YoC5527BCdhJVO2AybYbOWLUXnYEWMgIC4gDwzcw9zD3OPnj2VR2XLis5T4LGNcHiWFRNMBzrQubmJjsGKFgZgAAbwENYzwxbYAluoLT8syFW4ClfXrFH2MzCZRMdhpRu1ptbU+g8L+FgJxlcg/8gj3iPeI75hQ9gDe2CPj4/oPAXCIAzCHj7UJGuSNcl8s5xZBpyEk3DS7duic7Ai1hyaQ3O+AvlHmhRNiibFAq88FsEiWLR8edLmpM1Jm3/5RXQcxgAAoA/0gT7nzomOwYrYHtgDe65eFR1DZXEFRJmOaGurbLBkQTfNH93zkDZJm6RNc+eKjsPYH+FwHI7DeRJHiXcQDsJBy+mlZ3EFRF4vr5fXv/sujsSROLJaNdF5CiyGxbB427bkmsk1k2ueOSM6DmN/ZH/C/oT9idhYZT+cmzdF52FFQ+or9ZX6xsaKzlGQR3SAPwXqJnWTullgi5JdsAt2qT2EGLMsB28evHnwZlYWtISW0HLyZNF5WFHYuDE5Njk2OfbIEdFJVBZWQBBhNIyG0W3aiE6iomk0jaadOGGsaKxorLhzp+g8jP0dU7wp3hQfHU0hFEIhP/wgOg97Sf7gD/7nzklukpvkFhYmOs6TLKaA6AP1gfpADw/4Gr6Gr11dRedRKbNboqOVR8+wnwFjFsA03DTcNLxfP+XRzJm0iBbRIvEbELFn1BJaQsv9+8255lxzbrNmypWH5dw8V1lMAVFaMLRtKzrG4/LylJWfljPmyNizk2VlndL48VKUFCVFeXjQJtpEm9asocN0mA7zjpjCPdogSpmeq+5r9P77xtnG2cbZzZod/eboN0e/uXRJdMynsZhuttqftD9pfzp4EKfjdJzu5yc6D0RCJETGxRkDjYHGQMsZUmOsMDRc13Bdw3V2duViy8WWi23Y0DzLPMs8q1YtTT9NP00/Z2c5W86Ws//ccw5H42gcXb48mMEM5r/YmTAKoiCqXDlaQStohZ3d8+bCnbgTd5Ypo3S1dnB40eOjZbSMlt27Bz2hJ/QshHUTs2E2zM7MxLfxbXz7+a/kcASOwBFEspPsJDtdvy6Nk8ZJ465exbbYFtsmJSmTc6xv8oPwAuKT4ZPhk1G5cu6V3Cu5V65dwzAMwzCNRnQumANzYM4HHxhbGFsYW8TEiI7DGGOWRnhXW/N483jz+Nat8SSexJPiCwdFUzRFP3hg42TjZOO0caPoPIwxZqmE3wMhLWlJazmtSjAcwzE8Li6pflL9pPo8RswYY08jvIDAG/AGvOHtLTqGSpm2+3//JzoHY4xZOmEFJIiCKIhsbJQuoh4eok+Eit6it+itPXtE52CMMUsn7B7I/e73u9/v/uabmI7pmP7isy0KzQgYASOuXUtxTHFMcTx1SnQcxhizdMKuQPL75PfJ7+PlJfoEqCiLsihr9+5Hj3jBIGOM/QNx90BOwAk4odOJPgEFJ2KptFRaunev6ByMMWYthBUQvIk38aZeL/oEqEgiiaTkZNE5GGPMWggrIDSLZtGs+vVFn4DH9zbnex+MMfasir2AqCvPsSk2xaavvCL6BMBxOA7H09OVnkH374uOwxhj1qLYC4j5ffP75vdr1xZ94AUOwkE4ePy46BiMMWZtir2AyF3lrnLXOnVEH7iKfMmXfE+cEJ2DMcasTfHfA2kEjaDRv/4l+sALTsCv0q/Sr6dPi87BGGPWptgLCLqjO7pb0BXISlpJKy1voxbGGLN0xX8F0gbaQBvLKSDSIGmQNOj6ddE5GGPM2hR/ASEgoBo1RB+4StnA6sYN0TkYY8zaFHsBoZk0k2ZWqiT6wFXZKdkp2SnXronOwRhj1qb4r0DKQBkoU6GC6ANX3L2b1j2te1r3QtjykjHGSpniLyB2YAd2llJAeOEgY4y9qOKfhbUcl+Nye3vRBw6+4Au+3HWXMcZeVLEVkODg4ODgYI0GjGAEI6LoA+cCwhhjL6fYCkhKQEpASoCNsA2sGGOMFa5iKyB21e2q21XnT/yMMVZSFFsBUWY75eWBDnSgs4BCcggOwSELGEpjjDErVcw30YnAG7zBW/y0WepDfahP5cqiczDGmLUq/mm8RjCCMSdH9IFjOIZjeJky/k7+Tv5Ojo6i8zDGmLUp/gISBEEQdOeO6ANXPajzoM6DOlWris7BGGPWpvgLyByYA3Nu3RJ94CpyJmdydnYWnYMxxqxN8ffC2k7bafvNm6IPvOAE+Ev+kj9fgTDG2PMq/pXoC3EhLrSc5oWyXtbL+po1RedgjDFrU/xDWJWhMlS+cEH0gauwMTbGxg0bis7BGGPWpvgLyApYASsyMkQfuIrKUlkq26iR6ByMMWZtir+AAACABV2BfIqf4qdcQBhj7HkVewGR58vz5fmnT4s+8AKJkAiJzs4e8R7xHvE8G4sxxp5VsReQepH1IutF/vILRVM0RT94IPoEFJyIddI6aV3jxqJzMMaYtdAU9y9MS0tLS0sjcnF0cXRx7N4dfoPf4Ldq1USfCGm7tF3afvbsZfNl82Xz/v2i8zDGmKUTdA8EAKpAFahiMok+ASoaQSNoRIsWonMwxpi1EFZA6Cf6iX46dEj0CSjI05k6U2c/P58MnwyfDAcH0XkYY8zSCdvgCQEBwXIKiNpcMdc31zfX19dXeXb3btG5GGPMUgm7AjGajCaj6cQJ5dHdu6JPRIEBMAAGNG8uOgZjjFk6cfdAAABAlpWvhw+LPhEFMiADMt55R3QMxhizdIILCAAYwAAGCxrKmopTcaqXl8cwj2Eew+rXF52HMcYslfgCchfuwt2DB0XHeJLGXeOuce/RQ3QOxhizVMILyN2YuzF3Y+Lj6TAdpsOZmaLzFFgIC2Hh+++LjsEYY5aq2BcSPunWtlvbbm3Lz3eRXCQXydMTzsAZOGMBvakQELBKlZpv1Xyr5lubNl1Ou5x2Oe3qVdGxGGPMUgi/AinQGlpD640bRcd4krxUXiov7d1bdA7GGLM0llNAhsAQGLJ1K+hBD/rcXNFxVHScjtPxDz90n+M+x31OuXKi8zDGmKUQPoSlunLlypUrVx4+dIl0iXSJ9PeH7bAdtterJzoXxmEcxjk4SD2lnlLPS5eurLqy6sqq5GTRuRhjRcfrotdFr4uvvVa9SvUq1av4+ro2c23m2qxBg2oPqz2s9tDRMcAnwCfA5/ff1d5+ovOKImwl+tPgcByOwzduJIkkkt59V3SeglzZmI3ZI0Yoj775RvmqrmNhjFmj4ODg4OBgjSb9fPr59PP9+9NMmkkzx46VO8md5E6vvaZ0zAAgICAAkEACCQDS09PT09Pv3tVO107XTl+7Vr4qX5WvfvXVkagjUUeizp4VfVzFBUUHeJIyVFS1qu0523O25zIylHUidnaic6kohEIopEsX03DTcNPwn38WnYcx9vx0Wp1Wp61ShSIogiLWr8dZOAtnBQW93E/Ny4NBMAgGzZgBS2AJLJk2Tem4kZcn+niLisUVEJUuRZeiS1m7FgbCQBhoOesxaBftol0HD5oqmiqaKr71lug8jLFnpwxNOTnJHeWOcscDB5TZlg0aFPovagNtoM2WLXer3q16t2q3bueGnRt2btjDh6KPv7BZzk30J3mAB3ioQ0WWA1tiS2zp76+7qLuou9i2reg8jLF/pg5VyWlympy2YUORFQ7VNtgG29q3f6XtK21faTt3rujjLyoWW0CMaEQj7tsHARAAASdPis7zJEqlVEqdPVt9YYrOwxh7uvT26e3T248ZA+NhPIwPDCyu34uzcTbODg319PP08/TT60Wfh8Jm8W98NSrWqFijoq0t3sf7eN+Cbqrvxt24u2rVW7du3bp169IlZRaZ0Sg6F2Psf7wWeC3wWtCokTIpZ80a5Z6qTfFNHroCV+AKIprRjGZJUt4nNm8WfV4Ki8VegajyLuVdyrv0/feUREmUlJMjOs+fzIW5MHfqVH8nfyd/J0dH0XEYYwBBFERBZGMj15HryHW++w4WwSJYZG8vNlXJu2dq8QUkNTU1NTX19m2IhEiIXLNGdJ4n4UgciSOrVXtw6cGlB5ciIkTnYYwBZK/OXp29etgwmAyTYbL4oSNKpmRKrl1bdI7CZvEFRCVfkC/IF2bOVP5HmM2i8/yJP/iD/9ix+kB9oD7Q01N0HMZKoybUhJpQnTqwH/bD/qlTRecpkAzJkIwWO+v1RVlNAVEX6OAMnIEzVq4Uneev2dqSjnSk++67husarmu4znLWrzBW8iHa7LfZb7N/0SLlDdtyWg/halyNqy9eFJ2jsFlNASmwATbAhmnTlAcWuEAnHuIh3t29TL0y9crU+/RT0XEYKw309fX19fXDw2EkjISRljPZpkAf6AN9jh0THaOwWV0BMRqNRqPx/HnqRb2o1w8/iM7zVB7gAR4REV51vep61fXyEh2HsZJI30ffR9/nzTflU/Ip+dTs2aLzPA2GYiiG7tghOkdhs7oCorLZZ7PPZp/lXomgF3qhl41N/on8E/knfvjB+6z3We+zr7wiOhdjJYHaHZvSKI3SYmPRG73R28FBdK4/CYMwCHv40DzPPM88b8MG0XEKm9UWkKTNSZuTNv/yC8RCLMSuWCE6z9NgAAZgwOuvmx3NjmbHmJhHz5a4m2mMFSebXja9bHotXVrkK8pfEt2je3Rv3bojgUcCjwRevy46T2Gz2gKiyvsp76e8nz79FIbBMBh2+7boPE+D7bAdtuvUSZukTdIm8b0Rxl6EvpK+kr7SuHHYCTthp169ROd5GlpEi2hRfj4NoAE0YMYM0XmKSon5JKzT6XQ6XViY8mjhQtF5nioUQiFUlukG3aAbnTqZJpgmmCZs2SI6FmOWTDtBO0E74Z13oDN0hs7//S+GYRiGWXALIQICWrZM6cY7aJDoOEWlxBQQhSRpN2k3aTclJuJUnIpTLf3m9d27+Aa+gW+89ZZhpWGlYeXx46ITMWZJ1FYksqPsKDvu3w9REAVRlSqJzvU0lEiJlHjzJjbFpti0QQOlgNy4ITpXUbH6IazHyTJ8Dp/D52Fh6iWk6ER/r0IFeofeoXd27dJ/of9C/8Xrr4tOxJglaPJxk4+bfOzqKq+QV8grtm619MJRYCtsha3jx5f0wqGy3EvAF3TlkRquNVxruDo74xk8g2e8vUXneqpESITEcuWoP/Wn/u3aVS1btWzVsuvX/2743fC7IStLdDzGipNPhk+GT0blyuAADuCwZ4+yolz81tb/hCbQBJqQkGB6z/Se6b2hQx89W+K3ui1xBUTlkumS6ZKZkAB+4Ad+ISFwES7CRcttdog7cSfurFRJ6i/1l/q/+67LWZezLmfXrVPK4f37ovMxVpSUHQIrVJCvydfka9u2QQzEQIzltwRSm7xiCIZgSLt2yt9ryZtt9TQlbAjrf5RLyLt35SA5SA4KCVFvXovO9Y/+Df+GfzdsqExP3L7dI94j3iPe2Vl0LMaKglo4oAW0gBZxcbAH9sAeHx/RuZ7ZQTgIBz/7TFngfOqU6DjFrcQWEFVKcEpwSvCuXeRDPuQzZ47oPM9Hq5UeSA+kBwcOeHfw7uDdoW5d0YkYKwwFhQMAALZvt7bCoW5t/er8V+e/Oj8yUnQeUUrYLKynU/cHyI7LjsuOi4+HSTAJJvn6is71rOgQHaJDV69KraRWUqu2bQ3xhnhDfEqK6FyMPQ9lun2NGsojdfq6Vis61zPzBm/wvnPHvNC80LzQ0/MoHsWj+OuvomOJUuKvQFT7cB/uQ7MZ8zEf8/v0ocN0mA5nZorO9azQF33Rt3p16kf9qF98vO6O7o7uzttvi87F2LPwzPLM8sx64w3lnuShQ8qzVlQ4HsEszMKssLDSXjhUJfYm+tNcXn159eXVt2/XqFejXo16GRl4GA/j4S5dROd6ZsmQDMl2dpAGaZDWo0eNcjXK1Sh3+/aV3678duW35GTR8Rj7Ix3pSEfNmuFaXItrd+yA9bAe1levLjrXi1m0yLjduN24fdYs0UksRakZwnoa5ZJaXbmurmS3VqtX53yS80nOJ6Ghad3Tuqd1z84WnYiVTrpVulW6VaNGKV2zZ81Sm4uKzvW81Om5D/If5D/Ib95c+bvKzRWdy1KUmiGspylvKG8obxg2DN6Bd+Cd7dtF53k5vXs72DjYONgcPlwwZMBYMVA2UCtfXpeiS9GlrF0LX8PX8PVXX1lr4QBf8AXfy5dxOk7H6d26ceH4a6W+gKj3RjT9Nf01/bt3p320j/ZZcUuRR9OApVgpVopNStJqtVqt9qOPlG9yF2BWuLTvat/Vvuvj44AO6IAmEwyEgTCwRw/RuV6Uuq4DEiABErp0UabnXrkiOpel4jeUJ6gtFGwCbAJsAg4fVj5JubqKzlU4DhzAztgZOw8caPjU8Knh09OnRSdi1qVgNmNMdkx2zOjRSouRL75QvmtrKzrfC3u0TkzuJfeSewUHpzimOKY4lrz9OwobF5CnUHcSlCvLleXKe/cqz5YtKzrXyyr4hPVoAZQ6jz02NjY2NtbSe4cxUTxDPUM9Q319sQN2wA4LF+JknIyTPTxE5yoseAWv4JVRowyXDZcNl0vvuo7nxQXkH+hO6U7pTnXqBO/D+/B+bKzyrBV/0noC7aW9tDclheIojuLGjlUXXorOxcTyuuh10euik1N+bn5ufu6sWTgTZ+LMAQPACEYwlqCh0P7QH/rPmGEcYhxiHDJhgug41qbkvBCKmH6Yfph+WNeudJAO0sE1a5RnS04hedyOHVgOy2G5iAhesFg6KLMRy5ZVNmYbOpRepVfp1XHjcDgOx+GVK4vOV9ioA3WgDgsWmKaYppimqM0P2fPiAvKclNlNXbpIzaRmUrO1a5VnS2AhUXuHLYbFsHjtWnm+PF+eP3lyil+KX4rfuXOi47GXUy+qXlS9KHv7ivMrzq84f9Ag+YR8Qj4xcaK6YFV0vqJCsRRLsd9+a3IzuZnc1I2eSn7X3KJS6mdhPa/Hb6699x6EQRiEPXwoOlehWwyLYbH06PXRu7d0XDouHT99Wrtau1q7+v/+zzPdM90zvUMH5fslaEijhFJ7T2l3andqdw4fXsGpglMFp/Pn6RV6hV6ZP7+kFw6IhViIXbJEKRzqrEQuHC+L//BfknLp37kz6EEP+h9/BAMYwGBnJzpXcaHP6XP6/MgRuA/34f68eZlXM69mXl2z5tywc8PODSuBhdVKKAWjaVNl5feAARAMwRDcp4/yXeufDPLMtsE22DZ3rrGqsaqx6qhRypNcOAoLF5BCohSSdu0gHMIhfO1aiIZoiC5fXnSuYjcMhsGw27fpOl2n6z//jANxIA5cu9ZtkNsgt0G7d/Nsr8Klv6+/r79fq5ZskA2yoUcPvIE38Eb//gXbApQ2j4ZeqQE1oAaffGIKNAWaAr/8UnSskooLSCHzCvYK9gr28MgfnD84f/DmzTgGx+CYmjVF5xKNIimSIn//Hd3QDd3WrwdXcAXX9etzYnNic2ITEnil79/TVtVW1VZ1d1dWRnfsCCfhJJzs3BmyIAuytNoSNzvqhdy/L++V98p7+/bldRzFo5S/4IqOp5+nn6efi4s0QZogTdi0CSbDZJis14vOZZnu36fRNJpGJyRIA6QB0oC9e+EW3IJbe/aUcyjnUM4hKUntGCA6aWFTF+Zl2mXaZdo1aiStllZLqwMDyZ/8yT8wEHfhLtwVGAhzYS7MrVpVdF5Lo25zoHld87rm9Y4dk39J/iX5F24qWly4gBQxdXokhVIohcbE4GJcjIu7dhWdy2p4gRd43btHs2gWzTpxQlnwdeKE0uTu5EnpXeld6d3jx/MG5Q3KG3TypNJm+7fflP+4+Me63ee4z3GfU66c3VG7o3ZH69bNn5o/NX9q3bo4GAfj4FdfhVbQClo1boxrcA2u8fBQJmE0agSLYBEssrcXfbqtS2oqEBBQ+/bKDqQXLohOVNpwASlWiLoFugW6Bf/+NxyDY3AsIoKHHgoXJVMyJZvNYAYzmG/cgFzIhdz/fcUojMKoa9cgBEIg5M6dZ/65QECg0WAwBmOwkxO0hJbQ0slJ+blVqkAe5EFelSqQCImQyFsQF5l20A7a/fyzpq+mr6Zvv35J9ZPqJ9W3nn19Shp+4xKkYEOoltASWn7/vfKsulMbYwwAgKIpmqIfPIBsyIbsiAhTK1MrU6t580TnYgouIIJ5xHvEe8Q7O2t2aHZodixfrkw7bN9edC7GRKJpNI2mnTiBE3EiTuzVSxmiSk0VnYs9jguIRUFU2q8PGoSIiKg2dStF8/ZZ6aQDHeiIIAIiIGLpUltbW1tb2xEjEmsl1kqslZMjOh77a1xALJQ6bRPSIR3SV63CIAzCoDffFJ2LsULlB37g99tvShv1jz9WWuXExYmOxZ4NtzKxUKZrpmuma8eOYSAGYqBWq8xCGjGCDtNhOsw3DZk1y8tTvkZF5QTkBOQEvPkmFw7rxFcgVkZdX4I9sAf2mDkTT+AJPNGnD8/mYpZvz578yPzI/MghQ44EHgk8EpiWJjoRezn8hmPl9Kn6VH1qUBD1o37Ub/585dnGjUXnYqXcoz3FoQt0gS7jxxtbGFsYW8TEiI7FChcPYVk5Q2NDY0PjffuUhQo6nTrUBT7gAz7Xr4vOx0oHdUU4jIJRMGr0aDgEh+BQ/fpcOEo2vgIpodQV0TaeNp42ngMHKiu4J0zglhisUIyAETDi2jWQQQb566+VvdHnzzcajUaj8f590fFY8eACUkp4n/U+6332lVfMn5g/MX8SGoou6IIuI0YonxRdXETnYxZuFIyCUZcugR3Ygd2sWeW7le9WvtvSpUqPsgcPRMdjYvAQVimhtnwwbTBtMG2YMycnMCcwJ7BuXWXr2g8/LNjXgzEAUDok7N+PNbAG1ggJuXvz7s27N1991RhsDDYGz5/PhYMB8BUIe4JnqGeoZ6ivLzbEhtgwLAyaQlNoGhyM4RiO4WXKiM7HChfNo3k079YtfA1fw9diYmQH2UF2WLJEaYd+8qTofMyycQFhf6sJNaEmVLGiTZxNnE1c166URVmU1bcv3sE7eCcg4PGtb5lly8tT2ubv26c0m/zuO8e+jn0d+/70E19RsBfBBYS9EHUnPPov/Zf+27mzsg6lc2eaTtNpemAgeqEXetnYiM5ZOt29C8tgGSyLi4McyIGcTZtyQ3NDc0Pj4lJTU1NTU2/fFp2QlQxcQFih8snwyfDJqFw51y3XLdft7bexMTbGxq1awTgYB+NatYI5MAfm1KkjOqfVerRlK1SBKlDl1Ck6Rsfo2O7dOAJH4Ij//CdnR86OnB379vEOj6w4cAFhxUq/Rb9Fv8XNTR4gD5AH+PmhCU1o8vGBTtAJOvn6Kv9KXQhpays6b7FT95RHQsLERGgADaBBYiJshI2w8fBhjMM4jEtMVLrT3r0rOi4r3biAMIui0+q0Oq2tLV2ki3TxjTfgS/gSvmzcGDMxEzMbNYIgCIKgWrXgB/gBfqhdW5k95uqKq3AVrnJ1tZid/fSgB31urrID4W+/QTWoBtXOnwc3cAO38+dhH+yDfenpShfa8+el8lJ5qfzJk8k1k2sm1zx7Vvkhxb+jImPPgwsIK1G8gr2CvYKrVzdfMl8yX6pZU1ouLZeWu7pCb+gNve3sKIIiKKJcOZgJM2GmnZ2UJWVJWXZ2NIkm0aRy5ZQFcYjkS77kW768ci8nK0uZrXT7Ni7ABbggKwuGwlAYmpmpdJHNytL8R/MfzX+ysiAO4iDuxo26H9T9oO4Hly/HxsbGxsbm54s+L4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYKzb/D4DEm9oGCaFQAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEyLTE1VDE1OjU3OjI3KzA4OjAwohG+LwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNy0xMi0xNVQxNTo1NzoyNyswODowMNNMBpMAAABPdEVYdHN2ZzpiYXNlLXVyaQBmaWxlOi8vL2hvbWUvYWRtaW4vaWNvbi1mb250L3RtcC9pY29uX2NrMWJ6YTB6ajlqamRjeHIvcmVmcmVzaC5zdmejF0ikAAAAAElFTkSuQmCC");
+		background-size: contain;
+	}
+</style>
diff --git a/components/verifition/utils/ase.js b/components/verifition/utils/ase.js
new file mode 100644
index 0000000..1fdceed
--- /dev/null
+++ b/components/verifition/utils/ase.js
@@ -0,0 +1,14 @@
+import CryptoJS from 'crypto-js'
+/**
+ * @word 要加密的内容
+ * @keyWord String  服务器随机返回的关键字
+ *  */
+export function aesEncrypt(word, keyWord = "XwKsGlMcdPMEhR1B") {
+	var key = CryptoJS.enc.Utf8.parse(keyWord);
+	var srcs = CryptoJS.enc.Utf8.parse(word);
+	var encrypted = CryptoJS.AES.encrypt(srcs, key, {
+		mode: CryptoJS.mode.ECB,
+		padding: CryptoJS.pad.Pkcs7
+	});
+	return encrypted.toString();
+}
diff --git a/components/verifition/utils/request.js b/components/verifition/utils/request.js
new file mode 100644
index 0000000..e6a31b0
--- /dev/null
+++ b/components/verifition/utils/request.js
@@ -0,0 +1,17 @@
+import config from '@/config'
+const baseUrl = config.baseUrl
+export const myRequest = (option = {}) => {
+	return new Promise((reslove, reject) => {
+		uni.request({
+			url: baseUrl + option.url,
+			data: option.data,
+			method: option.method || "GET",
+			success: (result) => {
+				reslove(result)
+			},
+			fail: (error) => {
+				reject(error)
+			}
+		})
+	})
+}
diff --git a/components/verifition/verifyPoint/verifyPoint.vue b/components/verifition/verifyPoint/verifyPoint.vue
new file mode 100644
index 0000000..923cc62
--- /dev/null
+++ b/components/verifition/verifyPoint/verifyPoint.vue
@@ -0,0 +1,555 @@
+<template>
+	<view style="position: relative">
+		<view class="verify-image-out" v-show="showImage">
+			<view class="verify-image-panel" :style="{'width': imgSize.width,
+                                                   'height': imgSize.height,
+                                                   'margin-bottom': vSpace + 'px'}">
+				<view class="verify-refresh" style="z-index:3" @click="refresh" v-show="showRefresh">
+					<text class="iconfont icon-refresh"></text>
+				</view>
+				<image :src="pointBackImgBase?('data:image/png;base64,'+pointBackImgBase):defaultImg" id="image"
+					ref="canvas" style="width:100%;height:100%;display:block"
+					@click=" bindingClick? canvasClick($event): undefined"></image>
+				<view v-for="(tempPoint, index) in tempPoints" :key="index" class="point-area" :style="{
+                        'background-color':'#1abd6c',
+                        color:'#fff',
+                        'z-index':9999,
+                        width:'20px',
+                        height:'20px',
+                        'text-align':'center',
+                        'line-height':'20px',
+                        'border-radius': '50%',
+                        position:'absolute',
+                        top:parseInt(tempPoint.y-10) + 'px',
+                        left:parseInt(tempPoint.x-10) + 'px'
+                     }">
+					{{index + 1}}
+				</view>
+			</view>
+		</view>
+		<!-- 'height': this.barSize.height, -->
+		<view class="verify-bar-area" :style="{'width': imgSize.width,
+                      'color': barAreaColor,
+                      'border-color': barAreaBorderColor,
+                      'line-height':'40px'}">
+			<text class="verify-msg">{{text}}</text>
+		</view>
+	</view>
+</template>
+<script type="text/babel">
+	/**
+     * VerifyPoints
+     * @description 点选
+     * */
+    import {aesEncrypt} from "./../utils/ase.js"
+	import {myRequest} from "../utils/request.js"
+    export default {
+        name: 'VerifyPoints',
+        props: {
+            //弹出式pop，固定fixed
+            mode: {
+                type: String,
+                default: 'fixed'
+            },
+            captchaType:{
+                type:String,
+            },
+            //间隔
+            vSpace: {
+                type: Number,
+                default: 5
+            },
+            imgSize: {
+                type: Object,
+                default() {
+                    return {
+                        width: '310px',
+                        height: '155px'
+                    }
+                }
+            },
+            barSize: {
+                type: Object,
+                default() {
+                    return {
+                        width: '310px',
+                        height: '40px'
+                    }
+                }
+            },
+			defaultImg: {
+				type: String,
+				default: ''
+			}
+        },
+        data() {
+            return {
+                secretKey:'',        //后端返回的加密秘钥 字段
+                checkNum:3,                 //
+                fontPos: [],                // 选中的坐标信息
+                checkPosArr: [],            //用户点击的坐标
+                num: 1,                     //点击的记数
+                pointBackImgBase:'',        //后端获取到的背景图片
+                poinTextList:[],            //后端返回的点击字体顺序
+                backToken:'',               //后端返回的token值
+                imgRand: 0,                 //随机的背景图片
+                setSize: {
+                    imgHeight: 0,
+                    imgWidth: 0,
+                    barHeight: 0,
+                    barWidth: 0
+                },
+                showImage: true,
+                tempPoints: [],
+                text: '',
+                barAreaColor: '#fff',
+                barAreaBorderColor: "#fff",
+                showRefresh: true,
+                bindingClick: true,
+                imgLeft:'' ,
+                imgTop:'',
+            }
+        },
+        methods: {
+            init() {
+                //加载页面
+                this.fontPos.splice(0, this.fontPos.length)
+                this.checkPosArr.splice(0, this.checkPosArr.length)
+                this.num = 1
+                this.$nextTick(() => {
+                    this.refresh();
+                    this.$parent.$emit('ready', this)
+                })
+            },
+            canvasClick(e) {
+                const query = uni.createSelectorQuery().in(this);
+                query.select('#image').boundingClientRect(data => {
+                    this.imgLeft =Math.ceil(data.left)
+                    this.imgTop =Math.ceil(data.top)
+                    this.checkPosArr.push(this.getMousePos(this.$refs.canvas, e));
+                    if (this.num == this.checkNum) {
+                        this.num = this.createPoint(this.getMousePos(this.$refs.canvas, e));
+                        //按比例转换坐标值
+                        this.checkPosArr = this.pointTransfrom(this.checkPosArr,this.imgSize);
+                        //等创建坐标执行完
+                        setTimeout(() => {
+                            //发送后端请求
+                            var captchaVerification =this.secretKey? aesEncrypt(this.backToken+'---'+JSON.stringify(this.checkPosArr),this.secretKey):this.backToken+'---'+JSON.stringify(this.checkPosArr)
+                            let data = {
+                                captchaType:this.captchaType,
+                                "pointJson":this.secretKey? aesEncrypt(JSON.stringify(this.checkPosArr),this.secretKey):JSON.stringify(this.checkPosArr),
+                                "token":this.backToken
+                            }
+                            myRequest({
+                                // url: `/captcha/check`,
+                                url: '/admin-api/system/captcha/check', // 使用项目自定义的 /admin-api/ 前缀
+                                data,
+                                method:"POST",
+                            }).then(result => {
+                                    let res = result.data
+                                    if (res.repCode == "0000") {
+                                        this.barAreaColor = '#4cae4c'
+                                        this.barAreaBorderColor = '#5cb85c'
+                                        this.text = '验证成功'
+                                        this.bindingClick = false
+										setTimeout(()=>{
+											if (this.mode=='pop') {
+												this.$parent.clickShow = false;
+											}
+											this.refresh();
+										},1500)
+                                        this.$parent.$emit('success', {captchaVerification})
+                                    }else{
+                                        this.$parent.$emit('error', this)
+                                        this.barAreaColor = '#d9534f'
+                                        this.barAreaBorderColor = '#d9534f'
+                                        this.text = '验证失败'
+                                        setTimeout(() => {
+                                            this.refresh();
+                                        }, 700);
+                                    }
+                                })
+                        }, 400);
+                    }
+                    if (this.num < this.checkNum) {
+                        this.num = this.createPoint(this.getMousePos(this.$refs.canvas, e));
+                    }
+                }).exec();
+            },
+            //获取坐标
+            getMousePos: function (obj, e) {
+                let position = {
+                    x:Math.ceil(e.detail.x)-this.imgLeft,
+                    y:Math.ceil(e.detail.y)-this.imgTop,
+                }
+                return position
+            },
+            //创建坐标点
+            createPoint: function (pos) {
+                this.tempPoints.push(Object.assign({}, pos))
+                return ++this.num;
+            },
+            refresh: function () {
+                this.tempPoints.splice(0, this.tempPoints.length)
+                this.barAreaColor = '#000'
+                this.barAreaBorderColor = '#ddd'
+                this.bindingClick = true
+
+                this.fontPos.splice(0, this.fontPos.length)
+                this.checkPosArr.splice(0, this.checkPosArr.length)
+                this.num = 1
+
+                this.getPictrue();
+
+                // this.text = '验证失败'
+                this.showRefresh = true
+            },
+            // 请求背景图片和验证图片
+            getPictrue(){
+                let data = {
+                    captchaType:this.captchaType,
+					clientUid: uni.getStorageSync('point'),
+					ts: Date.now(), // 现在的时间戳
+                }
+                myRequest({
+                    // url: "/captcha/get", //仅为示例，并非真实接口地址。
+                    url: '/admin-api/system/captcha/get', // 使用项目自定义的 /admin-api/ 前缀
+                    data,
+                    method:"POST",
+                }).then((result) => {
+                        let res = result.data
+                        if (res.repCode == "0000") {
+                            this.pointBackImgBase = res.repData.originalImageBase64
+                            this.backToken = res.repData.token
+                            this.secretKey = res.repData.secretKey
+                            this.poinTextList = res.repData.wordList
+                            this.text = '请依次点击【' + this.poinTextList.join(",") + '】'
+                        }
+						// 判断接口请求次数是否失效
+						if(res.repCode == '6201') {
+							this.pointBackImgBase = null
+						}
+                    })
+            },
+            //坐标转换函数
+            pointTransfrom(pointArr,imgSize){
+                var newPointArr = pointArr.map(p=>{
+                    let x = Math.round(310 * p.x/parseInt(imgSize.width))
+                    let y =Math.round(155 * p.y/parseInt(imgSize.height))
+                    return {x,y}
+                })
+                return newPointArr
+            },
+        },
+        watch: {
+            // type变化则全面刷新
+            type: {
+                immediate: true,
+                handler() {
+                    this.init()
+                }
+            }
+        },
+		mounted() {
+		}
+    }
+</script>
+
+<style scoped>
+	.verifybox {
+		position: relative;
+		box-sizing: border-box;
+		border-radius: 2px;
+		border: 1px solid #e4e7eb;
+		background-color: #fff;
+		box-shadow: 0 0 10px rgba(0, 0, 0, .3);
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+	}
+
+	.verifybox-top {
+		padding: 0 15px;
+		height: 50px;
+		line-height: 50px;
+		text-align: left;
+		font-size: 16px;
+		color: #45494c;
+		border-bottom: 1px solid #e4e7eb;
+		box-sizing: border-box;
+	}
+
+	.verifybox-bottom {
+		/* padding: 15px; */
+		box-sizing: border-box;
+	}
+
+	.verifybox-close {
+		position: absolute;
+		top: 13px;
+		right: 9px;
+		width: 24px;
+		height: 24px;
+		text-align: center;
+		cursor: pointer;
+	}
+
+	.mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 1001;
+		width: 100%;
+		height: 100vh;
+		background: rgba(0, 0, 0, .3);
+		/* display: none; */
+		transition: all .5s;
+	}
+
+	.verify-tips {
+		position: absolute;
+		left: 0px;
+		bottom: 0px;
+		width: 100%;
+		height: 30px;
+		background-color: rgb(231, 27, 27, .5);
+		line-height: 30px;
+		color: #fff;
+	}
+
+	.tips-enter,
+	.tips-leave-to {
+		bottom: -30px;
+	}
+
+	.tips-enter-active,
+	.tips-leave-active {
+		transition: bottom .5s;
+	}
+
+	/* ---------------------------- */
+	/*常规验证码*/
+	.verify-code {
+		font-size: 20px;
+		text-align: center;
+		cursor: pointer;
+		margin-bottom: 5px;
+		border: 1px solid #ddd;
+	}
+
+	.cerify-code-panel {
+		height: 100%;
+		overflow: hidden;
+	}
+
+	.verify-code-area {
+		float: left;
+	}
+
+	.verify-input-area {
+		float: left;
+		width: 60%;
+		padding-right: 10px;
+
+	}
+
+	.verify-change-area {
+		line-height: 30px;
+		float: left;
+	}
+
+	.varify-input-code {
+		display: inline-block;
+		width: 100%;
+		height: 25px;
+	}
+
+	.verify-change-code {
+		color: #337AB7;
+		cursor: pointer;
+	}
+
+	.verify-btn {
+		width: 200px;
+		height: 30px;
+		background-color: #337AB7;
+		color: #FFFFFF;
+		border: none;
+		margin-top: 10px;
+	}
+
+
+	/*滑动验证码*/
+	.verify-bar-area {
+		position: relative;
+		background: #FFFFFF;
+		text-align: center;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		border: 1px solid #ddd;
+		-webkit-border-radius: 4px;
+	}
+
+	.verify-bar-area .verify-move-block {
+		position: absolute;
+		top: 0px;
+		left: 0;
+		background: #fff;
+		cursor: pointer;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		box-shadow: 0 0 2px #888888;
+		-webkit-border-radius: 1px;
+	}
+
+	.verify-bar-area .verify-move-block:hover {
+		background-color: #337ab7;
+		color: #FFFFFF;
+	}
+
+	.verify-bar-area .verify-left-bar {
+		position: absolute;
+		top: -1px;
+		left: -1px;
+		background: #f0fff0;
+		cursor: pointer;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		border: 1px solid #ddd;
+	}
+
+	.verify-image-panel {
+		margin: 0;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		border-top: 1px solid #ddd;
+		border-bottom: 1px solid #ddd;
+		border-radius: 3px;
+		position: relative;
+	}
+
+	.verify-image-panel .verify-refresh {
+		width: 25px;
+		height: 25px;
+		text-align: center;
+		padding: 5px;
+		cursor: pointer;
+		position: absolute;
+		top: 0;
+		right: 0;
+		z-index: 2;
+	}
+
+	.verify-image-panel .icon-refresh {
+		font-size: 20px;
+		color: #fff;
+	}
+
+	.verify-image-panel .verify-gap {
+		background-color: #fff;
+		position: relative;
+		z-index: 2;
+		border: 1px solid #fff;
+	}
+
+	.verify-bar-area .verify-move-block .verify-sub-block {
+		position: absolute;
+		text-align: center;
+		z-index: 3;
+		/* border: 1px solid #fff; */
+	}
+
+	.verify-bar-area .verify-move-block .verify-icon {
+		font-size: 18px;
+	}
+
+	.verify-bar-area .verify-msg {
+		z-index: 3;
+	}
+
+	/*字体图标的css*/
+	/*@font-face {font-family: "iconfont";*/
+	/*src: url('../fonts/iconfont.eot?t=1508229193188'); !* IE9*!*/
+	/*src: url('../fonts/iconfont.eot?t=1508229193188#iefix') format('embedded-opentype'), !* IE6-IE8 *!*/
+	/*url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'),*/
+	/*url('../fonts/iconfont.ttf?t=1508229193188') format('truetype'), !* chrome, firefox, opera, Safari, Android, iOS 4.2+*!*/
+	/*url('../fonts/iconfont.svg?t=1508229193188#iconfont') format('svg'); !* iOS 4.1- *!*/
+	/*}*/
+
+	.iconfont {
+		font-family: "iconfont" !important;
+		font-size: 16px;
+		font-style: normal;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+	}
+
+	.icon-check:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,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");
+		background-size: contain;
+	}
+
+	.icon-close:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,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");
+		background-size: contain;
+	}
+
+	.icon-right:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		background-size: cover;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,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");
+		background-size: contain;
+	}
+
+	.icon-refresh:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,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");
+		background-size: contain;
+	}
+</style>
diff --git a/components/verifition/verifySlider/verifySlider.vue b/components/verifition/verifySlider/verifySlider.vue
new file mode 100644
index 0000000..7c75e0e
--- /dev/null
+++ b/components/verifition/verifySlider/verifySlider.vue
@@ -0,0 +1,661 @@
+<template>
+	<view style="position: relative;">
+		<view v-if="type === '2'" class="verify-img-out" :style="{height: (parseInt(imgSize.height) + vSpace) + 'px'}">
+			<view class="verify-img-panel" :style="{width: imgSize.width,
+                                                   height: imgSize.height,}">
+
+				<image :src="backImgBase?('data:image/png;base64,'+backImgBase):defaultImg" alt=""
+					style="width:100%;height:100%;display:block"></image>
+				<view class="verify-refresh" @click="refresh" v-show="showRefresh">
+					<text class="iconfont icon-refresh"></text>
+				</view>
+				<transition name="tips">
+					<text class="verify-tips" v-if="tipWords" :class="passFalg ? 'suc-bg':'err-bg'">{{tipWords}}</text>
+				</transition>
+			</view>
+		</view>
+
+		<!-- 公共部分 -->
+		<view class="verify-bar-area" :style="{width: imgSize.width,
+                                              height: '40px',
+                                              'line-height':'40px'}">
+			<text class="verify-msg" v-text="text"></text>
+			<view class="verify-left-bar"
+				:style="{width: leftBarWidth?leftBarWidth:'40px', height: '40px', 'border-color': leftBarBorderColor, transaction: transitionWidth}">
+				<text class="verify-msg" v-text="finishText"></text>
+				<view class="verify-move-block" @touchstart="start" @touchend="end" @touchmove="move"
+					:style="{width:'40px', height: '40px', 'background-color': moveBlockBackgroundColor, left: moveBlockLeft, transition: transitionLeft}">
+					<text :class="['verify-icon iconfont', iconClass]" :style="{color: iconColor}"></text>
+					<view v-if="type === '2'" class="verify-sub-block" :style="{'width':Math.floor(parseInt(imgSize.width)*47/310)+ 'px' ,
+                                  'height': imgSize.height,
+                                  'top':'-' + (parseInt(imgSize.height) + vSpace) + 'px',
+                                  }">
+						<image :src="'data:image/png;base64,'+blockBackImgBase" alt=""
+							style="width:100%;height:100%;display:block"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	/**
+	 * VerifySlide
+	 * @description 滑块
+	 * */
+	import {
+		aesEncrypt
+	} from "./../utils/ase.js"
+	import {
+		myRequest
+	} from "../utils/request.js"
+	export default {
+		name: 'VerifySlide',
+		props: {
+			captchaType: {
+				type: String,
+			},
+			type: {
+				type: String,
+				default: '1'
+			},
+			//弹出式pop，固定fixed
+			mode: {
+				type: String,
+				default: 'fixed'
+			},
+			vSpace: {
+				type: Number,
+				default: 5
+			},
+			explain: {
+				type: String,
+				default: '向右滑动完成验证'
+			},
+			imgSize: {
+				type: Object,
+				default () {
+					return {
+						width: '310px',
+						height: '155px'
+					}
+				}
+			},
+			blockSize: {
+				type: Object,
+				default () {
+					return {
+						width: '50px',
+						height: '50px'
+					}
+				}
+			},
+			barSize: {
+				type: Object,
+				default () {
+					return {
+						width: '100%',
+						height: '40px'
+					}
+				}
+			},
+			defaultImg: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				secretKey: '', //后端返回的加密秘钥 字段
+				passFalg: false, //请求通过与否
+				backImgBase: '', //验证码背景图片
+				blockBackImgBase: '', //验证滑块的背景图片
+				backToken: "", //后端返回的唯一token值
+				startMoveTime: "", //移动开始的时间
+				endMovetime: '', //移动结束的时间
+				tipsBackColor: '', //提示词的北京颜色
+				tipWords: '',
+				text: '',
+				finishText: '',
+				setSize: {
+					imgHeight: 0,
+					imgWidth: 0,
+					barHeight: 0,
+					barWidth: 0
+				},
+				top: 0,
+				left: 0,
+				moveBlockLeft: undefined,
+				leftBarWidth: undefined,
+				// 移动中样式
+				moveBlockBackgroundColor: undefined,
+				leftBarBorderColor: '#ddd',
+				iconColor: undefined,
+				iconClass: 'icon-right',
+				status: false, //鼠标状态
+				isEnd: false, //是够验证完成
+				showRefresh: true,
+				transitionLeft: '',
+				transitionWidth: ''
+			}
+		},
+		methods: {
+			init() {
+				this.text = this.explain
+				this.getPictrue();
+				this.$nextTick(() => {
+					this.$parent.$emit('ready', this)
+				})
+			},
+
+			//鼠标按下
+			start: function(e) {
+				this.startMoveTime = new Date().getTime(); //开始滑动的时间
+				if (this.isEnd == false) {
+					this.text = ''
+					this.moveBlockBackgroundColor = '#337ab7'
+					this.leftBarBorderColor = '#337AB7'
+					this.iconColor = '#fff'
+					e.stopPropagation();
+					this.status = true;
+				}
+			},
+			//鼠标移动
+			move: function(e) {
+				var query = uni.createSelectorQuery().in(this);
+				this.barArea = query.select('.verify-bar-area')
+				var bar_area_left, barArea_offsetWidth;
+				this.barArea.boundingClientRect(data => {
+					bar_area_left = Math.ceil(data.left)
+					barArea_offsetWidth = Math.ceil(data.width)
+
+					if (this.status && this.isEnd == false) {
+						if (!e.touches) { //兼容移动端
+							var x = Math.ceil(e.clientX);
+						} else { //兼容PC端
+							var x = Math.ceil(e.touches[0].pageX);
+						}
+						// var bar_area_left = this.getLeft(this.barArea);
+
+						var move_block_left = x - bar_area_left //小方块相对于父元素的left值
+						if (this.type !== '1') { //图片滑动
+							if (move_block_left >= barArea_offsetWidth - parseInt(parseInt(this.blockSize
+									.width) / 2) - 2) {
+								move_block_left = barArea_offsetWidth - parseInt(parseInt(this.blockSize
+									.width) / 2) - 2;
+							}
+						}
+
+						if (move_block_left <= 0) {
+							move_block_left = parseInt(parseInt(this.blockSize.width) / 2);
+						}
+
+						//拖动后小方块的left值
+						this.moveBlockLeft = (move_block_left - parseInt(parseInt(this.blockSize.width) / 2)) +
+							"px"
+						this.leftBarWidth = (move_block_left - parseInt(parseInt(this.blockSize.width) / 2)) +
+							"px"
+
+					}
+				}).exec();
+			},
+
+			//鼠标松开
+			end: function() {
+				this.endMovetime = new Date().getTime();
+				var _this = this;
+				//                判断是否重合
+				if (this.status && this.isEnd == false) {
+					if (this.type !== '1') { //图片滑动
+						var moveLeftDistance = parseInt((this.moveBlockLeft || '').replace('px', ''));
+
+						moveLeftDistance = moveLeftDistance * 310 / parseInt(this.imgSize.width)
+
+						var captchaVerification = this.secretKey ? aesEncrypt(this.backToken + '---' + JSON.stringify({
+							x: moveLeftDistance,
+							y: 5.0
+						}), this.secretKey) : this.backToken + '---' + JSON.stringify({
+							x: moveLeftDistance,
+							y: 5.0
+						})
+						let data = {
+							captchaType: this.captchaType,
+							"pointJson": this.secretKey ? aesEncrypt(JSON.stringify({
+								x: moveLeftDistance,
+								y: 5.0
+							}), this.secretKey) : JSON.stringify({
+								x: moveLeftDistance,
+								y: 5.0
+							}),
+							"token": this.backToken
+						}
+						myRequest({
+							// url: `/captcha/check`,
+              url: '/admin-api/system/captcha/check', // 使用项目自定义的 /admin-api/ 前缀
+              data,
+							method: "POST",
+						}).then((result) => {
+							let res = result.data
+							if (res.repCode == "0000") {
+								this.moveBlockBackgroundColor = '#5cb85c'
+								this.leftBarBorderColor = '#5cb85c'
+								this.iconColor = '#fff'
+								this.iconClass = 'icon-check'
+								this.showRefresh = true
+								this.isEnd = true;
+								setTimeout(() => {
+									if (this.mode == 'pop') {
+										this.$parent.clickShow = false;
+									}
+									this.refresh();
+								}, 1500)
+								this.passFalg = true
+								this.tipWords =
+									`${((this.endMovetime-this.startMoveTime)/1000).toFixed(2)}s验证成功`
+								setTimeout(() => {
+									this.tipWords = ""
+									this.$emit('success', {
+										captchaVerification
+									})
+									// this.$parent.$emit('success', {captchaVerification})
+								}, 1000)
+							} else {
+								this.moveBlockBackgroundColor = '#d9534f'
+								this.leftBarBorderColor = '#d9534f'
+								this.iconColor = '#fff'
+								this.iconClass = 'icon-close'
+								this.passFalg = false
+								setTimeout(() => {
+									this.refresh();
+								}, 1000);
+								this.$parent.$emit('error', this)
+								this.tipWords = "验证失败"
+								setTimeout(() => {
+									this.tipWords = ""
+								}, 1000)
+							}
+						})
+					}
+					this.status = false;
+				}
+			},
+			refresh: function() {
+				this.showRefresh = true
+				this.finishText = ''
+				this.transitionLeft = 'left .3s'
+				this.moveBlockLeft = 0
+				this.leftBarWidth = false
+				this.transitionWidth = 'width .3s'
+				this.leftBarBorderColor = '#ddd'
+				this.moveBlockBackgroundColor = '#fff'
+				this.iconColor = '#000'
+				this.iconClass = 'icon-right'
+				this.getPictrue()
+				this.isEnd = false
+				setTimeout(() => {
+					this.transitionWidth = ''
+					this.transitionLeft = ''
+					this.text = this.explain
+				}, 300)
+			},
+
+			//获取left值
+			getLeft: function(node) {
+				let leftValue = 0;
+				while (node) {
+					leftValue += node.offsetLeft;
+					node = node.offsetParent;
+				}
+				let finalvalue = leftValue;
+				return finalvalue;
+			},
+
+			// 请求背景图片和验证图片
+			getPictrue() {
+				let data = {
+					captchaType: this.captchaType,
+					clientUid: uni.getStorageSync('slider'),
+					ts: Date.now(), // 现在的时间戳
+				}
+				myRequest({
+					// url: '/captcha/get', //仅为示例，并非真实接口地址。
+					url: '/admin-api/system/captcha/get', // 使用项目自定义的 /admin-api/ 前缀
+					data,
+					method: "POST",
+				}).then((result) => {
+					let res = result.data
+					if (res.repCode == "0000") {
+						this.backImgBase = res.repData.originalImageBase64
+						this.blockBackImgBase = res.repData.jigsawImageBase64
+						this.backToken = res.repData.token
+						this.secretKey = res.repData.secretKey
+					}
+					// 判断接口请求次数是否失效
+					if (res.repCode == '6201') {
+						this.backImgBase = null
+						this.blockBackImgBase = null
+					}
+				})
+			},
+		},
+		watch: {
+			// type变化则全面刷新
+			type: {
+				immediate: true,
+				handler() {
+					this.init()
+				}
+			}
+		},
+		mounted() {},
+	}
+</script>
+<style scoped>
+	.verifybox {
+		position: relative;
+		box-sizing: border-box;
+		border-radius: 2px;
+		border: 1px solid #e4e7eb;
+		background-color: #fff;
+		box-shadow: 0 0 10px rgba(0, 0, 0, .3);
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+	}
+
+	.verifybox-top {
+		padding: 0 15px;
+		height: 50px;
+		line-height: 50px;
+		text-align: left;
+		font-size: 16px;
+		color: #45494c;
+		border-bottom: 1px solid #e4e7eb;
+		box-sizing: border-box;
+	}
+
+	.verifybox-bottom {
+		/* padding: 15px; */
+		box-sizing: border-box;
+	}
+
+	.verifybox-close {
+		position: absolute;
+		top: 13px;
+		right: 9px;
+		width: 24px;
+		height: 24px;
+		text-align: center;
+		cursor: pointer;
+	}
+
+	.mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 1001;
+		width: 100%;
+		height: 100vh;
+		background: rgba(0, 0, 0, .3);
+		/* display: none; */
+		transition: all .5s;
+	}
+
+	.verify-tips {
+		position: absolute;
+		left: 0px;
+		bottom: 0px;
+		width: 100%;
+		height: 30px;
+		background-color: rgb(231, 27, 27, .5);
+		line-height: 30px;
+		color: #fff;
+	}
+
+	.suc-bg {
+		background-color: rgba(92, 184, 92, .5);
+		filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C);
+	}
+
+	.err-bg {
+		background-color: rgba(217, 83, 79, .5);
+		filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7fD9534F, endcolorstr=#7fD9534F);
+	}
+
+
+	.tips-enter,
+	.tips-leave-to {
+		bottom: -30px;
+	}
+
+	.tips-enter-active,
+	.tips-leave-active {
+		transition: bottom .5s;
+	}
+
+	/* ---------------------------- */
+	/*常规验证码*/
+	.verify-code {
+		font-size: 20px;
+		text-align: center;
+		cursor: pointer;
+		margin-bottom: 5px;
+		border: 1px solid #ddd;
+	}
+
+	.cerify-code-panel {
+		height: 100%;
+		overflow: hidden;
+	}
+
+	.verify-code-area {
+		float: left;
+	}
+
+	.verify-input-area {
+		float: left;
+		width: 60%;
+		padding-right: 10px;
+
+	}
+
+	.verify-change-area {
+		line-height: 30px;
+		float: left;
+	}
+
+	.varify-input-code {
+		display: inline-block;
+		width: 100%;
+		height: 25px;
+	}
+
+	.verify-change-code {
+		color: #337AB7;
+		cursor: pointer;
+	}
+
+	.verify-btn {
+		width: 200px;
+		height: 30px;
+		background-color: #337AB7;
+		color: #FFFFFF;
+		border: none;
+		margin-top: 10px;
+	}
+
+
+	/*滑动验证码*/
+	.verify-bar-area {
+		position: relative;
+		background: #FFFFFF;
+		text-align: center;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		border: 1px solid #ddd;
+		-webkit-border-radius: 4px;
+	}
+
+	.verify-bar-area .verify-move-block {
+		position: absolute;
+		top: 0px;
+		left: 0;
+		background: #fff;
+		cursor: pointer;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		box-shadow: 0 0 2px #888888;
+		-webkit-border-radius: 1px;
+	}
+
+	.verify-bar-area .verify-move-block:hover {
+		background-color: #337ab7;
+		color: #FFFFFF;
+	}
+
+	.verify-bar-area .verify-left-bar {
+		position: absolute;
+		top: -1px;
+		left: -1px;
+		background: #f0fff0;
+		cursor: pointer;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		border: 1px solid #ddd;
+	}
+
+	.verify-img-panel {
+		margin: 0;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		border-top: 1px solid #ddd;
+		border-bottom: 1px solid #ddd;
+		border-radius: 3px;
+		position: relative;
+	}
+
+	.verify-img-panel .verify-refresh {
+		width: 25px;
+		height: 25px;
+		text-align: center;
+		padding: 5px;
+		cursor: pointer;
+		position: absolute;
+		top: 0;
+		right: 0;
+		z-index: 2;
+	}
+
+	.verify-img-panel .icon-refresh {
+		font-size: 20px;
+		color: #fff;
+	}
+
+	.verify-img-panel .verify-gap {
+		background-color: #fff;
+		position: relative;
+		z-index: 2;
+		border: 1px solid #fff;
+	}
+
+	.verify-bar-area .verify-move-block .verify-sub-block {
+		position: absolute;
+		text-align: center;
+		z-index: 3;
+		/* border: 1px solid #fff; */
+	}
+
+	.verify-bar-area .verify-move-block .verify-icon {
+		font-size: 18px;
+	}
+
+	.verify-bar-area .verify-msg {
+		z-index: 3;
+	}
+
+	/*字体图标的css*/
+	/*@font-face {font-family: "iconfont";*/
+	/*src: url('../fonts/iconfont.eot?t=1508229193188'); !* IE9*!*/
+	/*src: url('../fonts/iconfont.eot?t=1508229193188#iefix') format('embedded-opentype'), !* IE6-IE8 *!*/
+	/*url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'),*/
+	/*url('../fonts/iconfont.ttf?t=1508229193188') format('truetype'), !* chrome, firefox, opera, Safari, Android, iOS 4.2+*!*/
+	/*url('../fonts/iconfont.svg?t=1508229193188#iconfont') format('svg'); !* iOS 4.1- *!*/
+	/*}*/
+
+	.iconfont {
+		font-family: "iconfont" !important;
+		font-size: 16px;
+		font-style: normal;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+	}
+
+	.icon-check:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,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");
+		background-size: contain;
+	}
+
+	.icon-close:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,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");
+		background-size: contain;
+	}
+
+	.icon-right:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		background-size: cover;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIEAYAAAD9yHLdAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAAJ4pJREFUeNrt3XtcVXW6P/Dn2VwCBxUzNbnkkXRSGzXW2huQRLyMIqKRJF7Q1CkrDS+VGp3Gy9g5YzI6qVsNfTmlqGmipQiIiJqAcnOvhaKRHidshoatpKaBogL7OX+s6Mz8flO5CfzutXne/+zXWhR8QOXZ3+93Pd8vAHuAEKW10lpp7dix0mXpsnR5/34pX8qX8r/7TpZlWZaJGl//9f6+fY3/X+PnEf2dMMYY/yJqYcbbxtvG2/7+lEM5lLN7NyyCRbBowICmfj56m96mt/PzDZGGSEPkxImWNpY2ljYVFaK/T8ZY6+MiOoCzMn1t+tr09a9/TQfpIB0sLITlsByW9+r1Sz8v5mEe5vn7Q3toD+0nT/Y77Xfa73ROTuWNyhuVNyorRX/fjLHWg0cgzUybcmrThvIoj/JUFcMwDMOeeKLFvmA8xEN8TQ2sh/Ww/rnnFFVRFfXwYdE/B8aY8zOIDuBsqDf1pt6vvdbihaPRBtgAG7y8wAQmMKWlyflyvpw/aZLonwNjzPlxAWlWiOiN3ugdH//Av7QFLGBxd4dzcA7O7dgh75H3yHvmzBH9E2GMOS+ewmomplhTrCn2qads5bZyW3lJieg8jWgADaABf/yjul5dr65fvPj7uyQ6F2NM/3gE0kxsb9vetr3do4foHP8vLMACLPj977W1mS1bwimcwsnVVXQuxpj+cQFpLt/Ct/BtmzaiY/y0adNqltYsrVmakqIVEg8P0YkYY/rFj/E2E5+zPmd9znbpAggI+PzzovP8qItwES727n23w90OdzuEhfl86fOlz5f79lmtVqvVeveu6HiMMf3gEUgzqVfqlXqluFi7qqsTnefnYCImYmJ4OOVSLuWeONF/Zv+Z/Wf6+orOxRjTD15Eb2ZSlVQlVWVkYCRGYuSoUaLz3C86QSfoRHk5lVAJlURElISWhJaE/vWvonMxxhwXj0CaGT1Lz9KzS5eCDDLI+nnaCQfiQBwYEID1WI/1J05oi+6SJDoXY8xx8RpIM7tccbnickVlZdekrkldk4gwAzMwY8gQ0bnuF2ZhFmZ5eWkd7pMn+1T4VPhUKIq2RvLll6LzMcYcB09htShE6YJ0Qbqwdi3GYRzG6bCxbxbMgll372ojqilTlEAlUAncu1d0LMaYeDyF1aKI1CfUJ9Qn5s6FuTAX5r71lt6mtiAJkiDpoYeojuqo7uOP5VQ5VU6dOVN0LMaYeDwCecCkFClFSpk+HcbBOBi3eTOa0IQm/TX20RbaQlsSE9V+aj+131tvic7DGHvwuIAIIp+Xz8vno6OpJ/Wknrt2YRAGYZCnp+hcdpsAE2DC++8rbypvKm82TtHZbKJjMcZaHhcQwYxnjWeNZ8PDaTpNp+mpqdrd9u1F52qa/fu9LF4WL8ukSTmYgzl4547oRIyxlsNrIIJZ+lr6Wvrm5GBv7I29Bw6EN+ANeOMf/xCdq2mefbbGWGOsMR48GHQx6GLQxXbtRCdijLUcfozXQVSWVpZWllZV+df51/nX7dtH8RRP8aNGwQk4ASc6dhSdzz7du9NVukpXR4zoFNMpplPM/v1Xsq9kX8m+dUt0MsZY8+ERiIMpTitOK067dMm1zrXOtS4sTLurqqJz2e04HIfjsuw623W26+yCgsD8wPzAfMfbrZgx1nRcQBxUUVxRXFHclSu1CbUJtQnh4dpd/R1V+0OHuxGNaMzLazw3RXQuxtgvx4voOtEnpU9KnxR3d88yzzLPsu3bIQ3SIG38eNG57BYEQRB04wZVUzVVP/OMukPdoe7IyxMdizFmPx6B6ETZ+LLxZePv3Qv4PODzgM/j4mg37abdGzeKzmW3YiiGYm9vHIyDcXB2tlwil8gl48aJjsUYsx+PQHROTpaT5eSEBDCDGcwrVojOYy9KoiRKamgAK1jBOmuWGq1Gq9GbN4vOxRj7eVxAnISUKWVKma++ihVYgRXr1sEm2ASbDPoZYTZu8bIJNsGmd95RUEEF//AH0bEYYz9OP79g2E9SI9VINfL996mWaql23DjaQBtog44a+RRQQEEEIxjBuHSptgml2ax9UEeFkLFWhEcgTko7z2PIECqiIiravx+DMRiD9drYt3MnEBDQ9OmKqqiK6vgnPjLWGvA7OyelKIqiKJ99pj31NHQovAavwWtVVaJzNU1cHKyCVbAqM/Ppjk93fLpj27aiEzHGeATSahjTjenG9IAAOkyH6XBWFpyEk3BSf419tISW0JJTp2wdbB1sHaKiTg86Pej0oG++EZ2LsdaIC0grozXyPfpow7SGaQ3TMjNxKS7FpTps7CMgoPPntYuICG1q6+9/Fx2LsdaEC0gr1Z/6U3/y9nZNcE1wTThwAI7CUTjauHWK3litVEEVVDFypFqlVqlVpaWiEzHWGvAaSCt1Bs/gGbxx46bfTb+bfsOHUxqlUZpej6rt2hVX4kpcefy4sYOxg7HD00+LTsRYa8AjEAYAALGxsbGxsS4u5XK5XC4nJcEe2AN7XnpJdK6muX1bex0/XnuYICNDdCLGnBEXEPZvIMokk0xLlzb2ZYhOZK/GDne8htfw2iuvKJFKpBL5wQeiczHmTPg8EPZvWZdZl1mXHT/uY/Yx+5ivX4cn4Ul4MiLih4Y/B4cZmIEZBgPchJtwc8wY33Lfct/y2trKO5V3Ku+cPCk6H2POwOF/ETDHoDUmxsVpV1u3aq9ubqJzNY3ZrE1tvf66ds1nuDPWFFxAmF0C9wTuCdwzbBj6oi/67tuHc3AOztFfYx9Npak0dft2TMZkTH7xRe5wZ8x+XEBYk5i6m7qbuptMtlG2UbZRGRlQCIVQ2KmT6Fx2i4RIiExPh0zIhMwJE7SRSeMiPGPsp3ABYb+INrXVq5d2lZWlvT72mOhcdiMgoKIi7WL0aG1EcvWq6FiMOTLuA2G/iPaOvbEjPCQEBsEgGKTDRj4EBAwOhkWwCBbl5BhvG28bb/v7i47FmCPjEQhrVn379u3bt2+HDm55bnlueWlpOAyH4TAdNvaFQiiE/u1v2Bk7Y+eICMtiy2LL4gsXRMdizJHwY7ysWVVVVVVVVd2545Ptk+2T/fHH2t3GvbZ+/WvR+e5bBVRAhbc3zaJZNCsu7lG3R90edcvLu6xcVi4rX38tOh5jjoCnsFiLaFyMDggICAgIiI6mPbSH9uivkQ/n4Tyc9/DDBjSgAbOzA/MD8wPzR44UnYsxR8BTWOwBQpTmS/Ol+StW4HE8jsfffFN0IrsZwQjGe/dgGkyDadOnK6FKqBK6a5foWIyJwFNY7IGyFlgLrAVHjnTd3nV71+03buDj+Dg+PmKEXjrcoRIqodLFBaqgCqpiYnzAB3ygpsZqtVqt1oIC0fEYe5C4gDAhrNus26zbiop8yZd86dIlqIEaqBk9Wvuoi+P/vbSCFayNBW/EiK5ZXbO6Znl6WpOsSdako0dFx2PsQXD8d3ysVZCWS8ul5aNH4yf4CX6ye7d2t00b0bmaJjnZy+Jl8bLMmJGDOZiD9fWiEzHWEriAMIciS7IkS8HB2lV6utaf8cgjonPZi+IpnuIPHHAf7j7cffjEiYX+hf6F/rW1onMx1pz4KSzmULQO8KKihjUNaxrWhIdTPuVTfkWF6Fz2wg24ATc888y9gnsF9woyM7XC2L696FyMNScuIMwhnR50etDpQWVltI7W0bqwMMqjPMrTXyMfJmIiJoaHUy7lUu6JE/1n9p/Zf6avr+hcjDUHnsJiuhBSEVIRUvHww3Xn6s7VnUtP17YcGTBAdC57USIlUuKlS7YDtgO2AxERp82nzafNFy+KzsVYU/AIhOmCtoZw/bpWQIYPh9WwGlYfOiQ6l70wARMwoXt3wzjDOMO4vDxtM0pJEp2LsabgAsJ0pXRh6cLShbdu1V6uvVx7OTqaUimVUvXXyIev4+v4epcuEA/xEJ+To62RjBghOhdj9uApLOYEELVfwCtXak9tzZ8vOpHdvu9wJ5lkkp9/Xn1ZfVl9OSVFdCzGforjN2wxdh+0TvDDh31W+KzwWXHnDtRDPdQPG/avDX8OrLHDfQbMgBkxMT6jfUb7jK6qsn5s/dj6scUiOh5j/47j/8NirAm0tYVp0+gUnaJTf/kLmtCEJldX0bnsRVtoC21JTFT7qf3Ufm+9JToPY/+MCwhzavJ5+bx8PjqaelJP6rlrFwZhEAZ5eorOZbcJMAEmvP++8qbypvLmnDnaTZtNdCzWunEBYa2C8azxrPFseDhNp+k0PTVVu6vDxr4oiIKoffu8lnkt81oWF6dtlXLnjuhYrHXip7BYq2Dpa+lr6ZuTg72xN/YeOBDegDfgjX/8Q3Quu2VABmSMHVtjrDHWGA8eDLoYdDHoYrt2omOx1okX0VmrUllaWVpZWlXlX+df51+3b5+2Z9WoUXACTsCJjh1F57NP9+50la7S1REjOsV0iukUs3//lewr2Veyb90SnYy1DjwCYa1ScVpxWnHapUuuda51rnVhYdpdVRWdy27H4Tgcl2XX2a6zXWcXFGgnJvboIToWax24gLBWrSiuKK4o7sqV2oTahNqE8HDt7uHDonPZCwfiQBwYEIBGNKIxL88Ua4o1xTaeRc9Yy+BFdMb+SZ+UPil9UtzdPcs8yzzLtm+HNEiDtPHjReeyWxAEQdCNG1RN1VT9zDPqDnWHuiMvT3Qs5lx4BMLYPykbXza+bPy9ewGfB3we8HlcHO2m3bR740bRuexWDMVQ7O2Ng3EwDs7OlkvkErlk3DjRsZhz4REIY/dBTpaT5eSEBDCDGcwrVojOYy9KoiRKamjQOvNnzVKj1Wg1evNm0bmYvnEBYcwOUqaUKWW++ipWYAVWrFsHm2ATbDLoZyQvgwwykZb7nXcUVFDBP/xBdCymT/r5i8+YA1Aj1Ug18v33qZZqqXbcONpAG2iDjhr5FFBAQdQ2b1y6VLogXZAumM3aB3VUCJlD4BEIY7+AtufWkCFUREVUtH8/BmMwBuu1sW/nTiAgoOnTtaOF6+pEJ2KOjd9xMPYLKIqiKMpnn2lPPQ0dCq/Ba/BaVZXoXE0TFwerYBWsysx8uuPTHZ/u2Lat6ETMsfEIhLFmZEw3phvTAwLoMB2mw1lZcBJOwkn9NfbRElpCS06dsnWwdbB1iIrSzqj/5hvRuZhj4QLCWAvQGvkefbRhWsO0hmmZmbgUl+JSHTb2ERDQ+fPaRUSENrX197+LjsUcAxcQxlpQf+pP/cnb2zXBNcE14cABOApH4Wjj1il6Y7VSBVVQxciRapVapVaVlopOxMTiNRDGWtAZPINn8MaNm343/W76DR9OaZRGaXv3is7VNF274kpciSuPHzd2MHYwdnj6adGJmFg8AmHsAYqNjY2NjXVxKZfL5XI5KQn2wB7Y89JLonM1ze3b2uv48drDBBkZohOxB4sLCGPCIMokk0xLlzb2ZYhOZK/GDne8htfw2iuvKJFKpBL5wQeic7EHg88DYUwg6zLrMuuy48d9zD5mH/P16/AkPAlPRkT80PDn4DADMzDDYICbcBNujhnjW+5b7lteW1t5p/JO5Z2TJ0XnYy3L4f+CMtaaaI2JcXHa1dat2qubm+hcTWM2a1Nbr7+uXfMZ7s6GCwhjDihwT+CewD3DhqEv+qLvvn04B+fgHP019tFUmkpTt2/HZEzG5Bdf5A5358IFhDEHZupu6m7qbjLZRtlG2UZlZEAhFEJhp06ic9ktEiIhMj0dMiETMidM0EYmjYvwTK+4gDCmA9rUVq9e2lVWlvb62GOic9mNgICKigwHDAcMB6KiTvmd8jvld+2a6FisabgPhDEd0N6xN3aEh4TAIBgEg3TYyIeAgMHBtmJbsa04NzfoYtDFoIt+fqJjsabhEQhjOtS3b9++fft26OCW55bnlpeWhsNwGA7TYWNfKIRC6N/+hp2xM3aOiLAstiy2LL5wQXQsdn/4MV7GdKiqqqqqqurOHZ9sn2yf7I8/1u427rX161+LznffKqACKry9aRbNollxcY+6Per2qFte3mXlsnJZ+fpr0fHYT+MpLMZ0rHExOiAgICAgIDqa9tAe2qO/Rj6ch/Nw3sMPG9CABszODswPzA/MHzlSdC7203gKizGngyjNl+ZL81eswON4HI+/+aboRHYzghGM9+7hLbyFt6ZNs+yw7LDsaBxpMUfBU1iMOSFrgbXAWnDkSNftXbd33X7jBj6Oj+PjI0bopcMdKqESKl1coBt0g27PPecDPuADNTVWq9VqtRYUiI7HNFxAGHNi1m3WbdZtRUW+5Eu+dOkS1EAN1IwerX3UxfH//VvBCtbGgjdiRNesrlldszw9rUnWJGvS0aOi47V2jv9OhDHWbKTl0nJp+ejR+Al+gp/s3q3dbdNGdC67xUAMxGzd6vW219teb7/0Ug7mYA7W14uO1dpwAWGsFZIlWZKl4GDtKj1d68945BHRuexFGZRBGamp7nXude51kyYV+hf6F/rX1orO1VrwU1iMtULanlRFRQ1rGtY0rAkPp3zKp/yKCtG57IVRGIVR0dH3Cu4V3CvIzNQKY/v2onO1FlxAGGvFTg86Pej0oLIyWkfraF1YGOVRHuXpr5EPEzERE8PDKZdyKffEif4z+8/sP9PXV3QuZ8dTWIyxHzyV+1TuU7mdOhm+NXxr+DYjA9/Bd/Adk0l0LnvRCTpBJ8rLaRgNo2FhYSX5Jfkl+ZWVonM5Gx6BMMZ+oI1Ivvnmzt07d+/cHTpUu3v4sOhc9sKBOBAHBgQYFhsWGxbv3dsnpU9KnxR3d9G5nA2PQBhjP6rxF69HqEeoR+jWrRiN0Rg9aZLoXE3z6qta535SkugkzoILCGPsPhkM0gXpgnRhzRqMwziMmzNHdKL7thAWwsKvvlImKhOVid27i47jLLiAMMbsJifLyXJyQgKchJNw8t139dLhjs/is/hsr16862/z4DUQxpjdlGnKNGVaYiJFURRFvfIKJVESJTU0iM71s76Bb+Cb3/xGdAxnwQWEMdZkarQarUZv3ky9qTf1Hj8eXoFX4BWbTXSuH0PP0rP07K9+JTqHs+ACwhhrstjY2NjYWBcX3ISbcFNUFGyCTbDJ4Li/VxbCQljIW540F8f9g2aMOSztjPY2bb7c8OWGLzccOIC7cBfueuEF0bl+ViqkQuqNG6JjOAtX0QEYY/rReJQuHaWjdFRHR+nKIINMVLerblfdLotFdBxnwQWEMfazgi4GXQy66OfXcLbhbMPZrCwYBsNgWJ8+onPdL/oT/Yn+lJ9f6l3qXepdVSU6j7PgAsIY+1HaVFWvXg0TGyY2TMzK0u4+9pjoXPYypBhSDCl//KPoHM6G10AYY/8fU3dTd1N3kwlCIARCcnO1u/orHPQcPUfPbdpkednysuXlzEzReZwNj0AYYz+Q3pbelt6OiLBdt123Xf/kEyiEQijU32OvFE/xFH/gwHc139V8VzNvnug8zsrhO0cZYy1Pm6qKi9Outm7VXt3cROeyF31Kn9Kn27bhWByLY2fM0M49qasTnctZ8RQWY62Ysaexp7Hn7NlaA+D27dpd/RUOjdmsdlO7qd2mT+fC8WC4iA7AGHvwftjL6jSchtPvvaeXvaz+7xvQHssld3In94QE9Zh6TD22eLHoWK0Nj0AYawUaO8blcrlcLt+0CcxgBvOKFaJz2YtO0Sk6VV+P5/E8np8xQ/1U/VT9dOVK0blaK/2842CM2a2HuYe5h/mhh9pvbb+1/dbt2wEBAWNjRedqmtu3tU7y2FjFT/FT/A4eFJ2oteMRCGNOSDsIysurXVy7uHZxaWm6LRxzYS7M/fZbLMdyLB8xgguHY+ERCGNOJHhn8M7gnV261I2pG1M3JjMTB+NgHBwYKDqX3QbAABhQWQn5kA/5I0dqi+Jnz4qOxf4Vj0AYcwJBY4LGBI3p3r3erd6t3i0vT7eFIwzCIOyLL7TCMWAAFw7HxiMQxnTMOMU4xTjlN78hb/Im76wsKIACKPDxEZ3LXrSEltCSU6dwGS7DZaNGaYXj6lXRudhP4050xnRIJplkGjyYjGQk4/792t327UXnshfNp/k0/8gRzxc8X/B8ISbm5LWT105eq64WnYvdH57CYkxH5PPyefl8dDQVUREVNe7tpL/CAdEQDdEffYSrcBWuGjWKC4c+8RQWYzogpUgpUsr06TAOxsG4zZvRhCY0uep0BsFsVhRFUZTXX9euHfcIXPbTuIAw5sB+6BjXaeNfY8e4dtTtO+8oqKCCf/iD6Fiseej0HQxjzgxRKpPKpLJVq+B5eB6ef+MN0YnsRUmUREkNDWAFK1hnzVJRRRU3bxadizUvHoEw5gC0xj93d4+rHlc9riYn4wf4AX4wcaLoXHabBbNg1t27WIqlWDp5ssVsMVvMn3wiOhZrGVxAGBOo38p+K/ut/NWv3ILdgt2C9+6F1+F1eH3kSNG57BYEQRB04wZVUzVVP/OMukPdoe7IyxMdi7UsLiCMCRBSEVIRUvHww3Xn6s7VnUtPh0WwCBYNGCA6V9NYrbZSW6mtNDKypK6krqTuzBnRidiDwY/xMvYABa4KXBW4qlu3ex3vdbzXMT9fr4WDTtAJOlFerl2FhXHhaJ14EZ2xB+Cp3Kdyn8rt0weDMRiDDx3CUAzFUH9/0bnstgyWwTKLpX59/fr69VFRpUqpUqpUVYmOxcTgKSzGWpAsyZIsBQdrV+np2q64jzwiOpfdhsNwGH7smMuLLi+6vDh2bHHP4p7FPb/7TnQsJhZPYTHWAqTl0nJp+ejRWsE4dky3hSMKoiBq3z6vd73e9Xo3KooLB/tnPAJhrBlJnaXOUucpU9Af/dH/ww+1uzo8YzwVUiF1wwbt/I25c7Wb3DHO/hWfic5YM5COSEekI/PmYSAGYuDGjdoZ4/rbaoS20Bbakpio9lR7qj0bGxiJROdijkl3f8EZcxyIUqlUKpW++y7+Dn+Hv0tIEJ3IXo0d42hFK1pnz1b7qf3Ufhs3is7F9IGnsBizQ2xsbGxsrItL+ZflX5Z/uXGjtrYxY4boXHb7vmOcbGQj29Sp6svqy+rLKSmiYzF94QLC2H3oYe5h7mF+6KH2Ie1D2ofs3Kn9Ao6JEZ3LbvEQD/E1NRADMRATE6N4K96Kd3a26FhMn7iAMPYT+lN/6k/e3q5GV6OrMS1NuztwoOhc9qLVtJpWX7liWGRYZFgUGWnJteRacktKROdi+sZrIIz9G7Isy7LctSscgANwoPHgpv79ReeyFyVSIiVeumTba9tr2xsRoeaquWruxYuiczHnwCMQxv6JVjgefxwICCgrS1vjePxx0bnsRTmUQznnzjUsaFjQsGDkyDMbz2w8s/Ef/xCdizkXbiRkDAACQwNDA0ONRgiBEAgpKNBt4UigBErIycFBOAgHDRzIhYO1JB6BsFZNmi3NlmYPHQprYA2s2bdP26uqXTvRuexFGZRBGamp7nXude51kyYV+hf6F/rX1orOxZwbr4GwVklaK62V1o4dC8EQDME7d2qFw8NDdC67xUAMxGzd2rZL2y5tu7z0Ug7mYA7W14uOxVoHHoGwVkUaJA2SBsXH4xScglPMZu2sboPupnJ/6Bjvp/ZT+731lug8rHXiAsJaBTlZTpaTExLADGYwr1ghOo/93wDIIBNBOIRD+IIFymRlsjL5vfdEx2Ktm+7eeTF2Pxo7xqW/Sn+V/pqUpNvCYQQjGO/dw9t4G2/HxXHhYI6ERyDMqfzQMX69/fX217dtgzRIg7Tx40XnspsJTGC6dcs21TbVNnXcuJLQktCS0EOHRMdi7J/xCIQ5hT4pfVL6pHh5tYtrF9cuLi1Nr4WD1tJaWnv9uo1sZKPhw7lwMEfGIxCma8E7g3cG7+zSpf7P9X+u//PBg9pdSRKdy26hEAqhf/sbdsbO2DkiwrLYstiy+MIF0bEY+yn8GC/TpaAxQWOCxnTvXu9W71bvlpWl3e3ZU3Quu/0efg+/Lytz6evS16VvRIR24t/XX4uOxdj94ALCdMU4xTjFOOU3v2mIbIhsiDx0CFbACljh6ys6l90ICKioyBBkCDIERUUV+xX7FftduyY6FmP24CkspgvGs8azxrPh4TSdptP01FTtbvv2onPZbR2sg3VpaW7+bv5u/hMmcMc40zNeRGcOzfhfxv8y/tczz9j62PrY+jTuiqu/wkGf0qf06bZtMBtmw+znnuPCwZwBj0CYQ9J2xZ02jU7RKTr1l7+gCU1o0t8Z4xqzWVEURVFee0275jPGmXPgEQhzKD90jMsgg7xli+4Kx/cd49SNulG3N9/UCse8edoHuXAw58IjEOYAEOW18lp57Z/+BNtgG2xbsEB0IntpI6X6esNgw2DD4Fde0U78+/BD0bkYa0n6eWfHnIrW+Ofu7hHqEeoRunUrREM0RE+aJDpX09y+jZVYiZWxsVrhaOxHYcy58RQWe6D6rey3st/KX/3K447HHY87+/djNEajHgvHXJgLc7/9FsuxHMtHjFD8FD/FjwsHa11cRAdgrUNIRUhFSMXDD9Ntuk23MzNxFa7CVUOHis5ltwEwAAZUVsJe2At7f/tb5ZJySblksYiOxZgIvAbCWpR2VKyPj+Gu4a7hbuOeTn37is5ltzAIg7AvvoBcyIXckSMVVVEV9e9/Fx2LMZF4Cou1iMDqwOrA6t698TP8DD8rLNTu6q9w0BJaQktOndIKx6BBXDgY+z88AmHNytjT2NPYMyiI2lJbapuRAQgI+MgjonPZbSWshJVHj3rEesR6xI4de/LayWsnr1VXi47FmCPhEQhrFsZ0Y7ox/be/tSXbkm3JR47otnBEQzREf/QRLIAFsCAykgsHYz+ORyDsF5E6S52lzlOmoD/6o39j34Obm+hc9qKdtJN2rlunPqE+oT7R2DFus4nOxZgj4xEIaxJZkiVZmjsX/xv/G/87OVm7q6PC0XjGuAUsYFm2TCscc+dqH+TCwdj94BEIswOiTDLJtHSpdlb30qWiE9mLkiiJkhoawApWsM6apUar0Wr05s2iczGmR1xA2E+KjY2NjY11cSmXy+VyOSkJ9sAe2PPSS6Jz2W0WzIJZd+9iKZZi6eTJFrPFbDF/8onoWIzpGRcQ9m/1MPcw9zA/9FA7j3Ye7Tw++gg34Sbc9NxzonPZLQiCIOjGDaqmaqp+5hl1h7pD3ZGXJzoWY86A10DYv+hP/ak/eXu3/7r91+2/zs7Wa+GgAiqggsuXDVcNVw1XhwzhwsFY8+OtTBgAAJhiTbGm2EcfhTbQBtpkZ+OH+CF+GBwsOpe96ASdoBPl5aSSSurQocp8Zb4yv6xMdC7GnBEXkFZO698ICKAqqqKqY8dwG27DbX36iM5lt8EwGAYrSn1ZfVl92dChZyaemXhmYkWF6FiMOTPezr2VkiRJkiRZpm/pW/r24EE4CSfhZOfOonM1zWefucx0meky89lnlZ5KT6Xnd9+JTsRYa8BrIK2MdlTskCFQDMVQfOwYrIE1sEaHhSMKoiBq3z4vi5fFyzJqVHHP4p7FXDgYe6D4KaxWQlorrZXWjh0LwRAMwTt3YjzGY7yHh+hcdkuFVEjdsEE7f4Mb/xgTiUcgTk7KlDKlzFdfRU/0RM+9e/VaOGgLbaEtiYla4Zg9W7vLhYMxkXgNxEnJyXKynJyQAItgESxasUJ0Hns1doyjFa1onT1b7af2U/tt3Cg6F2Ps//BTWE6isWPc44DHAY8D77+PC3EhLnzrLdG57PZ9x7i21ciUKepkdbI6uXGvLcaYI+E1EJ3rk9InpU+Ku7tnmWeZZ9n27ZAGaZA2frzoXHaLh3iIr6mBGIiBmJgYxVvxVryzs0XHYoz9OC4gOqUVDi8vz0TPRM/Exj2dRowQnctetJpW0+orVwyLDIsMiyIjLbmWXEtuSYnoXIyxn8drIDoTvDN4Z/DOLl3qE+sT6xMPHtTuSpLoXPaiREqkxEuXbHtte217IyLUXDVXzb14UXQuxtj946ewdELbo+o//qPukbpH6h7JzdXu6rBw5FAO5Zw717C3YW/D3rCw0+bT5tNmLhyM6RFPYTk403rTetP6J5+0dbB1sHXIyoL34D14z9dXdC57UQIlUEJODq7AFbgiOlpRFVVRb94UnYsx1nRcQByUNFIaKY0MCdEWxdPTMQRDMKRjR9G57EUZlEEZqanude517nWTJhX6F/oX+tfWis7FGPvleA3EwQSWB5YHlo8ZA92gG3TbvRuDMAiDPD1F57JbDMRAzNatbbu07dK2y0sv5WAO5mB9vehYjLHmwyMQByEfk4/Jx6ZOpcE0mAZ/8AGa0IQmV90V+MaOca3xT4d9KIyx+8YFRDDpiHREOjJvHqZgCqasXg0KKKCgfv5cZJBBJoJwCIfwBQuUycpkZfJ774mOxRhrebp7h+scEOUb8g35RmIiDINhMGzhQtGJ7GYEIxjv3cNbeAtvTZtmmWyZbJn88ceiYzHGHhwuIA9IOIVTOLm6Vv+5+s/Vf960SSscL7wgOpfdTGAC061btqm2qbap48aVhJaEloQeOiQ6FmPsweM+kBamnb/Rpk31N9XfVH+Tmoq7cBfu0l/hoLW0ltZev24jG9lo+HAuHIwx/cy168zTHZ/u+HTHtm3v/O7O7+787vBh+Aw+g89CQkTnsttCWAgLv/rKMNAw0DAwIuKU3ym/U37/8z+iYzHGxOMC0iIQ5Xw5X85PTYU5MAfmjBkjOlHTnD1re8j2kO2hkSNL8kvyS/IrK0UnYow5Di4gzcw4xTjFOGXiRPqCvqAvdu0SncduBARUVGQ4YDhgOBAVpY04rl0THYsx5nh4DaSZUSfqRJ3+8z9F57DbOlgH69LS3FLdUt1ShwzhwsEY+zlcQJqJMd2YbkwPCIBcyIXcfv1E57lvH8FH8NGWLV4DvAZ4DYiJ4a1GGGP3ix/jbSbUg3pQj759Reewj9ms9FJ6Kb1ee+3774JEJ2KM6QePQJoJlVIplXboIDrHj/q+Y1w7Y/yNNxRFURRl3rzv03PhYIzZjQtIMyEjGcnoeGsGdIpO0an6ejyP5/H8jBmWSkulpXL1atG5GGP65yI6gLN4rPyx8sfK6+qomqqpuvGdvUDfd4wbrAarwRoTY1lvWW9Zv2eP6FiMMefBI5BmUpxWnFacdukSLIElsOTMGVE5qJAKqfDaNfqKvqKvfvtby8uWly0vZ2aK/vkwxpwPF5BmRlfoCl1ZvlzMV7dawRd8wXfoUPWQekg9VFgo+ufBGHNe3EjYIhCly9Jl6fK+fRiFURgVHd1iXyoMwiDsiy9wOS7H5RERljaWNpY2FRWifwKMMefHI5AWQeT5pOeTnk8+/zy8C+/Cu7m5zf4lvv+8hgWGBYYFYWFcOBhjDxovoreQitqK2orae/d8Pvf53Ofzjz4CBAR0c6NiKqZiWcbNuBk3u7nd7+fT/r/aWqzHeqxftQpWwkpY+cILloWWhZaFNTWiv1/GWOvDU1gPWGBoYGhgqI+Py1cuX7l8NWEC7aW9tHfIELpO1+m6v3/jf4cP48P4cEUFvUPv0DvHjtF39B19l5LCmxoyxhzF/wKeYeMy/zPC/wAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNy0xMi0xNVQxNTo1NzoyNyswODowMKIRvi8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTctMTItMTVUMTU6NTc6MjcrMDg6MDDTTAaTAAAATXRFWHRzdmc6YmFzZS11cmkAZmlsZTovLy9ob21lL2FkbWluL2ljb24tZm9udC90bXAvaWNvbl9jazFiemEwemo5ampkY3hyL3JpZ2h0LnN2Z7O3J80AAAAASUVORK5CYII=");
+		background-size: contain;
+	}
+
+	.icon-refresh:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,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");
+		background-size: contain;
+	}
+</style>
diff --git a/env.d.ts b/env.d.ts
new file mode 100644
index 0000000..e269efc
--- /dev/null
+++ b/env.d.ts
@@ -0,0 +1,13 @@
+/// <reference types="vite/client" />
+
+declare module '*.vue' {
+  import { DefineComponent } from 'vue'
+
+  const component: DefineComponent<{}, {}, any>
+  export default component
+}
+
+interface ImportMetaEnv {
+  VITE_TITLE: string
+  VITE_BASE_URL: string
+}
diff --git a/main.ts b/main.ts
new file mode 100644
index 0000000..c19c964
--- /dev/null
+++ b/main.ts
@@ -0,0 +1,41 @@
+import { createSSRApp } from 'vue'
+import * as Pinia from 'pinia'
+// @ts-ignore
+import uView from 'vk-uview-ui'
+import App from './App.vue'
+
+
+
+import tab from './plugins/tab'
+import modal from './plugins/modal'
+import time from './plugins/time'
+
+
+// unocss
+import 'uno.css'
+
+import { accessTimeInAnHour, getNowFormatDate } from "./utils/dateTime";
+export function createApp() {
+	const app = createSSRApp(App)
+	app.use(Pinia.createPinia())
+	app.use(uView)
+	// 解决onLaunch和onLoad异步问题
+	app.config.globalProperties.$onLaunched = new Promise(resolve => {
+		app.config.globalProperties.$isResolve = resolve
+	})
+
+	// 页签操作
+	app.config.globalProperties.$tab = tab
+	// 模态框对象
+	app.config.globalProperties.$modal = modal
+	// 时间对象
+	app.config.globalProperties.$time = time
+
+
+
+	return {
+		app,
+		// uni-app 官方文档示例 https://zh.uniapp.dcloud.io/tutorial/vue3-pinia.html#%E7%8A%B6%E6%80%81%E7%AE%A1%E7%90%86-pinia
+		Pinia // 此处必须将 Pinia 返回
+	}
+}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..4000fae
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,82 @@
+{
+    "name" : "富维汽车镜",
+    "appid" : "__UNI__DA78BC9",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "ad" : {}
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx6176535b0b0153f0",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "3",
+    "h5" : {
+        "template" : "index.html",
+        "devServer" : {
+            "port" : 9020
+        }
+    }
+}
diff --git a/pages.json b/pages.json
new file mode 100644
index 0000000..69e834d
--- /dev/null
+++ b/pages.json
@@ -0,0 +1,1739 @@
+{
+
+	"pages": [{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "WMS仓库管理系统-移动端",
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [{}]
+				}
+			}
+		},
+		{
+			"path": "pages/message/index",
+			"style": {
+				"navigationBarTitleText": "消息",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+
+
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/message/details",
+			"style": {
+				"navigationBarTitleText": "消息详情",
+				"enablePullDownRefresh": false,
+				"titleNView": {
+					// "autoBackButton": "true",
+					// 	"buttons": [
+					// 		// 右边按钮
+					// 		{
+
+					// 			"float": "right",
+					// 			"fontSize": "58rpx", //按钮上文字的大小
+					// 			"text": "\ue696",
+					// 			"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+					// 		}
+					// 	]
+				}
+			}
+		},
+
+		{
+			"path": "pages/login/index",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
+		},
+
+
+		{
+			"path": "pages/query/item",
+			"style": {
+				"enablePullDownRefresh": false, // 是否配置下拉刷新的功能
+				"navigationBarTitleText": "按物料查询库存",
+				"titleNView": {
+					"autoBackButton": "true",
+					"buttons": [{}]
+				}
+			}
+		},
+		{
+			"path": "pages/query/location",
+			"style": {
+				"navigationBarTitleText": "按库位查询库存",
+				"enablePullDownRefresh": false,
+				"titleNView": {
+					"autoBackButton": "true",
+					"buttons": [{}]
+				}
+			}
+		}, {
+			"path": "pages/query/container",
+			"style": {
+				"navigationBarTitleText": "按器具查询库存",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					"autoBackButton": "true",
+					"buttons": [{}]
+				}
+			}
+		},
+
+
+		{
+			"path": "pages/setter/index",
+			"style": {
+				"navigationBarTitleText": "设置",
+				"enablePullDownRefresh": false,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+
+
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/setter/passwordpage",
+			"style": {
+				"navigationBarTitleText": "修改密码",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/supplierDeliver/record/supplierDeliverRecord",
+			"style": {
+				"navigationBarTitleText": "供应商发货记录",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/supplierDeliver/record/supplierDeliverRecordDetail",
+			"style": {
+				"navigationBarTitleText": "供应商发货记录详情",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/inspect/request/inspectRequest",
+			"style": {
+				"navigationBarTitleText": "检验单申请",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/inspect/request/inspectRequestDetail",
+			"style": {
+				"navigationBarTitleText": "检验单申请详情",
+				"enablePullDownRefresh": true
+			}
+		},
+		
+		{
+			"path": "pages/inspect/job/inspectResult",
+			"style": {
+				"navigationBarTitleText": "检验详情",
+				"enablePullDownRefresh": true
+			}
+		},
+			
+		
+		{
+			"path": "pages/purchaseReceipt/job/receiptJob",
+			"style": {
+				"navigationBarTitleText": "采购收货",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/purchaseReceipt/job/receiptDetail",
+			"style": {
+				"navigationBarTitleText": "采购收货任务详情",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/purchaseReturn/record/returnRecord",
+			"style": {
+				"navigationBarTitleText": "采购退货记录",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/purchaseReturn/request/returnRequest",
+			"style": {
+				"navigationBarTitleText": "采购退货申请",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/purchaseReturn/request/returnRequestDetail",
+			"style": {
+				"navigationBarTitleText": "采购退货申请详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/purchaseReturn/request/returnRequestCreate",
+			"style": {
+				"navigationBarTitleText": "采购退货申请创建",
+				"enablePullDownRefresh": true
+			}
+		},
+
+		{
+			"path": "pages/purchaseReturn/job/returnJob",
+			"style": {
+				"navigationBarTitleText": "采购退货",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/purchaseReturn/job/returnDetail",
+			"style": {
+				"navigationBarTitleText": "退货任务详情",
+				"enablePullDownRefresh": true
+				// "titleNView": {
+				// 	"autoBackButton": "true"
+				// }
+			}
+		},
+		{
+			"path": "pages/inspect/job/inspectJob",
+			"style": {
+				"navigationBarTitleText": "到货检验",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						},
+						{
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+
+		{
+			"path": "pages/inspect/job/inspectDetail",
+			"style": {
+				"navigationBarTitleText": "到货检验详情",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/inspect/job/inspectFullDetail",
+			"style": {
+				"navigationBarTitleText": "全检检验详情",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/putaway/job/putawayJob",
+			"style": {
+				"navigationBarTitleText": "采购上架",
+				"enablePullDownRefresh": false,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+
+		{
+			"path": "pages/putaway/job/putawayDetail",
+			"style": {
+				"navigationBarTitleText": "采购上架详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/putaway/record/putawayRecord",
+			"style": {
+				"navigationBarTitleText": "采购上架记录",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/putaway/request/putawayRequest",
+			"style": {
+				"navigationBarTitleText": "采购上架申请",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/putaway/request/putawayRequestDetail",
+			"style": {
+				"navigationBarTitleText": "采购上架申请详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/putaway/request/putawayRequestCreate",
+			"style": {
+				"navigationBarTitleText": "采购上架申请创建",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/issue/request/issueRequest",
+			"style": {
+				"navigationBarTitleText": "发料申请",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/issue/request/issueRequestDetail",
+			"style": {
+				"navigationBarTitleText": "发料申请详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/issue/request/issueRequestCreate",
+			"style": {
+				"navigationBarTitleText": "创建发料申请",
+				"enablePullDownRefresh": false
+			}
+		},
+
+		{
+			"path": "pages/issue/job/issueJob",
+			"style": {
+				"navigationBarTitleText": "发料任务",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					"autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/issue/job/issueDetail",
+			"style": {
+				"navigationBarTitleText": "发料任务详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/issue/record/issueRecord",
+			"style": {
+				"navigationBarTitleText": "直接发料记录",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					"autoBackButton": "true"
+				}
+			}
+		},
+		{
+			"path": "pages/productionReceipt/job/productionReceiptJob",
+			"style": {
+				"navigationBarTitleText": "生产收料",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					"autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/productionReceipt/job/productionReceiptDetail",
+			"style": {
+				"navigationBarTitleText": "生产收料详细"
+
+			}
+		},
+		{
+			"path": "pages/repleinsh/job/repleinshJob",
+			"style": {
+				"navigationBarTitleText": "补料任务",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					"autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/repleinsh/job/repleinshDetail",
+			"style": {
+				"navigationBarTitleText": "补料详情",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					"autoBackButton": "true"
+				}
+			}
+		},
+		{
+			"path": "pages/repleinsh/record/repleinshRecord",
+			"style": {
+				"navigationBarTitleText": "补料记录",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					"autoBackButton": "true"
+				}
+			}
+		},
+		{
+			"path": "pages/productionReturn/request/returnRequestCreate",
+			"style": {
+				"navigationBarTitleText": "生产合格退料申请",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/productionReturn/request/returnToHoldRequest",
+			"style": {
+				"navigationBarTitleText": "生产退料隔离申请",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/productionReturn/request/requestDetail",
+			"style": {
+				"navigationBarTitleText": "生产退料详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/productionReturn/job/returnJob",
+			"style": {
+				"navigationBarTitleText": "生产退料",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/productionReturn/job/returnDetail",
+			"style": {
+				"navigationBarTitleText": "生产退料详细",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/productionReturn/request/returnToStoreRequest",
+			"style": {
+				"navigationBarTitleText": "生产合格退料申请",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/productionReturn/record/returnToStore",
+			"style": {
+				"navigationBarTitleText": "合格退料记录",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/productionReturn/record/returnToHold",
+			"style": {
+				"navigationBarTitleText": "隔离退料记录",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/deliver/job/deliverJob",
+			"style": {
+				"navigationBarTitleText": "制品发货任务",
+				"enablePullDownRefresh": false,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/deliver/job/deliverDetail",
+			"style": {
+				"navigationBarTitleText": "制品发货详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/deliver/record/deliverRecord",
+			"style": {
+				"navigationBarTitleText": "制品发货记录",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/productReceipt/job/productReceiptJob",
+			"style": {
+				"navigationBarTitleText": "制品收货任务",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/productReceipt/record/productReceiptRecord",
+			"style": {
+				"navigationBarTitleText": "制品收货记录",
+				"enablePullDownRefresh": false
+
+			}
+		},
+		{
+			"path": "pages/productReceipt/job/productReceiptDetail",
+			"style": {
+				"navigationBarTitleText": "制品收货详情",
+				"enablePullDownRefresh": false
+
+			}
+		},
+		{
+			"path": "pages/productPutaway/job/productPutawayJob",
+			"style": {
+				"navigationBarTitleText": "制品上架任务",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/productPutaway/job/productPutawayDetail",
+			"style": {
+				"navigationBarTitleText": "制品上架详情",
+				"enablePullDownRefresh": false
+
+			}
+		},
+		{
+			"path": "pages/productPutaway/record/productPutawayRecord",
+			"style": {
+				"navigationBarTitleText": "制品上架记录",
+				"enablePullDownRefresh": false
+
+			}
+		},
+
+		{
+			"path": "pages/productPutaway/request/putawayRequest",
+			"style": {
+				"navigationBarTitleText": "制品上架申请",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/productPutaway/request/putawayRequestDetail",
+			"style": {
+				"navigationBarTitleText": "制品上架申请详情",
+				"enablePullDownRefresh": false
+
+			}
+		},
+		{
+			"path": "pages/productPutaway/request/putawayRequestCreate",
+			"style": {
+				"navigationBarTitleText": "制品上架申请创建",
+				"enablePullDownRefresh": false
+
+			}
+		},
+
+		{
+			"path": "pages/productDismantle/job/productDismantleJob",
+			"style": {
+				"navigationBarTitleText": "制品拆解",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+
+		{
+			"path": "pages/productDismantle/job/productDismantleDetail",
+			"style": {
+				"navigationBarTitleText": "制品拆解任务详情",
+				"enablePullDownRefresh": false
+
+			}
+		},
+		{
+			"path": "pages/productDismantle/record/productDismantleRecord",
+			"style": {
+				"navigationBarTitleText": "制品拆解记录",
+				"enablePullDownRefresh": false
+
+			}
+		},
+		{
+			"path": "pages/deliver/request/deliverRequest",
+			"style": {
+				"navigationBarTitleText": "成品发货申请",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/deliver/request/deliverRequestDetail",
+			"style": {
+				"navigationBarTitleText": "成品发货申请详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/deliver/request/deliverRequestCreate",
+			"style": {
+				"navigationBarTitleText": "成品发货申请创建",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/customerReturn/job/returnJob",
+			"style": {
+				"navigationBarTitleText": "客户退货任务",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/customerReturn/job/returnDetail",
+			"style": {
+				"navigationBarTitleText": "客户退货详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/customerReturn/record/returnRecord",
+			"style": {
+				"navigationBarTitleText": "客户退货记录",
+				"enablePullDownRefresh": false
+			}
+		},
+
+		{
+			"path": "pages/customerReturn/request/customerReturnRequest",
+			"style": {
+				"navigationBarTitleText": "客户退货申请",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/customerReturn/request/customerReturnRequestDetail",
+			"style": {
+				"navigationBarTitleText": "客户退货申请详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/customerReturn/request/customerReturnRequestCreate",
+			"style": {
+				"navigationBarTitleText": "客户退货申请创建",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/scrap/record/scrapRecord",
+			"style": {
+				"navigationBarTitleText": "报废出库",
+				"enablePullDownRefresh": false
+			}
+		},
+
+		{
+			"path": "pages/scrap/job/scrapJob",
+			"style": {
+				"navigationBarTitleText": "报废出库",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/scrap/job/scrapJobDetail",
+			"style": {
+				"navigationBarTitleText": "报废出库任务详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/scrap/request/scrapRrequest",
+			"style": {
+				"navigationBarTitleText": "报废出库申请",
+				"enablePullDownRefresh": false,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/scrap/request/scrapRequestDetail",
+			"style": {
+				"navigationBarTitleText": "报废出库申请详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/scrap/request/scrapRequestCreate",
+			"style": {
+				"navigationBarTitleText": "报废出库申请创建",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/inventoryMove/job/moveJob",
+			"style": {
+				"navigationBarTitleText": "库存转移",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		}, 
+		{
+			"path": "pages/inventoryMove/job/inventoryMoveDetail",
+			"style": {
+				"navigationBarTitleText": "库存转移详细",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/inventoryMove/record/moveFreeRecord",
+			"style": {
+				"navigationBarTitleText": "库存转移记录",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/inventoryMove/job/okToHoldMoveJob",
+			"style": {
+				"navigationBarTitleText": "合格转隔离",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+		
+						},
+						{
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/inventoryMove/job/holdToOkMoveJob",
+			"style": {
+				"navigationBarTitleText": "隔离转合格",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+		
+						},
+						{
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/inventoryMove/job/holdToScrapMoveJob",
+			"style": {
+				"navigationBarTitleText": "隔离转报废",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+		
+						},
+						{
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/inventoryMove/job/okToScrapMoveJob",
+			"style": {
+				"navigationBarTitleText": "合格转报废",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+		
+						},
+						{
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+			{
+					"path": "pages/inventoryMove/job/scrapToHoldMoveJob",
+					"style": {
+						"navigationBarTitleText": "报废转隔离",
+						"enablePullDownRefresh": true,
+						"titleNView": {
+							// "autoBackButton": "true",
+							"buttons": [
+								// 右边按钮
+								{
+									"float": "right",
+									"fontSize": "58rpx", //按钮上文字的大小
+									"text": "\ue696",
+									"fontSrc": "/static/ali_icon/iconfont.ttf"
+		
+								},
+								{
+									"float": "right",
+									"fontSize": "52rpx", //按钮上文字的大小
+									"text": "\ue6e2",
+									"fontSrc": "/static/ali_icon/iconfont.ttf"
+								}
+							]
+						}
+					}
+				},
+		{
+			"path": "pages/inventoryMove/record/okToHoldRecord",
+			"style": {
+				"navigationBarTitleText": "合格转隔离记录",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/inventoryMove/record/holdToOkRecord",
+			"style": {
+				"navigationBarTitleText": "隔离转合格记录",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/inventoryMove/record/holdToScrapRecord",
+			"style": {
+				"navigationBarTitleText": "隔离转报废记录",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/inventoryMove/record/scrapToHoldRecord",
+			"style": {
+				"navigationBarTitleText": "报废转隔离记录",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/inventoryMove/record/okToScrapRecord",
+			"style": {
+				"navigationBarTitleText": "合格转报废记录",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/transfer/job/receiptJob",
+			"style": {
+				"navigationBarTitleText": "调拨入库任务",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/transfer/job/receiptDetail",
+			"style": {
+				"navigationBarTitleText": "调拨入库详情",
+				"enablePullDownRefresh": false
+
+			}
+		},
+		{
+			"path": "pages/transfer/record/receiptRecord",
+			"style": {
+				"navigationBarTitleText": "调拨入库记录",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/transfer/job/issueJob",
+			"style": {
+				"navigationBarTitleText": "调拨出库任务",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					"buttons": [{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+
+		{
+			"path": "pages/transfer/record/deliverRecord",
+			"style": {
+				"navigationBarTitleText": "调拨出库记录",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/transfer/job/issueDetail",
+			"style": {
+				"navigationBarTitleText": "调拨出库详细",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/count/job/countJob",
+			"style": {
+				"navigationBarTitleText": "盘点任务",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/count/job/countDetail",
+			"style": {
+				"navigationBarTitleText": "盘点详细",
+				"enablePullDownRefresh": false
+
+			}
+		},
+		{
+			"path": "pages/count/record/countRecord",
+			"style": {
+				"navigationBarTitleText": "按库位盘点",
+				"enablePullDownRefresh": false
+
+			}
+		},
+		{
+			"path": "pages/unPlanned/job/receiptJob",
+			"style": {
+				"navigationBarTitleText": "计划外入库任务",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+
+		{
+			"path": "pages/unPlanned/job/receiptJobDetail",
+			"style": {
+				"navigationBarTitleText": "计划外入库详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/unPlanned/request/receiptRequest",
+			"style": {
+				"navigationBarTitleText": "计划外入库申请",
+				"enablePullDownRefresh": false,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/unPlanned/request/receiptRequestDetail",
+			"style": {
+				"navigationBarTitleText": "计划外入库申请详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/unPlanned/request/receiptRequestCreate",
+			"style": {
+				"navigationBarTitleText": "计划外入库申请创建",
+				"enablePullDownRefresh": false
+			}
+		},
+
+		{
+			"path": "pages/unPlanned/job/issueJob",
+			"style": {
+				"navigationBarTitleText": "计划外出库任务",
+				"enablePullDownRefresh": false,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/unPlanned/job/issueJobDetail",
+			"style": {
+				"navigationBarTitleText": "计划外出库详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/unPlanned/request/issueRequest",
+			"style": {
+				"navigationBarTitleText": "计划外出库申请",
+				"enablePullDownRefresh": false,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						},
+						{
+
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/unPlanned/request/issueRequestDetail",
+			"style": {
+				"navigationBarTitleText": "计划外出库申请详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/unPlanned/request/issueRequestCreate",
+			"style": {
+				"navigationBarTitleText": "计划外出库申请创建",
+				"enablePullDownRefresh": false
+			}
+		},
+
+		{
+			"path": "pages/unPlanned/record/receiptRecord",
+			"style": {
+				"navigationBarTitleText": "计划外入库记录",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/unPlanned/record/issueRecord",
+			"style": {
+				"navigationBarTitleText": "计划外出库记录",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/container/record/containerBindRecord",
+			"style": {
+				"navigationBarTitleText": "器具绑定",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/container/record/containerUnBindRecord",
+			"style": {
+				"navigationBarTitleText": "器具解绑",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/package/record/splitPackageRecord",
+			"style": {
+				"navigationBarTitleText": "拆包",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/package/record/mergePackageRecord",
+			"style": {
+				"navigationBarTitleText": "合包",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/package/record/overPackageRecord",
+			"style": {
+				"navigationBarTitleText": "翻包",
+				"enablePullDownRefresh": false
+			}
+		}
+
+
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "white",
+		"navigationBarTitleText": "WMS仓库管理系统-移动端",
+		"navigationBarBackgroundColor": "#3C9CFF",
+		"h5": {
+			"maxWidth": 1190,
+			"navigationBarTextStyle": "white",
+			"navigationBarBackgroundColor": "#3C9CFF !important"
+		},
+		//增加返回首页
+		// "titleNView": {
+		// 	"autoBackButton": "true",
+		// 	"buttons": [{
+		// 		"float": "right",
+		// 		"text": "\ue696",
+		// 		"fontSrc": "/static/ali_icon/iconfont.ttf",
+		// 		"fontSize": "58rpx"
+		// 	}]
+		// },
+		"softinputMode": "adjustPan" //adjustResize
+	},
+	"tabBar": {
+		"color": "#000000",
+		"selectedColor": "#2678f2",
+		"borderStyle": "black",
+		"backgroundColor": "",
+		"list": [{
+
+				"pagePath": "pages/index/index",
+				"iconPath": "./static/bar/home.png",
+				"selectedIconPath": "./static/bar/home_p.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/message/index",
+				"iconPath": "./static/bar/message.png",
+				"selectedIconPath": "./static/bar/message_p.png",
+				"text": "消息"
+			}, {
+				"pagePath": "pages/setter/index",
+				"iconPath": "./static/bar/setting.png",
+				"selectedIconPath": "./static/bar/setting_p.png",
+				"text": "设置"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/pages/common/textview/index.vue b/pages/common/textview/index.vue
new file mode 100644
index 0000000..e9b05fb
--- /dev/null
+++ b/pages/common/textview/index.vue
@@ -0,0 +1,43 @@
+<template>
+  <view>
+    <uni-card class="view-title" :title="title">
+      <text class="uni-body view-content">{{ content }}</text>
+    </uni-card>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        title: '',
+        content: ''
+      }
+    },
+    onLoad(options) {
+      this.title = options.title
+      this.content = options.content
+      uni.setNavigationBarTitle({
+        title: options.title
+      })
+    }
+  }
+</script>
+
+<style scoped>
+  page {
+    background-color: #ffffff;
+  }
+
+  .view-title {
+    font-weight: bold;
+  }
+
+  .view-content {
+    font-size: 26rpx;
+    padding: 12px 5px 0;
+    color: #333;
+    line-height: 24px;
+    font-weight: normal;
+  }
+</style>
diff --git a/pages/common/webview/index.vue b/pages/common/webview/index.vue
new file mode 100644
index 0000000..8388c76
--- /dev/null
+++ b/pages/common/webview/index.vue
@@ -0,0 +1,34 @@
+<template>
+  <view v-if="params.url">
+    <web-view :webview-styles="webviewStyles" :src="`${params.url}`"></web-view>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        params: {},
+        webviewStyles: {
+          progress: {
+            color: "#FF3333"
+          }
+        }
+      }
+    },
+    props: {
+      src: {
+        type: [String],
+        default: null
+      }
+    },
+    onLoad(event) {
+      this.params = event
+      if (event.title) {
+        uni.setNavigationBarTitle({
+          title: event.title
+        })
+      }
+    }
+  }
+</script>
diff --git a/pages/config/config.vue b/pages/config/config.vue
new file mode 100644
index 0000000..4365512
--- /dev/null
+++ b/pages/config/config.vue
@@ -0,0 +1,120 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-main" style="background-color: #fff; height: 100%;">
+
+			<pullDown label="项目名称" v-model="name" :options="arrayUnique(options,'name')" description='column' />
+
+			<pullDown label="服务器地址" v-model="value" :options="unique(options)" :itemTextCount="2" :isAutoHeight='true'
+				description='column' style="font-size: 35rpx;padding: 30rpx 0 0 0;" />
+
+		</view>
+		<!-- 页面底部 -->
+		<view class="page-footer">
+			<button type="primary" @click="saveClick">保存</button>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				name: '',
+				value: '',
+
+				options: [{
+
+						name: '汽车镜备件',
+						desc: '汽车镜备件公司测试库',
+						value: 'http://192.168.0.178:12080/admin-api',
+					},
+					{
+
+						name: '汽车镜备件',
+						desc: '汽车镜备件现场测试库',
+						value: 'http://192.168.0.178:12080/admin-api',
+					},
+					{
+
+						name: '汽车镜备件',
+						desc: '汽车镜备件现场正式库',
+						value: 'http://192.168.0.178:12080/admin-api',
+					},
+					{
+
+						name: '富维汽车镜',
+						desc: '汽车镜备件现场正式库',
+						value: 'http://192.168.0.178:12080/admin-api',
+					},
+				],
+			};
+		},
+
+		onLoad(option) {
+			this.value =""
+			// this.value = getApp().globalData.request_url;
+		},
+
+
+
+		methods: {
+			saveClick() {
+				// getApp().globalData.request_url = this.value;
+				// console.log(getApp().globalData.request_url);
+				// 调用uni.navigateBack()函数来返回上一页
+				uni.navigateBack({
+					delta: 1 // 表示返回到上一页，若需要返回多级页面则设置delta值为对应的级数
+				})
+			},
+
+			unique(arr) {
+				let that = this;
+				if (this.name == '') {
+					return this.options
+				} else {
+					return arr.filter(item => item.name === this.name);
+				}
+
+			},
+
+			arrayUnique(arr, type) {
+				return arr ? [
+					...new Set(
+						arr.map((item) => {
+							return item[type]
+						})
+					)
+				] : []
+			}
+
+		}
+	}
+</script>
+
+<style>
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-footer {
+		color: #fff;
+		line-height: 100rpx;
+		/* 不放大不缩小固定100rpx */
+		flex: 0 0 100rpx;
+		background-color: #00AAFF;
+	}
+
+	.container {
+		background-color: #f5f7fa;
+		/* 这里只是作为样式展示 */
+	}
+</style>
diff --git a/pages/container/coms/comContainerBindCard.vue b/pages/container/coms/comContainerBindCard.vue
new file mode 100644
index 0000000..234aa32
--- /dev/null
+++ b/pages/container/coms/comContainerBindCard.vue
@@ -0,0 +1,180 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
+							<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"
+								:isShowBalance="true"></item-qty>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<balance :dataContent="item" :isShowStdPack="false" :isShowPack="true" :isShowStatus="false"
+						:isShowBatch="true" :toInventoryStatus="item.toInventoryStatus"
+						:isShowLocation="isShowLocation">
+					</balance>
+				</view>
+
+			<!-- 	<view class=""   v-for="(item,index) in dataContent.bindList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item,index)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<balance :dataContent="item" :isShowStdPack="false" :isShowPack="true" :isShowStatus="false"
+								:isShowBatch="true" :toInventoryStatus="item.toInventoryStatus"
+								:isShowLocation="isShowLocation">
+							</balance>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</view> -->
+			</uni-collapse-item>
+		</uni-collapse>
+		<recommendQtyEdit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam"
+			:handleQty="editItem.qty" @confirm="confirm">
+		</recommendQtyEdit>
+		<job-detail-popup ref="receiptHint" :dataContent="showItem"></job-detail-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getClearOption
+	} from '@/common/array.js';
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			jobDetailPopup,
+			balance,
+			recommendQtyEdit,
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			fromInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			toInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: false
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: false
+			},
+			isShowPatch: {
+				type: Boolean,
+				default: true
+			}
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {},
+				detailOptions: [],
+				scanOptions: [],
+				removeOptions: [],
+				dataList: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+			this.removeOptions = getClearOption();
+		},
+
+		methods: {
+			removeData(e, dataContent) {
+				if (e.content.text == "清空") {
+					this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
+						res => {
+							if (res) {
+								this.$emit('removeItem')
+								// this.$emit('removeItem', this.dataContent)
+							}
+						});
+				}
+			},
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+
+			edit(item) {
+				this.editItem = item;
+				this.$refs.receiptEdit.openEditPopup();
+			},
+
+			detail(item) {
+
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(item, index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false;
+							// this.dataContent.subList.splice(index, 1)
+							// this.$emit('removePack')
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/container/coms/comPalletRecord.vue b/pages/container/coms/comPalletRecord.vue
new file mode 100644
index 0000000..57e10b4
--- /dev/null
+++ b/pages/container/coms/comPalletRecord.vue
@@ -0,0 +1,172 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
+							<item-qty :dataContent="dataContent" 
+								:isShowBalance="true"></item-qty>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item,index)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<balance :dataContent="item" :isShowStdPack="false" :isShowPack="true" :isShowStatus="false" :isShowBatch="true"
+								:toInventoryStatus="item.toInventoryStatus" :isShowFromLocation="isShowLocation" >
+							</balance>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<!-- <u-line color="#D8D8D8"></u-line> -->
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<recommendQtyEdit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam"
+			:handleQty="editItem.qty" @confirm="confirm">
+		</recommendQtyEdit>
+		<job-detail-popup ref="receiptHint" :dataContent="showItem"></job-detail-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+
+	import {
+		getDetailOption,
+		getEditOption,
+		getClearOption
+	} from '@/common/array.js';
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			jobDetailPopup,
+			balance,
+			recommendQtyEdit,
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			fromInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			toInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: false
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: false
+			},
+			isShowPatch: {
+				type: Boolean,
+				default: true
+			}
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {},
+				detailOptions: [],
+				scanOptions: [],
+				removeOptions: [],
+				dataList: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getEditOption();
+			this.removeOptions = getClearOption();
+		},
+
+		methods: {
+			removeData(e, dataContent) {
+				if (e.content.text == "清空") {
+					this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
+						res => {
+							if (res) {
+								this.$emit('removeItem')
+								// this.$emit('removeItem', this.dataContent)
+							}
+						});
+				}
+			},
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+
+			edit(item) {
+				this.editItem = item;
+				this.$refs.receiptEdit.openEditPopup();
+			},
+
+			detail(item) {
+				
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(item, index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned=false;
+							// this.dataContent.subList.splice(index, 1)
+							// this.$emit('removePack')
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/container/record/containerBindRecord.vue b/pages/container/record/containerBindRecord.vue
new file mode 100644
index 0000000..eb52e26
--- /dev/null
+++ b/pages/container/record/containerBindRecord.vue
@@ -0,0 +1,422 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showContainerPopup' v-if="containerCode==''"></com-blank-view>
+		</view>
+
+		<view class="page-wraper" v-if="containerCode!=''">
+			<view class="" style="margin-left: 20rpx;">
+				<targetContainer ref="targetContainer" title="托盘" :containerCode="containerCode" :isShowEdit="false"
+					@getContainer="getContainer"></targetContainer>
+			</view>
+			<u-line color="#D8D8D8"></u-line>
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<!-- 	{{item.contentNumber}} -->
+							<comPalletRecord :dataContent="item" :index="index" :isShowPatch="false"
+								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							</comPalletRecord>
+
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<win-scan-container ref="scanContainer" title="器具" @getContainer='getContainer'></win-scan-container>
+		<win-scan-location ref="scanLocationPopup" title="来源库位" @getLocation="getFromLocation"></win-scan-location>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false">
+		</win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		containerBindRecordSubmit,
+		getContainerDetailByNumber
+	} from '@/api/request2.js';
+	import {
+		goHome
+	} from '@/common/basic.js';
+
+	import {
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import {
+		getScanCount
+	} from '@/common/detail.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import targetContainer from "@/mycomponents/container/targetContainer.vue"
+	import winScanContainer from "@/mycomponents/scan/winScanContainer.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import comPalletRecord from '@/pages/container/coms/comPalletRecord.vue'
+	import winScanPackAndLocation from '@/mycomponents/scan/winScanPackAndLocation.vue'
+	import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			comBlankView,
+			targetContainer,
+			recordComDetailCard,
+			winScanContainer,
+			comPalletRecord,
+			winScanPackAndLocation,
+			winScanLocation
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				toLocationInfo: {},
+				fromLocationInfo: {},
+				toLocationInfo: {},
+				containerCode: "",
+				containerInfo: {},
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				allowModifyLocation: false,
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {}
+			};
+		},
+		onLoad(option) {
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {
+			getBusinessType('ContainerBind', res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showContainerPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+		methods: {
+			getContainer(containerInfo) {
+				this.containerInfo = containerInfo;
+				this.containerCode = containerInfo.number;
+				getContainerDetailByNumber(this.containerCode).then(res => {
+					if (res.data != null && res.data.subList.length > 0) {
+						this.detailSource = this.getDataSource(res.data.subList)
+					}
+					this.showScanLocation();
+				}).catch(error => {
+					this.showErrorMessage(error.message)
+				})
+			},
+
+			showScanLocation() {
+				this.$nextTick(r => {
+					this.$refs.scanLocationPopup.openScanPopup();
+				})
+			},
+
+			getFromLocation(location, code) {
+				this.fromLocationInfo = location;
+				this.openScanPopup();
+			},
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+
+					var item = this.detailSource.find(r => r.itemCode == itemCode);
+					if (item == undefined) {
+						if (this.detailSource.length == 0) {
+							item = this.createItemInfo(result.label);
+							let itemDetail = result.balance;
+							itemDetail.scaned = true;
+							item.subList.push(itemDetail);
+							this.detailSource.push(item);
+						} else {
+							this.showMessage("绑定物料【" + itemCode + "】与现有物料不一致,不可以绑定");
+						}
+					} else {
+						var itemDetail = item.subList.find(r => r.packingNumber == packingNumber && r.batch == batch);
+						if (itemDetail == undefined) {
+							itemDetail = result.balance;
+							itemDetail.scaned = true;
+							item.subList.push(itemDetail);
+						} else {
+							if (itemDetail.scaned) {
+								this.showMessage("箱码【" + packingNumber + "】,批次【" + batch + "】已经扫描")
+							} else {
+								this.showMessage("箱码【" + packingNumber + "】,批次【" + batch + "】已经绑定到器具")
+							}
+						}
+					}
+
+				} catch (e) {
+					this.showErrorMessage(e.message)
+				}
+			},
+
+			createRecordInfo(detail, label) {
+				var record = {}
+				detail.scaned = true;
+				// let record = JSON.parse(JSON.stringify(detail));
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				Object.assign(record, detail)
+				record.qty = Number(label.qty);
+				return record;
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource);
+				this.scanPopupGetFocus();
+				this.$forceUpdate();
+			},
+
+			getDataSource(subList) {
+				let items = [];
+				subList.forEach(detail => {
+					var item = items.find(r =>
+						r.itemCode == detail.itemCode)
+					if (item == undefined) {
+						item = this.createItemInfo(detail);
+						let newDetail = this.createDetailInfo(detail); //
+						item.subList.push(newDetail);
+						items.push(item)
+					} else {
+						item.qty = calc.add(item.qty,detail.qty)
+						let newDetail = this.createDetailInfo(detail); //
+						item.subList.push(newDetail);
+					}
+				})
+				return items;
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			createItemInfo(res) {
+				let item = {
+					itemCode: res.itemCode,
+					itemName: res.itemName,
+					stdPackQty: res.stdPackQty,
+					stdPackUnit: res.stdPackUnit,
+					qty: res.qty,
+					handleQty: 0,
+					uom: res.uom,
+					subList: []
+				}
+				return item;
+			},
+
+			createDetailInfo(data) {
+				data.scaned = false;
+				data.packingNumber = data.contentNumber
+				data.qty = Number(data.qty)
+				data.handleQty = 0;
+				let detail = data;
+				return detail;
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationInfo.code != undefined) {
+					this.$refs.scanPopup.openScanPopupForType(this.fromLocationInfo.code, this.businessType);
+				} else {
+					this.showScanLocation();
+				}
+			},
+
+			showContainerPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanContainer.openScanPopup();
+				})
+
+			},
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.packGetFocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.packLoseFocus();
+				}
+			},
+
+			commit() {
+				uni.showLoading({
+					title: '提交中...',
+					mask: true
+				})
+
+				this.scanCount = getScanCount(this.detailSource[0].subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描要解绑的箱码")
+					return;
+				}
+
+				let params = this.getParams();
+				console.log("提交" + JSON.stringify(params))
+
+				containerBindRecordSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成器具绑定记录<br>" + res.data)
+						this.clear();
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			getParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				let params = {
+					number: this.containerCode,
+					status: 'USED',
+					toLocationCode: this.fromLocationInfo.code,
+					containerType: this.containerInfo.type,
+					creator: creator
+				};
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.containerContentType = 'PACKAGE';
+							detail.contentNumber = detail.packingNumber;
+							detail.package = null;
+							subList.push(detail)
+						}
+					})
+				})
+				params.subList = subList
+				return params;
+			},
+
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.containerCode = '';
+
+				})
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/container/record/containerUnBindRecord.vue b/pages/container/record/containerUnBindRecord.vue
new file mode 100644
index 0000000..435abfc
--- /dev/null
+++ b/pages/container/record/containerUnBindRecord.vue
@@ -0,0 +1,384 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showContainerPopup' v-if="containerCode==''"></com-blank-view>
+		</view>
+
+		<view class="page-wraper" v-if="containerCode!=''">
+			<view class="" style="margin-left: 20rpx;">
+				<targetContainer ref="targetContainer" title="托盘" :containerCode="containerCode" :isShowEdit="false"
+					@getContainer="getContainer"></targetContainer>
+			</view>
+			<u-line color="#D8D8D8"></u-line>
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<!-- 	{{item.contentNumber}} -->
+							<comPalletRecord :dataContent="item" :index="index"
+								:isShowPatch="false" @removeItem="removeItem(index,item)" @updateData="updateData"
+								@removePack="removePack">
+							</comPalletRecord>
+
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult'></win-scan-pack>
+		<comMessage ref="comMessage"></comMessage>
+		<winScanContainer ref="scanContainer" title="托盘" @getContainer='getContainer'></winScanContainer>
+	</view>
+</template>
+
+<script>
+	import {
+		containerUnBindRecordSubmit,
+		getContainerDetailByNumber
+	} from '@/api/request2.js';
+	import {
+		goHome
+	} from '@/common/basic.js';
+	
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import {
+		getScanCount
+	} from '@/common/detail.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import targetContainer from "@/mycomponents/container/targetContainer.vue"
+	import winScanContainer from "@/mycomponents/scan/winScanContainer.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import comPalletRecord from '@/pages/container/coms/comPalletRecord.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			comBlankView,
+			targetContainer,
+			recordComDetailCard,
+			winScanContainer,
+			comPalletRecord
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				detailSource: [], //绑定在页面上的数据源
+				businessTypeInfo: {},
+				fromLocationInfo: {},
+				containerCode: "", 
+			};
+		},
+		onLoad(option) {
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {
+			this.showContainerPopup();
+		},
+		methods: {
+			getScanResult(result) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch);
+						if (itemDetail == undefined) {
+							this.showMessage("箱码【" + packingNumber + "】,批次【" + batch + "】不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showMessage("箱码【" + packingNumber + "】,批次【" + batch + "】已经扫描")
+							} else {
+								itemDetail.scaned = true;
+								itemDetail.record = this.createRecordInfo(itemDetail, result.label);
+								// this.calcHandleQty();
+							}
+						}
+					}
+
+				} catch (e) {
+					this.showErrorMessage(e.message)
+				}
+			},
+
+			createRecordInfo(detail, label) {
+				var record = {}
+				detail.scaned = true;
+				// let record = JSON.parse(JSON.stringify(detail));
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				Object.assign(record, detail)
+				record.qty = Number(label.qty);
+				return record;
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource);
+				this.scanPopupGetFocus();
+				this.$forceUpdate();
+			},
+
+			getDataSource(subList) {
+				let items = [];
+				subList.forEach(detail => {
+					var item = items.find(r =>
+						r.itemCode == detail.itemCode)
+					if (item == undefined) {
+						item = this.createItemInfo(detail);
+						let newDetail = this.createDetailInfo(detail); //
+						item.subList.push(newDetail);
+						items.push(item)
+					} else {
+						item.qty = calc.add(item.qty,detail.qty)
+						let newDetail = this.createDetailInfo(detail); //
+						item.subList.push(newDetail);
+					}
+				})
+				return items;
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			createItemInfo(res) {
+				let item = {
+					itemCode: res.itemCode,
+					itemName: res.itemName,
+					stdPackQty: res.stdPackQty,
+					stdPackUnit: res.stdPackUnit,
+					qty: res.qty,
+					handleQty: 0,
+					uom: res.uom,
+					subList: []
+				}
+				return item;
+			},
+
+			createDetailInfo(data) {
+				data.scaned = false;
+				data.packingNumber = data.contentNumber
+				data.qty = Number(data.qty)
+				data.handleQty =0;
+				let detail = data;
+				return detail;
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.containerCode == "") {
+					this.showContainerPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopup();
+			},
+			showContainerPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanContainer.openScanPopup();
+				})
+
+			},
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+
+			commit() {
+				uni.showLoading({
+					title: '提交中...',
+					mask: true
+				})
+				
+				this.scanCount = getScanCount(this.detailSource[0].subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描要解绑的箱码")
+					return;
+				}
+
+				let params = this.getParams();
+				console.log("提交" + JSON.stringify(params))
+
+				containerUnBindRecordSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成器具绑定记录<br>" + res.data)
+						this.clear();
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			getParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				let params = {
+					number: this.containerCode,
+					type: 'bind',
+					status: 'USED',
+					creator: creator
+				};
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.containerContentType = 'PACKAGE';
+							detail.contentNumber = detail.packingNumber;
+
+							detail.itemCode = detail.itemCode;
+							detail.batch = detail.batch;
+							detail.inventoryStatus = detail.inventoryStatus;
+							detail.qty =detail.handleQty;
+							detail.package = null;
+							subList.push(detail)
+						}
+					})
+				})
+				params.subList = subList
+				return params;
+			},
+
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			getContainer(containerInfo) {
+				this.containerCode = containerInfo.number;
+				getContainerDetailByNumber(this.containerCode).then(res => {
+					if (res.data != null && res.data.subList.length > 0) {
+						this.detailSource = this.getDataSource(res.data.subList)
+					}
+				}).catch(error => {
+					this.showErrorMessage(error.message)
+				})
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.containerCode = '';
+
+				})
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+			clear()
+			{
+				
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+ 
+</style>
diff --git a/pages/count/coms/comCountDetailCard.vue b/pages/count/coms/comCountDetailCard.vue
new file mode 100644
index 0000000..8722bde
--- /dev/null
+++ b/pages/count/coms/comCountDetailCard.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
+							<item-qty v-if="settingParam.isOpenCount=='TRUE'" :dataContent="dataContent"
+								:handleQty="dataContent.handleQty" :isShowBalanceQty="false">
+							</item-qty>
+							<item-qty v-else :dataContent="dataContent" :handleQty="dataContent.handleQty"
+								:isShowBalanceQty="true" :showRecommendQty="false" :showStdPack="true">
+							</item-qty>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</template>
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend-count :detail="item" :isShowFromLocation="false" style='margin:1px 0px;'
+								:isShowRecommendQty="settingParam.isOpenCount=='TRUE'">
+							</recommend-count>
+							<u-line />
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import item from '@/mycomponents/item/item.vue'
+	import recommendCount from '@/mycomponents/recommend/recommendCount.vue'
+	import detailInfoPopup from '@/pages/count/coms/detailInfoPopup.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getClearOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			item,
+			itemQty,
+			recommendCount,
+			detailInfoPopup,
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				detailOptions: [],
+				scanOptions: [],
+				removeOptions: [],
+			}
+		},
+
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+			this.removeOptions = getClearOption();
+		},
+
+		methods: {
+			removeData(e, dataContent) {
+				if (e.content.text == "清空") {
+					this.$refs.comMessage.showQuestionMessage("确定清空该物料下面扫描的信息吗?",
+						res => {
+							if (res) {
+								dataContent.handleQty = 0;
+								dataContent.subList.forEach(res=>{
+									res.scaned = false;
+									res.handleQty= 0
+								})
+								
+								this.$emit('clear')
+								// this.$emit('removeItem', this.dataContent)
+							}
+						});
+				}
+			},
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+
+			edit(detail) {
+				this.$emit("editItem", detail)
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.detailInfoPopup.openPopup(item);
+			},
+			remove(item, index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							// this.dataContent.subList.splice(index, 1)
+							item.scaned = false;
+							item.handleQty = 0;
+							this.$emit('removePack')
+						}
+					});
+			},
+			confirm(qty) {
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/count/coms/comCountJobCard.vue b/pages/count/coms/comCountJobCard.vue
new file mode 100644
index 0000000..c2908fe
--- /dev/null
+++ b/pages/count/coms/comCountJobCard.vue
@@ -0,0 +1,63 @@
+<template>
+ 	<job-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				<view class="">
+ 					申请单号 : {{dataContent.requestNumber}}
+ 				</view>
+ 			</view>
+
+ 			<view class="task_text">
+ 				<view class="">
+ 					盘点阶段 : {{getCountStageName(dataContent.stage)}}
+ 				</view>
+ 			</view>
+
+ 			<view class="task_text">
+ 				<view class="">
+ 					盘点库位 : {{dataContent.locationCode}}
+ 				</view>
+ 			</view>
+			<view class="task_text">
+				<view class="">
+					盘点策略 : {{isOpenCount(dataContent.isOpenCount)}}
+				</view>
+			</view>
+ 		</view>
+ 	</job-com-main-card>
+ </template>
+
+ <script>
+	 import {
+	 	getCountStageName
+	 } from '@/common/directory.js';
+ 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			jobComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+			getCountStageName(value){
+				return getCountStageName(value)
+			},
+			isOpenCount(value){
+				return value=="TRUE"?"明盘":"盲盘"
+			}
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/count/coms/detailInfoPopup.vue b/pages/count/coms/detailInfoPopup.vue
new file mode 100644
index 0000000..b80e902
--- /dev/null
+++ b/pages/count/coms/detailInfoPopup.vue
@@ -0,0 +1,53 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">盘点明细号 : </text>
+							<text class="text_wrap">{{dataContent.CountDetailNumber}} </text>
+						</view>
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/count/coms/jobInfoPopup.vue b/pages/count/coms/jobInfoPopup.vue
new file mode 100644
index 0000000..08244cd
--- /dev/null
+++ b/pages/count/coms/jobInfoPopup.vue
@@ -0,0 +1,76 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">计划单号 : </text>
+							<text class="text_wrap">{{dataContent.planNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">阶段 : </text>
+							<text class="text_wrap">{{getCountStageName(dataContent.stage)}} </text>
+						</view>
+
+						<view class="item">
+							<text class="item_title">库位 : </text>
+							<text class="text_wrap">{{dataContent.locationCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">盘点策略 : </text>
+							<text class="text_wrap">{{isOpenCount(dataContent.isOpenCount)}}</text>
+						</view>
+
+					</view>
+				</view>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		getCountStageName
+	} from '@/common/directory.js';
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			getCountStageName(value) {
+				return getCountStageName(value)
+			},
+			isOpenCount(value) {
+				return value == "TRUE" ? "明盘" : "盲盘"
+			}
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/count/coms/jobListPopup.vue b/pages/count/coms/jobListPopup.vue
new file mode 100644
index 0000000..fe98c8c
--- /dev/null
+++ b/pages/count/coms/jobListPopup.vue
@@ -0,0 +1,47 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-count-job-card :dataContent="item" @click='selectItem(item)'></com-count-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	import comCountJobCard from '@/pages/count/coms/comCountJobCard.vue'
+	
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comCountJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/count/job/countDetail.vue b/pages/count/job/countDetail.vue
new file mode 100644
index 0000000..cff4f50
--- /dev/null
+++ b/pages/count/job/countDetail.vue
@@ -0,0 +1,843 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="cen_card" style="padding-top: 10rpx;padding-bottom: 10rpx;">
+				<view class="cell_box uni-flex uni-row">
+					<view class="cell_info">
+						<view class="text_lightblue">阶段</view>
+						<view>{{getCountStageName(jobContent.stage)}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">策略</view>
+						<view>{{ isOpenCount(jobContent.isOpenCount) }}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">库位</view>
+						<view>{{fromLocationCode}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-line color="#D8D8D8" style="margin-bottom: 15rpx;"></u-line>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<com-count-detail-card :ref="'countDetail_'+index" :dataContent="item" :index="index"
+							@editItem="editItem" :settingParam="jobContent" @remove="updateData"
+							@updateData="updateData">
+						</com-count-detail-card>
+					</view>
+					<u-line />
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack-and-location ref="scanPopup" :noShowBalanceMessage="true" @getCountScanResult='getScanResult'>
+		</win-scan-pack-and-location>
+		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
+			:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">
+		</count-qty-edit>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getCountJobDetail,
+		takeCountJob,
+		cancleTakeCountJob,
+		countJobSubmit
+	} from '@/api/request2.js';
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		goHome,
+		navigateBack,
+		getPackingNumberAndBatch
+	} from '@/common/basic.js';
+	import {
+		getCountStageName
+	} from '@/common/directory.js';
+
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comCountDetailCard from '@/pages/count/coms/comCountDetailCard.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import countQtyEdit from '@/mycomponents/qty/CountQtyEdit.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+
+	export default {
+		name: 'receipt_detail',
+		components: {
+			winScanButton,
+			winScanPack,
+			comCountDetailCard,
+			requiredLocation,
+			winScanPackAndLocation,
+			countQtyEdit,
+			jobTop,
+			balanceSelect
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				fromLocationCode: '',
+				isShowPackingCode: true,
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				balance: {}, //库存余额
+				editInventoryStatus: false,
+				package: {}, //包装
+				label: {}, //标签
+				currentEditItem: {},
+				jobStatus: ""
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from === 'backbutton') {
+				if (this.jobStatus == "2") {
+					//取消承接任务	
+					cancleTakeCountJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+				return true;
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeCountJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getCountJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						that.jobContent = res.data;
+						that.jobStatus = res.data.status;
+						that.fromLocationCode = that.jobContent.locationCode;
+						that.subList = res.data.subList;
+						that.detailSource = that.getDataSource(that.subList)
+						this.calcHandleQty();
+					}
+
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			getDataSource(subList) {
+				let items = [];
+				subList.forEach(detail => {
+					var item = items.find(r =>
+						r.itemCode == detail.itemCode)
+					if (item == undefined) {
+						item = this.createItemInfo(detail);
+						let newDetail = this.createDetailInfo(detail); //
+						item.subList.push(newDetail);
+						items.push(item)
+					} else {
+						console.log("数量", item.qty)
+						item.qty = calc.add(item.qty, detail.qty)
+						let newDetail = this.createDetailInfo(detail); //
+						item.subList.push(newDetail);
+					}
+				})
+				return items;
+			},
+
+			createItemInfo(res) {
+				let item = {
+					itemCode: res.itemCode,
+					itemName: res.itemName,
+					stdPackQty: res.stdPackQty,
+					stdPackUnit: res.stdPackUnit,
+					qty: Number(res.qty),
+					handleQty: 0,
+					uom: res.uom,
+					subList: []
+				}
+				return item;
+			},
+
+			createDetailInfo(data) {
+				data.scaned = false;
+				let detail = data;
+				detail.balanceQty = 0
+				detail.handleQty = 0;
+				detail.inventoryStatus = detail.inventoryStatus
+				detail.fromLocationCode = this.fromLocationCode
+				return detail;
+			},
+
+			calcScanCount(closeScan) {
+				let items = this.subList.filter(r => {
+					if (r.scaned) {
+						return r;
+					}
+				})
+				this.scanCount = items != null ? items.length : 0;
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				}
+			},
+
+			calcHandleQty() {
+				for (let item of this.detailSource) {
+					item.handleQty = new Decimal(0).toNumber();
+					item.qty = new Decimal(0).toNumber();
+					for (let detail of item.subList) {
+						if (detail!= undefined) {
+						if (detail.scaned) {
+							item.handleQty = calc.add(item.handleQty, detail.handleQty);
+						}
+						item.qty = calc.add(item.qty, detail.qty);
+					}
+				}
+			}
+			this.$forceUpdate();
+		},
+
+		updateData() {
+			this.calcHandleQty();
+		},
+
+		openScanPopup() {
+			let fromlocationCode = '';
+			let fromlocationList = [];
+			for (var i = 0; i < this.detailSource.length; i++) {
+				let item = this.detailSource[i];
+				item.subList.forEach(l => {
+					//重复的库位不往里面插入
+					var location = fromlocationList.find(res => res == l.fromLocationCode)
+					if (location == undefined) {
+						fromlocationList.push(l.fromLocationCode);
+					}
+					//来源库位赋默认值
+					if (fromlocationCode == '') {
+						if (!l.scaned) {
+							fromlocationCode = l.fromLocationCode;
+						}
+					}
+				})
+			}
+			this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+		},
+
+		closeScanPopup() {
+			if (this.$refs.scanPopup != undefined) {
+				this.$refs.scanPopup.closeScanPopup();
+			}
+		},
+
+		scanPopupGetFocus() {
+			if (this.$refs.scanPopup != undefined) {
+				this.$refs.scanPopup.packGetFocus();
+			}
+		},
+
+		scanPopupLoseFocus() {
+			if (this.$refs.scanPopup != undefined) {
+				this.$refs.scanPopup.packLoseFocus();
+			}
+		},
+
+		//明盘
+		getScanResult(result) {
+			if (this.jobContent.isOpenCount) {
+				this.getOpenCountResult(result);
+			} else {
+				this.getUnOpenCountResult(result);
+			}
+		},
+
+		getOpenCountResult(result) {
+			try {
+				let that = this;
+				that.package = result.package;
+				that.label = result.label;
+				var item = this.detailSource.find(r => r.itemCode == that.package.itemCode);
+				if (item == undefined) {
+					that.scanByBalance(result);
+				} else {
+					// let subItem = item.subList.find(item => {
+					// 	if (item.packingNumber == that.label.packingNumber &&
+					// 		item.batch == that.label.batch && item.scaned == true) {
+					// 		return item;
+					// 	}
+					// })
+					let subItems = item.subList.filter(item => {
+						if (item.packingNumber == that.label.packingNumber &&
+							item.batch == that.label.batch) {
+							return item;
+						}
+					})
+					//有多条：同箱码同批次，但是状态不同
+					if (subItems.length > 1) {
+						let subItem = subItems.find(r => r.scaned == false)
+						if (subItem == undefined) {
+							subItem = subItems[0];
+							that.editCountResult(item, subItem);
+						} else {
+							that.scanByBalance(result);
+						}
+					} else if (subItems.length == 1) {
+						let subItem = subItems[0];
+						if (subItem.scaned) {
+							that.editCountResult(item, subItem);
+							// this.$refs.comMessage.showQuestionMessage("箱码【" + that.label.packingNumber +
+							// 	"】已经完成盘点,是否要编辑盘点结果?",
+							// 	res => {
+							// 		if (res) {
+							// 			this.currentEditItem = subItem;
+							// 			this.$refs.countQtyEdit.openEditPopup(subItem,
+							// 				item.subList);
+							// 			// this.$refs.countQtyEdit.openEditPopupShowSeconds(subItem,
+							// 			// 	item.subList);
+							// 		} else {
+							// 			this.scanPopupGetFocus();
+							// 		}
+							// 	})
+						} else {
+							that.scanByBalance(result);
+						}
+					} else if (subItems.length == 0) {
+						that.scanByBalance(result);
+					}
+				}
+			} catch (e) {
+				this.showErrorMessage(e.message)
+			}
+		},
+
+		//编辑盘点结果
+		editCountResult(item, subItem) {
+			let that = this;
+			this.$refs.comMessage.showQuestionMessage("箱码【" + that.label.packingNumber +
+				"】已经完成盘点,是否要编辑盘点结果?",
+				res => {
+					if (res) {
+						this.currentEditItem = subItem;
+						this.$refs.countQtyEdit.openEditPopup(subItem,
+							item.subList);
+						// this.$refs.countQtyEdit.openEditPopupShowSeconds(subItem,
+						// 	item.subList);
+					} else {
+						this.scanPopupGetFocus();
+					}
+				})
+		},
+
+		getUnOpenCountResult(result) {
+			try {
+				let that = this;
+				that.package = result.package;
+				that.label = result.label;
+				var item = this.detailSource.find(r => r.itemCode == that.package.itemCode);
+				if (item == undefined) {
+					this.$refs.comMessage.showQuestionMessage("没有物料【" + that.package.itemCode +
+						"】的盘点明细,是否继续盘点?",
+						res => {
+							if (res) {
+								that.scanByLabel(result);
+							} else {
+								this.scanPopupGetFocus();
+							}
+						})
+				} else {
+					let subItem = item.subList.find(item => {
+						if (item.packingNumber == that.label.packingNumber &&
+							item.batch == that.label.batch && item.scaned == true) {
+							return item;
+						}
+					})
+
+					if (subItem != undefined) {
+						this.$refs.comMessage.showQuestionMessage("箱码【" + that.label.packingNumber +
+							"】已经完成盘点,是否要编辑盘点结果?",
+							res => {
+								if (res) {
+									this.currentEditItem = subItem;
+									this.$refs.countQtyEdit.openEditPopup(subItem,
+										item.subList);
+								} else {
+									this.scanPopupGetFocus();
+								}
+							})
+					} else {
+						that.scanByLabel(result);
+					}
+				}
+			} catch (e) {
+				this.showErrorMessage(e.message)
+			}
+		},
+
+		//明盘，按库存盘点
+		scanByBalance(result) {
+			let that = this;
+			if (result.balance.length == 0) {
+				that.scanPopupLoseFocus()
+				that.$refs.comMessage.showQuestionMessage("该包装在来源库位[" + that.fromLocationCode +
+					"],未查找到库存,是否继续盘点?",
+					res => {
+						if (res) {
+							that.editInventoryStatus = true;
+							let item = that.package;
+							item.packingNumber = that.label.packingNumber;
+							item.qty = 0
+							item.handleQty = Number(that.label.qty);
+							item.balanceQty = 0;
+							item.inventoryStatus = "OK";
+							that.balance = item;
+							that.$refs.countQtyEdit.openEditPopupShowSeconds(item,
+								null);
+						} else {
+							//继续扫描
+							that.scanPopupGetFocus();
+						}
+					})
+			} else if (result.balance.length == 1) {
+				this.countByBalance(result.balance[0]);
+			} else {
+				//有多条库存记录
+				this.$refs.balanceSelect.openPopup(result.balance);
+			}
+		},
+
+		//盲盘，按标签盘点
+		scanByLabel(result) {
+			let that = this;
+			that.scanPopupLoseFocus()
+			let item = that.package;
+			item.packingNumber = that.label.packingNumber;
+			item.qty = 0
+			item.handleQty = Number(that.label.qty);
+			item.balanceQty = 0;
+			item.inventoryStatus = "OK";
+			that.balance = item;
+			that.$refs.countQtyEdit.openEditPopupShowSeconds(item,
+				null);
+		},
+
+		selectBalanceItem(balance) {
+			this.countByBalance(balance);
+		},
+
+		countByBalance(balance) {
+			this.balance = balance;
+			// this.balance.qty = 0
+			this.balance.handleQty = Number(this.label.qty);
+			this.balance.balanceQty = this.balance.qty;
+			this.balance.stdPackQty = this.package.stdPackQty;
+			this.balance.stdPackUnit = this.package.stdPackUnit;
+			this.$refs.countQtyEdit.openEditPopupShowSeconds(this.balance,
+				null);
+		},
+
+		editConfirm(qty, inventoryStatus, mode) {
+			let that = this;
+			//编辑
+			if (mode == 'edit') {
+				this.currentEditItem.handleQty = qty;
+				this.currentEditItem.inventoryStatus = inventoryStatus;
+			} else {
+				//新增盘点
+				//检查物料号是否存在
+				var detail = that.detailSource.find(r => r.itemCode == that.label.itemCode);
+				if (detail == undefined) {
+					//物料号不存在，创建物料号数据添加到列表。设置为已经扫描
+					that.addNewItemCodeToList(qty, inventoryStatus)
+				} else {
+					var itemEditInfo = detail.subList.find(item => {
+						if (item.packingNumber == that.label.packingNumber &&
+							item.batch == that.label.batch &&
+							item.inventoryStatus == inventoryStatus) {
+							return item;
+						}
+					})
+
+					if (itemEditInfo == undefined) {
+						//不在任务列表中，提示是否添加到列表
+						that.addExistItemCodeToList(detail, qty, inventoryStatus);
+					} else { //已经扫描是否编辑
+						itemEditInfo.scaned = true;
+						itemEditInfo.handleQty = qty;
+						itemEditInfo.inventoryStatus = inventoryStatus;
+						itemEditInfo.balanceQty = that.balance.qty;
+						itemEditInfo.stdPackQty = that.package.stdPackQty;
+						itemEditInfo.stdPackUnit = that.package.stdPackUnit;
+					}
+				}
+
+				setTimeout(r => {
+					this.calcHandleQty();
+					this.scanPopupGetFocus();
+				}, 100)
+			}
+
+		},
+
+		openEditConfirm() {
+
+		},
+
+		unOpenEditConfirm() {
+
+		},
+
+		editClose() {
+			this.scanPopupGetFocus();
+		},
+
+		addNewItemCodeToList(qty, inventoryStatus) {
+			this.$refs.comMessage.showQuestionMessage("物料[" + this.package.itemCode + "]不在列表中,是否添加到列表?",
+				res => {
+					if (res) {
+						var item = this.createAddItemInfo(this.balance, this.package);
+						let newDetail = this.createAddDetailInfo(qty, inventoryStatus); //
+						item.subList.push(newDetail);
+						this.detailSource.push(item)
+						this.showMessage('添加成功');
+						this.updateData()
+						this.scanPopupGetFocus();
+					}
+				})
+		},
+
+		addExistItemCodeToList(detail, qty, inventoryStatus) {
+			let that = this;
+			that.scanPopupLoseFocus();
+			this.$refs.comMessage.showQuestionMessage("盘点结果不在明细列表中,是否添加到列表?",
+				res => {
+					if (res) {
+						// detail.qty = calc.add(qty, qty)
+						let newDetail = that.createAddDetailInfo(qty, inventoryStatus); //
+						detail.subList.push(newDetail);
+						this.showMessage('添加成功');
+						that.updateData()
+					}
+					that.scanPopupGetFocus();
+				})
+		},
+
+		createAddItemInfo() {
+			let item = {
+				itemCode: this.package.itemCode,
+				itemName: this.package.itemName,
+				stdPackQty: this.package.stdPackQty,
+				stdPackUnit: this.package.stdPackUnit,
+				// qty: Number(qty),
+				qty: 0,
+				handleQty: 0,
+				uom: this.package.uom,
+				subList: [],
+			}
+			return item;
+		},
+
+		//创建盘盈的明细
+		createAddDetailInfo(qty, inventoryStatus) {
+			var detail = {
+				id: "0", //新增的明细
+				scaned: true,
+				countDetailNumber: "",
+				ownerCode: this.balance.ownerCode,
+				packingNumber: this.package.number,
+				containerNumber: this.balance.containerNumber,
+				batch: this.package.batch,
+				inventoryStatus: inventoryStatus,
+				itemCode: this.package.itemCode,
+				itemName: this.package.itemName,
+				itemDesc1: this.package.itemDesc1,
+				itemDesc2: this.package.itemDesc2,
+				stdPackQty: this.package.stdPackQty,
+				stdPackUnit: this.package.stdPackUnit,
+				projectCode: "",
+				qty: 0,
+				handleQty: qty,
+				uom: this.package.uom,
+				number: this.jobContent.number,
+				remark: "",
+				countQty: qty,
+				balanceQty: this.balance.qty,
+				fromLocationCode: this.balance.locationCode,
+				creator: this.$store.state.user.id
+			}
+			return detail;
+		},
+
+		scanLocationCode(location, code) {
+			this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+				this.toLocationCode = code
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						detail.toLocationCode = code
+					})
+				})
+			})
+
+		},
+
+		getScanCount() {
+			var scanCount = 0;
+			this.detailSource.forEach(item => {
+				item.subList.forEach(detail => {
+					if (detail.scaned) {
+						scanCount = scanCount + 1;
+					}
+				})
+			})
+			return scanCount;
+		},
+
+		getTotalCount() {
+			var totalCount = 0;
+			this.detailSource.forEach(item => {
+				item.subList.forEach(detail => {
+					totalCount = totalCount + 1;
+				})
+			})
+			return totalCount;
+		},
+
+		commit() {
+			this.scanCount = this.getScanCount();
+
+			if (this.scanCount == this.getTotalCount()) {
+				this.submitJob();
+			} else if (this.scanCount < this.getTotalCount()) {
+				//扫描数量小于任务数量，判断是否允许部分提交
+				if (this.jobContent.allowPartialComplete == "TRUE") {
+					//提交
+					this.$refs.comMessage.showQuestionMessage("已经扫描[" + this.scanCount +
+						"]总共[" + this
+						.getTotalCount() + "],是否把未扫描的盘点数量设置为0?",
+						res => {
+							if (res) {
+								this.detailSource.forEach(item => {
+									item.subList.forEach(detail => {
+										if (!detail.scaned) {
+											detail.countQty = 0;
+										}
+									})
+								})
+								this.submitJob();
+							}
+						});
+
+				} else {
+					//不允许部分提交，提示
+					this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+						"]总共[" + this
+						.getTotalCount() + "]", res => {
+							if (res) {
+								this.openScanPopup();
+							}
+						});
+				}
+			}
+
+		},
+
+		submitJob() {
+			uni.showLoading({
+				title: "提交中....",
+				mask: true
+			});
+			var params = this.setParams()
+			console.log("提交参数", JSON.stringify(params));
+			countJobSubmit(params).then(res => {
+				uni.hideLoading()
+				if (res.data) {
+					this.showCommitSuccessMessage("提交成功<br>生成盘点记录<br>" + res.data)
+				} else {
+					this.showErrorMessage("提交失败[" + res.msg + "]")
+				}
+			}).catch(error => {
+				uni.hideLoading()
+				this.showErrorMessage(error)
+			})
+
+		},
+
+		setParams() {
+			var subList = []
+			var creator = this.$store.state.user.id
+
+			this.detailSource.forEach(item => {
+				item.subList.forEach(detail => {
+					if (detail.scaned) {
+						detail.countQty = detail.handleQty;
+					}
+					subList.push(detail)
+				})
+			})
+
+			this.jobContent.subList = subList
+			this.jobContent.creator = creator;
+			return this.jobContent;
+		},
+
+
+		showMessage(message) {
+			this.$refs.comMessage.showMessage(message, res => {
+				if (res) {
+					this.afterCloseMessage()
+				}
+			});
+		},
+		showErrorMessage(message) {
+			this.$refs.comMessage.showErrorMessage(message, res => {
+				if (res) {
+					this.afterCloseMessage()
+				}
+			});
+		},
+
+		showScanMessage(message) {
+			this.$refs.comMessage.showScanMessage(message);
+		},
+
+		afterCloseMessage() {
+			this.scanPopupGetFocus();
+		},
+
+		closeScanMessage() {
+			this.scanPopupGetFocus();
+		},
+
+		editItem(item) {
+			this.currentEditItem = item;
+			var detail = this.detailSource.find(r => r.itemCode == item.itemCode);
+			this.$refs.countQtyEdit.openEditPopup(item,
+				detail.subList);
+		},
+
+		showCommitSuccessMessage(hint) {
+			this.$refs.comMessage.showSuccessMessage(hint, res => {
+				navigateBack(1);
+			})
+		},
+		getCountStageName(value) {
+			return getCountStageName(value)
+		},
+		isOpenCount(value) {
+			return value == "TRUE" ? "明盘" : "盲盘"
+		}
+
+	}
+
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/count/job/countJob.vue b/pages/count/job/countJob.vue
new file mode 100644
index 0000000..7c3e2bd
--- /dev/null
+++ b/pages/count/job/countJob.vue
@@ -0,0 +1,290 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-count-job-card :dataContent="item" @click='openJobDetail(item)'></com-count-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+
+			<uni-load-more :status="loadingType" />
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		cancleTakeCountJob,
+		getCountJobList
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+
+	import comCountJobCard from '@/pages/count/coms/comCountJobCard.vue'
+	import jobListPopup from '@/pages/count/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/count/coms/jobInfoPopup.vue'
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comCountJobCard,
+			jobListPopup,
+			jobInfoPopup
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+				
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+
+				getCountJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("盘点(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("盘点");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './countDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.jobListPopup.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeCountJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getCountJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/count/record/countRecord.vue b/pages/count/record/countRecord.vue
new file mode 100644
index 0000000..dbc2570
--- /dev/null
+++ b/pages/count/record/countRecord.vue
@@ -0,0 +1,552 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="fromLocationCode==''"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="fromLocationCode!=''">
+			<requiredLocation title="盘点库位" :locationCode="fromLocationCode"
+				:isShowEdit="jobContent.allowModifyLocation==1" @getLocation='scanLocationCode'
+				:locationTypeList="locationTypeList"></requiredLocation>
+			<u-line></u-line>
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<com-count-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
+								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack"
+								@editItem="editItem">
+							</com-count-detail-card>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-location ref="scanFromLocationCode" title="盘点库位" @getLocation='getLocation'
+			:locationTypeList="fromLocationTypeArray"></win-scan-location>
+		<count-qty-edit ref="CountQtyEdit" @confirm="editConfirm" :isShowStatus="true" :allowEditStatus="true">
+		</count-qty-edit>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		goHome,
+		getDataSource,
+		navigateBack
+	} from '@/common/basic.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+
+	import {
+		balanceByLocation
+	} from '@/common/balance.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comCountDetailCard from '@/pages/count/coms/comCountDetailCard.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import CountQtyEdit from '@/mycomponents/qty/CountQtyEdit.vue'
+
+	export default {
+		name: 'receipt_detail',
+		components: {
+			winScanButton,
+			winScanPack,
+			comCountDetailCard,
+			requiredLocation,
+			comBlankView,
+			winScanPackAndLocation,
+			winScanLocation,
+			CountQtyEdit
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				received: false,
+				isShowPackingCode: true,
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				toLocationInfo: {},
+				businessTypeInfo: {},
+				fromLocationTypeArray: [],
+				toLocationTypeArray: [],
+				fromLocationInfo: {},
+				fromLocationCode: "",
+				businessType: {},
+				itemEditInfo: {}
+			};
+		},
+		onLoad(option) {
+			var typeCode = "Count"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+		},
+
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {},
+		methods: {
+			calcScanCount(closeScan) {
+				let items = this.subList.filter(r => {
+					if (r.scaned) {
+						return r;
+					}
+				})
+				this.scanCount = items != null ? items.length : 0;
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				}
+			},
+
+			calcHandleQty() {
+				for (let item of this.detailSource) {
+					item.handleQty = new Decimal(0).toNumber();
+					item.qty = new Decimal(0).toNumber();
+					for (let detail of item.subList) {
+						if(detail!=undefined){
+							if(detail.scaned){
+								item.handleQty = calc.add(item.handleQty,detail.handleQty);
+							}
+							item.qty = calc.add(item.qty,detail.qty); 
+						}
+					}
+				}
+				this.$forceUpdate();
+			},
+			selectedItem(item) {
+				if (item.locationCode != this.fromLocationCode) {
+					this.showErrorMessage("来源库位[" + this.fromLocationCode + "]无库存")
+					return;
+				}
+			},
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanFromLocationCode.openScanPopup();
+				})
+
+			},
+
+			getLocation(location) {
+				this.getfromLocationCode(location)
+			},
+
+			getfromLocationCode(location) {
+				this.fromLocationInfo = location;
+				this.fromLocationCode = location.code;
+
+				//查询库位下的库存
+				balanceByLocation(this.fromLocationCode, res => {
+					this.subList = res.data.list;
+					this.detailSource = getDataSource(this.subList);
+
+				});
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.packGetFocus();
+				}
+			},
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.balance.packingNumber;
+					var batch = result.balance.batch;
+					var qty = result.balance.qty;
+					var itemCode = result.balance.itemCode;
+					var inventoryStatus = result.balance.inventoryStatus;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					//检查物料号是否存在
+					if (detail == undefined) {
+						//物料号不存在，创建物料号数据添加到列表。设置为已经扫描
+						this.addNewItemCodeToList(result)
+					} else {
+						//物料号存在，查询是否在任务列表中
+
+						this.itemEditInfo = detail.subList.find(item => {
+							if (item.packingNumber == packingNumber &&
+								item.batch == batch &&
+								item.inventoryStatus == inventoryStatus) {
+								return item;
+							}
+						})
+
+						if (this.itemEditInfo == undefined) {
+							//不在任务列表中，提示是否添加到列表
+							this.addExistItemCodeToList();
+						} else {
+							//在列表中，更新已扫描状态，
+							if (this.itemEditInfo.scaned) {
+								this.$refs.comMessage.showSelectMessageModal("箱码【" + packingNumber + "】已经完成盘点,是否要编辑数量",
+									res => {
+										if (res) {
+											this.$refs.CountQtyEdit.openEditPopup(this.itemEditInfo,
+												detail.subList);
+										} else {
+											this.scanPopupGetFocus();
+										}
+									})
+							} else {
+								this.itemEditInfo.scaned = true;
+								this.itemEditInfo.stdPackQty = result.package.stdPackQty;
+								this.itemEditInfo.stdPackUnit = result.package.stdPackUnit;
+								this.itemEditInfo.record = this.createRecordInfo(this.itemEditInfo, result.balance);
+								this.$refs.CountQtyEdit.openEditPopupShowSeconds(this.itemEditInfo);
+								this.calcHandleQty();
+							}
+						}
+					}
+				} catch (e) {
+					this.showErrorMessage(e.message)
+				}
+			},
+
+			addNewItemCodeToList(result) {
+				var item = this.createAddItemInfo(result.balance, result.package);
+				let newDetail = this.createAddDetailInfo(result.balance, result.package); //
+				item.subList.push(newDetail);
+				this.detailSource.push(item)
+			},
+
+			createRecordInfo(detail, balance) {
+				var record = {}
+				detail.scaned = true;
+				detail.balanceQty = Number(balance.qty);
+				detail.inventoryStatus = balance.inventoryStatus;
+				// let record = JSON.parse(JSON.stringify(detail));
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				Object.assign(record, detail)
+				record.fromLocationCode = this.fromLocationCode;
+				return record;
+			},
+			addExistItemCodeToList(detail, result) {
+				detail.qty = calc.add(detail.qty,detail.qty)
+				let newDetail = this.createAddDetailInfo(result.balance, result.package); //
+				detail.subList.push(newDetail);
+			},
+
+			createAddItemInfo(balance, pack) {
+				let item = {
+					itemCode: balance.itemCode,
+					itemName: pack.itemName,
+					stdPackQty: pack.stdPackQty,
+					stdPackUnit: pack.stdPackUnit,
+					qty: balance.qty,
+					handleQty: 0,
+					uom: pack.uom,
+					subList: []
+				}
+				return item;
+			},
+
+			createAddDetailInfo(balance, pack) {
+				var detail = {
+					scaned: true,
+					balanceQty: balance.qty,
+					toInventoryStatus: balance.inventoryStatus,
+					fromLocationCode: balance.locationCode,
+					id: "",
+					countDetailNumber: "",
+					ownerCode: balance.OwnerCode,
+					packingNumber: balance.packingNumber,
+					containerNumber: pack.containerNumber,
+					batch: balance.batch,
+					inventoryStatus: balance.inventoryStatus,
+					itemCode: balance.itemCode,
+					itemName: pack.itemName,
+					itemDesc1: pack.itemDesc1,
+					itemDesc2: pack.itemDesc2,
+					projectCode: "",
+					qty: balance.qty,
+					uom: balance.uom,
+					masterID: "",
+					Number: "",
+					remark: "",
+					creationTime: "",
+					creatorId: "",
+					creatorName: "",
+					siteId: ""
+				}
+
+				return detail;
+			},
+
+			editItem(val) {
+				var detail = this.detailSource.find(r => r.itemCode == val.itemCode);
+				this.$refs.CountQtyEdit.openEditPopup(val,
+					detail.subList);
+			},
+
+			editConfirm() {
+				this.calcHandleQty();
+				this.scanPopupGetFocus();
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+
+			},
+
+			commit() {
+				if (this.fromLocationCode == "") {
+					this.showMessage("请先选择目标库位")
+					return;
+				}
+				//允许部分提交
+				if (this.jobContent.allowPartialComplete == "TRUE") {
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+
+					var params = this.setParams();
+					console.log("提交" + JSON.stringify(params))
+					// (this.id, params).then(res => {
+					// 	uni.hideLoading()
+					// 	if (res.data) {
+					// 		var hint = res.data.Number;
+					// 		this.showCommitSuccessMessage("提交成功" + hint, )
+
+					// 	} else {
+					// 		this.showErrorMessage("提交失败[" + res.msg + "]")
+					// 	}
+					// }).catch(error => {
+					// 	uni.hideLoading()
+					// 	this.showErrorMessage(error)
+					// })
+				} else {
+					this.calcScanCount();
+					if (this.scanCount < this.subList.length) {
+						this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList.length +
+							"]");
+					}
+				}
+
+			},
+
+			setParams() {
+				var params = {
+					requestNumber: this.jobContent.requestNumber,
+					jobNumber: "",
+					asnNumber: this.jobContent.asnNumber,
+					ppNumber: this.jobContent.ppNumber,
+					supplierCode: this.jobContent.supplierCode,
+					receiptDock: this.jobContent.receiptDock,
+					carrierCode: this.jobContent.carrierCode,
+					transferMode: this.jobContent.transferMode,
+					vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
+					fromWarehouseCode: this.toLocationInfo.WarehouseCode,
+					toWarehouseCode: this.toLocationInfo.warehouseCode,
+					outTransaction: this.businessTypeInfo.outTransactionType, //出库事务类型
+					inTransaction: this.businessTypeInfo.inTransactionType, //入库事务类型
+					executeTime: "2023-08-4 16:30:11", //执行时间
+					activeDate: "2023-08-4 16:30:11", //生效时间
+					available: "1", //是否可用 0不可用,1可用
+					requestTime: this.jobContent.requestTime,
+					dueTime: "2023-08-4 16:30:11", //截止时间
+					departmentCode: this.jobContent.departmentCode,
+					userPositionCode: "", //岗位
+					interfaceType: "jklxPURCHASE_RECEIPT", //接口类型
+					number: this.jobContent.number,
+					businessType: this.jobContent.businessType,
+					remark: this.jobContent.remark,
+					creationTime: this.jobContent.creationTime,
+					creatorld: this.jobContent.creatorld,
+					creatorName: this.jobContent.creatorName,
+					extraProperties: this.jobContent.extraProperties,
+					siteld: this.jobContent.siteld,
+					code: "",
+					subList: [
+
+					],
+				}
+
+				this.detailSource.forEach(res => {
+					res.subList.forEach(res1 => {
+						if (res1.scaned) {
+							res1.FromLocationGroupCode = "";
+							res1.FromAreaCode = "";
+							res1.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
+							res1.ToAreaCode = this.toLocationInfo.AreaCode;
+							res1.VisualInspectResult = ""; //目检结果
+							res1.VisualInspectPhotos = ""; //目检照片
+							res1.FailedReason = ""; //不合格原因
+							res1.MassDefect = ""; //质量缺陷
+							res1.SinglePrice = ""; //单价
+							res1.Amount = ""; //金额
+							res1.Code = "";
+							res1.JobDetailID = res1.id;
+							res1.interfaceType = "jklxPURCHASE_RECEIPT";
+							params.subList.push(res1)
+						}
+					})
+				})
+
+				return params;
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/customerReturn/coms/comReturnJobCard.vue b/pages/customerReturn/coms/comReturnJobCard.vue
new file mode 100644
index 0000000..4691483
--- /dev/null
+++ b/pages/customerReturn/coms/comReturnJobCard.vue
@@ -0,0 +1,44 @@
+<template>
+ 	<job-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				<view class="">
+ 					申请单号 : {{dataContent.requestNumber}}
+ 				</view>
+ 			</view>
+
+ 			<view class="task_text">
+ 				<view class="">
+ 					客户代码 : {{dataContent.customerCode}}
+ 				</view>
+ 			</view>
+ 		</view>
+ 	</job-com-main-card>
+ </template>
+
+ <script>
+ 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			jobComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/customerReturn/coms/comReturnRecord.vue b/pages/customerReturn/coms/comReturnRecord.vue
new file mode 100644
index 0000000..784d610
--- /dev/null
+++ b/pages/customerReturn/coms/comReturnRecord.vue
@@ -0,0 +1,172 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
+							<item-qty :dataContent="dataContent" 
+								:isShowBalance="true"></item-qty>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item,index)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<production-label :dataContent="item"  :packageContent="item.package">
+							</production-label>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<u-line color="#D8D8D8"></u-line>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<balanceQtyEdit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true" :allowEditStatus="false">
+		</balanceQtyEdit>
+		<job-detail-popup ref="winHint" :dataContent="showItem"></job-detail-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import productionLabel from '@/mycomponents/balance/productionLabel.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getClearOption
+	} from '@/common/array.js';
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			jobDetailPopup,
+			balanceQtyEdit,
+			productionLabel,
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {},
+				detailOptions: [],
+				scanOptions: [],
+				removeOptions: [],
+				dataList: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+			this.removeOptions = getClearOption();
+		},
+
+		methods: {
+			removeData(e, dataContent) {
+				if (e.content.text == "清空") {
+					this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
+						res => {
+							if (res) {
+								this.$emit('removeItem')
+								// this.$emit('removeItem', this.dataContent)
+							}
+						});
+				}
+			},
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+
+			edit(item) {
+				this.editItem = item;
+				this.$refs.balanceQtyEdit.openEditPopup(this.editItem, this.editItem.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.dataList = [
+
+					{
+						title: "箱码",
+						content: item.packingNumber
+					},
+					{
+						title: "批次",
+						content: item.batch
+					},
+					{
+						title: "库位",
+						content: item.locationCode
+					},
+					{
+						title: "数量",
+						content: item.qty
+					},
+					{
+						title: "单位",
+						content: item.uom
+					}
+				]
+				this.$refs.winHint.openScanPopup()
+			},
+			remove(item, index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							this.dataContent.subList.splice(index, 1)
+							this.$emit('removePack')
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/customerReturn/coms/comReturnRequestCard.vue b/pages/customerReturn/coms/comReturnRequestCard.vue
new file mode 100644
index 0000000..eb39e12
--- /dev/null
+++ b/pages/customerReturn/coms/comReturnRequestCard.vue
@@ -0,0 +1,39 @@
+<template>
+ 	<request-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<!-- <view class="task_text">
+ 				申请单号 : {{dataContent.requestNumber}}
+ 			</view> -->
+ 			<view class="task_text">
+ 				客户代码 : {{dataContent.customerCode}}
+ 			</view>
+ 		</view>
+ 	</request-com-main-card>
+ </template>
+
+ <script>
+ 	import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			requestComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/customerReturn/coms/detailInfoPopup.vue b/pages/customerReturn/coms/detailInfoPopup.vue
new file mode 100644
index 0000000..487c199
--- /dev/null
+++ b/pages/customerReturn/coms/detailInfoPopup.vue
@@ -0,0 +1,57 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">销售订单号 : </text>
+							<text class="text_wrap">{{dataContent.SoNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">销售订单行 : </text>
+							<text class="text_wrap">{{dataContent.SoLine}} </text>
+						</view>
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/customerReturn/coms/jobInfoPopup.vue b/pages/customerReturn/coms/jobInfoPopup.vue
new file mode 100644
index 0000000..cd90fca
--- /dev/null
+++ b/pages/customerReturn/coms/jobInfoPopup.vue
@@ -0,0 +1,78 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">发货记录单号 : </text>
+							<text class="text_wrap">{{dataContent.deliverRecordNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">发货计划单号 : </text>
+							<text class="text_wrap">{{dataContent.deliverPlanNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">客户代码 : </text>
+							<text class="text_wrap">{{dataContent.customerCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">客户月台代码 : </text>
+							<text class="text_wrap">{{dataContent.customerDockCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">承运商 : </text>
+							<text class="text_wrap">{{dataContent.carrierCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">运输方式 : </text>
+							<text class="text_wrap">{{dataContent.transferMode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">车牌号 : </text>
+							<text class="text_wrap">{{dataContent.vehiclePlateNumber}} </text>
+						</view>
+					</view>
+				</view>
+				<u-line></u-line>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/customerReturn/coms/jobListPopup.vue b/pages/customerReturn/coms/jobListPopup.vue
new file mode 100644
index 0000000..4c73872
--- /dev/null
+++ b/pages/customerReturn/coms/jobListPopup.vue
@@ -0,0 +1,47 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-return-job-card :dataContent="item" @click='selectItem(item)'></com-return-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	import comReturnJobCard from '@/pages/productionReturn/coms/comReturnJobCard.vue'
+	
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comReturnJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/customerReturn/coms/requestDetailInfoPopup.vue b/pages/customerReturn/coms/requestDetailInfoPopup.vue
new file mode 100644
index 0000000..5449001
--- /dev/null
+++ b/pages/customerReturn/coms/requestDetailInfoPopup.vue
@@ -0,0 +1,87 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<requestDetailCommonInfo :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">销售订单号 : </text>
+							<text class="text_wrap">{{dataContent.soNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">销售订单行 : </text>
+							<text class="text_wrap">{{dataContent.soLine}} </text>
+						</view>
+						
+						<view class="item">
+							<text class="item_title">包装号 : </text>
+							<text class="text_wrap">{{dataContent.packingNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">器具号 : </text>
+							<text class="text_wrap">{{dataContent.containerNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">批次 : </text>
+							<text class="text_wrap">{{dataContent.batch}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">库存状态 : </text>
+							<text class="text_wrap">{{dataContent.inventoryStatus}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从库位代码 : </text>
+							<text class="text_wrap">{{dataContent.fromLocationCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从货主代码 : </text>
+							<text class="text_wrap">{{dataContent.fromOwnerCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到货主代码 : </text>
+							<text class="text_wrap">{{dataContent.toOwnerCode}} </text>
+						</view>
+						
+					</view>
+				</view>
+			</requestDetailCommonInfo>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue'
+	export default {
+		components: {
+			requestDetailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/customerReturn/coms/requestInfoPopup.vue b/pages/customerReturn/coms/requestInfoPopup.vue
new file mode 100644
index 0000000..1799e48
--- /dev/null
+++ b/pages/customerReturn/coms/requestInfoPopup.vue
@@ -0,0 +1,105 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<request-common-info :dataContent="dataContent"  @onClose="closePopup">
+				<view class="">
+					<comListItem :dataList="dataList"></comListItem>
+				</view>
+				<u-line></u-line>
+			</request-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestCommonInfo from '@/mycomponents/request/requestCommonInfo.vue'
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+		components: {
+			requestCommonInfo,
+			comListItem
+		},
+		data() {
+			return {
+				dataContent: {},
+				dataList:[]
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				this.dataList=[{
+						title: '申请单号',
+						content: this.dataContent.requestNumber
+					}, {
+						title: '发货记录单号',
+						content: this.dataContent.deliverRecordNumber
+					},{
+						title: '发货计划单号',
+						content: this.dataContent.deliverPlanNumber,
+					},{
+						title: '客户代码',
+						content: this.dataContent.customerCode,
+					},{
+						title: '客户月台代码',
+						content: this.dataContent.customerDockCode,
+					},{
+						title: '承运商',
+						content: this.dataContent.carrierCode,
+					},{
+						title: '运输方式',
+						content: this.dataContent.transferMode,
+					},
+					{
+						title: '车牌号',
+						content: this.dataContent.vehiclePlateNumber,
+					},
+					{
+						title: '从仓库代码',
+						content: this.dataContent.fromWarehouseCode,
+					},
+					{
+						title: '到仓库代码',
+						content: this.dataContent.toWarehouseCode,
+					},
+					{
+						title: '从库位类型范围',
+						content: this.dataContent.fromLocationTypes,
+						type:"locationType"
+					},
+					{
+						title: '到库位类型范围',
+						content: this.dataContent.toLocationTypes,
+						type:"locationType"
+					},
+					{
+						title: '从库区代码范围',
+						content: this.dataContent.fromAreaCodes,
+					},
+					{
+						title: '到库区代码范围',
+						content: this.dataContent.toAreaCodes,
+					},
+					{
+						title: '到月台代码',
+						content: this.dataContent.toDockCode,
+					}];
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/customerReturn/job/returnDetail.vue b/pages/customerReturn/job/returnDetail.vue
new file mode 100644
index 0000000..43386f9
--- /dev/null
+++ b/pages/customerReturn/job/returnDetail.vue
@@ -0,0 +1,538 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<com-detail-card :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
+							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
+							:locationTypeList="tolocationTypeList">
+						</com-detail-card>
+					</view>
+					<u-line />
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import {
+		getCustomerReturnJobDetail,
+		getBasicLocationByCode,
+		takeCustomerReturnJob,
+		cancleTakeCustomerReturnJob,
+		customerReturnJobSubmit
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		navigateBack,
+		getPackingNumberAndBatch,
+		getInventoryStatusName,
+		getDirectoryItemArray
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import detailInfoPopup from '@/pages/customerReturn/coms/detailInfoPopup.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPackAndLocation,
+			requiredLocation,
+			comDetailCard,
+			detailInfoPopup
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				managementList: [],
+				fromLocationCode: "",
+				toLocationCode: "",
+				toLocationInfo: {},
+				tolocationTypeList: [],
+				jobStatus:""
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务	
+					cancleTakeCustomerReturnJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeCustomerReturnJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getCustomerReturnJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.subList = res.data.subList;
+							that.jobStatus = res.data.status
+							
+							that.detailSource = getDataSource(that.subList)
+							that.fromLocationCode = that.subList[0].fromLocationCode
+							that.toLocationCode = that.subList[0].toLocationCode
+							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
+
+							that.getLocationInfo(that.toLocationCode);
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			getLocationInfo(locationCode) {
+				if (locationCode != '') {
+					getBasicLocationByCode(locationCode).then(res => {
+						if (res.data.list.length > 0) {
+							this.toLocationInfo = res.data.list[0]
+						}
+					})
+				}
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource);
+				this.continueScan();
+				this.$forceUpdate();
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			openDetail(item) {
+				this.$refs.detailInfoPopup.openPopup(item)
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.balance.packingNumber;
+					var batch = result.balance.batch;
+					var qty = result.balance.qty;
+					var itemCode = result.balance.itemCode;
+					var locationCode = result.balance.locationCode;
+					var inventoryStatus = result.balance.inventoryStatus;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch
+						})
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
+							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								
+								
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续退货?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty)
+													itemDetail.inventoryStatus = result.balance.inventoryStatus;
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty =  Number(result.balance.qty)
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+									
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.handleQty = Number(result.balance.qty)
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+									itemDetail.balance = result.balance;
+									itemDetail.balance.balanceQty =  Number(result.balance.qty)
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+				} catch (e) {
+					this.showMessage(e.message)
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//校验库位、
+				if (!this.checkLocation()) {
+					return
+				}
+
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams()
+						console.log("提交参数", JSON.stringify(params));
+						customerReturnJobSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成客户退货记录:" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toContainerNumber = detail.containerNumber;
+							detail.toBatch = info.batch;
+							detail.toLocationCode = detail.toLocationCode;
+							detail.toInventoryStatus = 'HOLD';
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.showMessageHint('请扫描收货库位', callback => {
+						this.$refs.comScanLocation.showLocation();
+					})
+
+					return isPass = false;
+				}
+				return isPass;
+			},
+
+			showMessageHint(hint, callback) {
+				this.$refs.comMessage.showErrorMessage(hint, res => {
+					if (res) {
+						callback()
+					}
+				});
+			},
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+			scanPopupGetFocus() {
+				if(this.$refs.scanPopup!=undefined){
+					this.$refs.scanPopup.packGetFocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if(this.$refs.scanPopup!=undefined){
+					this.$refs.scanPopup.packLoseFocus();
+				}
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/customerReturn/job/returnJob.vue b/pages/customerReturn/job/returnJob.vue
new file mode 100644
index 0000000..960f382
--- /dev/null
+++ b/pages/customerReturn/job/returnJob.vue
@@ -0,0 +1,284 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-return-job-card :dataContent="item" @click='openJobDetail(item)'></com-return-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+			
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+			
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+			
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		cancleTakeCustomerReturnJob,
+		getCustomerReturnJobList,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+
+	import comReturnJobCard from '@/pages/customerReturn/coms/comReturnJobCard.vue'
+	import jobListPopup from '@/pages/customerReturn/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/customerReturn/coms/jobInfoPopup.vue'
+
+	export default {
+		name: 'customerReturn',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comReturnJobCard,
+			jobListPopup,
+			jobInfoPopup
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+				
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getCustomerReturnJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("客户退货(" + this.totalCount + ")");
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("客户退货任务");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './returnDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.jobListPopup.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeCustomerReturnJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getCustomerReturnJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/customerReturn/record/returnRecord.vue b/pages/customerReturn/record/returnRecord.vue
new file mode 100644
index 0000000..45dd23f
--- /dev/null
+++ b/pages/customerReturn/record/returnRecord.vue
@@ -0,0 +1,466 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :isShowLocation="true"
+								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
+							:locationTypeList="tolocationTypeList"></requiredLocation>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' headerType="HPQ,HMQ">
+		</win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+	</view>
+
+</template>
+
+<script>
+	import {
+		getBasicCustomerList,
+		customerReturnRecordSubmit
+	} from '@/api/request2.js';
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+	import {
+		goHome,
+		updateTitle,
+		getPackingNumberAndBatchByList,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comReturnRecord from '@/pages/customerReturn/coms/comReturnRecord.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			comReturnRecord,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				received: false,
+				isShowPackingCode: true,
+				scanCount: 0,
+				dataContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				businessType: {},
+				fromLocationCode: "",
+				toLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				managementList: [],
+				toWarehouseCode: '',
+			};
+		},
+		onLoad(option) {
+			var typeCode = "CustomerReject"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {
+
+		},
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.$forceUpdate();
+			},
+
+
+			updateData() {
+				this.calcHandleQty();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+
+			},
+
+			commit() {
+
+				if (this.toLocationCode == "") {
+					this.showMessage("请先选择目标库位")
+					return;
+				}
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					this.managementList = [];
+					var precisionStrategParams = this.setPrecisionStrategParams()
+
+					getPrecisionStrategyList(precisionStrategParams, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							var params = this.setParams()
+							console.log("提交" + JSON.stringify(params))
+							customerReturnRecordSubmit(params).then(res => {
+								uni.hideLoading()
+								if (res.data) {
+									this.showCommitSuccessMessage("提交成功<br>生成客户退货记录<br>" + res.data)
+								} else {
+									this.showErrorMessage("提交失败[" + res.msg + "]")
+								}
+							}).catch(error => {
+								uni.hideLoading()
+								this.showErrorMessage(error)
+							})
+
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+
+					})
+
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+
+
+			},
+
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.toLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							var submitItem = deepCopyData(detail)
+							
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+
+							submitItem.inventoryStatus = detail.inventoryStatus;
+							submitItem.toInventoryStatus = detail.inventoryStatus;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.toPackingNumber = info.packingNumber;
+
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+
+							submitItem.fromBatch = info.batch;
+							submitItem.toBatch = info.batch;
+
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+							
+							submitItem.qty = detail.handleQty;
+							submitItem.package ="";
+							subList.push(submitItem)
+							
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.fromWarehouseCode = this.detailSource[0].subList[0].warehouseCode;
+				this.dataContent.toWarehouseCode = this.toWarehouseCode;
+				return this.dataContent;
+			},
+
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				this.toLocationCode = code;
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						detail.toLocationCode = code
+					})
+				})
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData()
+				})
+			},
+			
+			clearData(){
+				this.fromLocationCode = '';
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+				this.toWarehouseCode = ""
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/customerReturn/request/customerReturnRequest.vue b/pages/customerReturn/request/customerReturnRequest.vue
new file mode 100644
index 0000000..0feb080
--- /dev/null
+++ b/pages/customerReturn/request/customerReturnRequest.vue
@@ -0,0 +1,394 @@
+<template>
+	<view>
+		<com-empty-view v-if="requestList.length==0"></com-empty-view>
+		<request-filter ref="filter" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
+			:checkedWaitTask="checkedWaitTask">
+		</request-filter>
+		<view v-if="requestList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in requestList" :key="index">
+					<uni-swipe-action-item :right-options="item.options" @click="swipeClick($event,item)">
+						<com-return-request-card :dataContent="item" @click='openRequestDetail(item)'>
+						</com-return-request-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+			<uni-load-more :status="loadingType" v-if="requestList.length>0" />
+			<request-info-popup ref='requestInfoPopup'></request-info-popup>
+		</view>
+		<requestButton @goScan='openScanDetailPopup'></requestButton>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import requestFilter from '@/mycomponents/request/requestFilter.vue'
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import comReturnRequestCard from '@/pages/customerReturn/coms/comReturnRequestCard.vue'
+	import requestInfoPopup from '@/pages/customerReturn/coms/requestInfoPopup.vue'
+	import requestButton from '@/mycomponents/button/requestButton.vue'
+
+	import {
+		goHome,
+		updateTitle,
+		clearTirmAndWrap
+	} from '@/common/basic.js';
+
+	import {
+		getCustomerReturnRequestList,
+		customerReturnRequestClose,
+		customerReturnRequestApprove,
+		customerReturnRequestApproveAgree,
+		customerReturnRequestApproveRefused,
+		customerReturnRequestHandle,
+		customerReturnRequestAddAgain
+	} from '@/api/request2.js';
+	import {
+		getDetailOption,
+		getDetailAndApproveOption,
+		getDetailAndApprovePassAndApproveNoOption,
+		getDetailAndHandleOption,
+		getDetailAndAddAndCloseOption,
+		getAddAgainOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			requestFilter,
+			comReturnRequestCard,
+			requestInfoPopup,
+			requestButton
+		},
+		data() {
+			return {
+				requestList: [],
+				pageNo: 1,
+				pageSize: 10,
+				status: "1,2,3,4,5,6",
+				totalCount: 0,
+				checkedWaitTask: false,
+				detailOptions: [],
+				detailAndApproveOptions: [],
+				detailAndApprovePassAndApproveNoOption: [],
+				detailAndHandleOption: [],
+				detailAndAddAndCloseOption: [],
+				addAgainOption: [],
+				showOptions: [],
+				fromType: "requestType",
+				loadingType: "nomore",
+
+			};
+		},
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.addAgainOption = getAddAgainOption();
+			this.detailAndApproveOptions = getDetailAndApproveOption()
+			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
+			this.detailAndHandleOption = getDetailAndHandleOption()
+			this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
+
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+		onLoad(option) {
+			this.getList('refresh');
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+
+		mounted() {
+
+		},
+		methods: {
+			requestConfirm(action, item) {},
+
+			openRequestInfoPopup(item) {
+				this.$refs.requestInfoPopup.openPopup(item)
+			},
+			openRequestDetail(item) {
+				uni.navigateTo({
+					url: './customerReturnRequestDetail?id=' + item.id
+				});
+			},
+
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.requestList = [];
+				}
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getCustomerReturnRequestList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					list.forEach(res => {
+						var options = this.updateOptions(res.status);
+						res.options = options;
+					})
+					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
+
+					this.pageNo++;
+					updateTitle("客户退货申请(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					this.loadingType = "";
+					updateTitle("客户退货申请");
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+			updateOptions(status) {
+				if (status == "1") {
+					this.showOptions = this.detailAndApproveOptions;
+				} else if (status == "2") {
+					this.showOptions = this.detailAndApprovePassAndApproveNoOption;
+				} else if (status == "3") {
+					this.showOptions = this.detailAndHandleOption;
+				} else if (status == "4") {
+					this.showOptions = this.detailAndAddAndCloseOption;
+				} else if (status == "5") {
+					this.showOptions = this.addAgainOption;
+				} else {
+					this.showOptions = this.detailOptions;
+				}
+				return this.showOptions
+			},
+
+			openScanDetailPopup() {
+				uni.navigateTo({
+					url: "../request/customerReturnRequestCreate"
+				})
+			},
+
+
+			swipeClick(e, dataContent) {
+				var text = clearTirmAndWrap(e.content.text)
+				if (text == "详情") {
+					this.openRequestInfoPopup(dataContent);
+				} else if (text == "处理") {
+					this.showQuestionMessage("确定要处理当前申请吗?", res => {
+						this.customerReturnRequestHandle(dataContent.id)
+					})
+				} else if (text == "提交审批") {
+					this.showQuestionMessage("确定要审批当前申请吗?", res => {
+						this.customerReturnRequestApprove(dataContent.id)
+					})
+				} else if (text == "审批通过") {
+					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
+						this.customerReturnRequestApproveAgree(dataContent.id)
+					})
+				} else if (text == "审批驳回") {
+					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
+						this.customerReturnRequestApproveRefused(dataContent.id)
+					})
+				} else if (text == "关闭") {
+					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
+						this.customerReturnRequestClose(dataContent.id)
+					})
+				} else if (text == "重新添加") {
+					this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
+						this.customerReturnRequestAddAgain(dataContent.id)
+					})
+				}
+			},
+			showQuestionMessage(hint, callBack) {
+				this.$refs.comMessage.showQuestionMessage(hint,
+					res => {
+						if (res) {
+							callBack()
+						}
+					});
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getCustomerReturnRequestList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openRequestDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			customerReturnRequestApprove(id) {
+				customerReturnRequestApprove(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请提交审批成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请提交审批失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+
+			},
+
+			customerReturnRequestClose(id) {
+				customerReturnRequestClose(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请关闭成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请关闭失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			customerReturnRequestAddAgain(id) {
+				customerReturnRequestAddAgain(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请重新添加成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请重新添加失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			customerReturnRequestApproveAgree(id) {
+				customerReturnRequestApproveAgree(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批通过成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批通过失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			customerReturnRequestApproveRefused(id) {
+				customerReturnRequestApproveRefused(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批驳回成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批驳回失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			customerReturnRequestHandle(id) {
+				customerReturnRequestHandle(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请处理成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请处理失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/customerReturn/request/customerReturnRequestCreate.vue b/pages/customerReturn/request/customerReturnRequestCreate.vue
new file mode 100644
index 0000000..d972703
--- /dev/null
+++ b/pages/customerReturn/request/customerReturnRequestCreate.vue
@@ -0,0 +1,486 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="uni-flex uni-row padding title u-col-center" @click="showSelect" style="font-size: 35rpx;">
+				<text style="font-size: 32rpx;">客户 : </text>
+				<view class="uni-flex u-col-center uni-row" @click="showSelect">
+					<view class="" style="margin-left: 20rpx;font-size: 32rpx;">
+						{{customerName}}
+					</view>
+					<u-select v-model="showCustomer" mode="single-column" :list="customerList" @confirm="confirmSelect">
+					</u-select>
+				</view>
+			</view>
+
+			<view class="page-main">
+
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :isShowLocation="true"
+								:isShowBalanceQty="false" :isShowToLocation="false" @removeItem="removeItem(index,item)"
+								@updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+
+			<div class="btn_bottom">
+				<view class="" style="display: flex;flex-direction: row;">
+
+					<!-- <view class="">
+						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
+							:locationTypeList="tolocationTypeList"></requiredLocation>
+					</view> -->
+					<view class="">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</div>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' headerType="HPQ,HMQ"
+			:allowModifyLocation="false">
+		</win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+	</view>
+
+</template>
+
+<script>
+	import {
+		calc
+	} from '@/common/calc'
+	import {
+		customerReturnRequestSubmit,
+		getBasicCustomerList
+	} from '@/api/request2.js';
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+	import {
+		goHome,
+		updateTitle,
+		deepCopyData,
+		getPackingNumberAndBatchByList
+	} from '@/common/basic.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comReturnRecord from '@/pages/customerReturn/coms/comReturnRecord.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			comReturnRecord,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				dataContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				businessType: {},
+				fromLocationCode: "",
+				fromLocation: {},
+				toLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				toWarehouseCode: '',
+				customerCode: '',
+				showCustomer: false,
+				customerList: [],
+				customerName: "请选择退货客户",
+				customerCode: ""
+			};
+		},
+		onLoad(option) {
+			var typeCode = "CustomerReject"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+			getBasicCustomerList().then(res => {
+				if (res.data.length > 0) {
+					var list = res.data;
+					list.forEach(item => {
+						item.label = item.name
+						item.value = item.code
+					})
+					this.customerList = list;
+				}
+			}).catch(error => {
+
+			})
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {
+
+		},
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			calcHandleQty() {
+				calcHandleQty(this.detailSource);
+				this.$forceUpdate();
+			},
+
+
+			updateData() {
+				this.calcHandleQty();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+
+			},
+
+			commit() {
+				if (this.customerName == ""||this.customerName == "请选择退货客户") {
+					this.showErrorMessage("请选择退货客户")
+					return;
+				}
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					//客户退货默认推到hold库
+					var params = this.setParams()
+					console.log("提交" + JSON.stringify(params))
+					customerReturnRequestSubmit(params).then(res => {
+						uni.hideLoading()
+						if (res.data) {
+							this.showCommitSuccessMessage("提交成功<br>生成客户退货申请<br>" + res.data)
+						} else {
+							this.showErrorMessage("提交失败[" + res.msg + "]")
+						}
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error)
+					})
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+			},
+
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.toLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var submitItem = deepCopyData(detail)
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+
+							submitItem.inventoryStatus = detail.inventoryStatus;
+							submitItem.toInventoryStatus = 'HOLD';
+
+							submitItem.fromPackingNumber = detail.packingNumber;
+							submitItem.toPackingNumber = detail.packingNumber;
+
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+
+							submitItem.fromBatch = detail.batch;
+							submitItem.toBatch = detail.batch;
+
+							submitItem.qty = detail.handleQty;
+
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = 'HOLD';
+
+							submitItem.package = ""
+
+							subList.push(submitItem)
+						}
+					})
+				})
+
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.customerCode = this.customerCode;
+				this.dataContent.fromWarehouseCode = this.fromLocation.warehouseCode;
+				this.dataContent.toWarehouseCode = this.toWarehouseCode;
+
+				return this.dataContent;
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				this.toLocationCode = code;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData()
+				})
+			},
+
+			clearData() {
+				this.fromLocationCode = '';
+				this.fromLocation = ''
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+				this.toWarehouseCode = ""
+				this.customerName ="请选择退货客户"
+				this.customerCode =""
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			confirmSelect(e) {
+				this.customerName = e[0].label
+				this.customerCode = e[0].value
+			},
+
+			showSelect() {
+				this.showCustomer = true
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/customerReturn/request/customerReturnRequestDetail.vue b/pages/customerReturn/request/customerReturnRequestDetail.vue
new file mode 100644
index 0000000..d6c8752
--- /dev/null
+++ b/pages/customerReturn/request/customerReturnRequestDetail.vue
@@ -0,0 +1,125 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<request-top :dataContent="requestContent"></request-top>
+			</view>
+			<view class="header_item">
+				客户代码 : {{requestContent.customerCode}}
+			</view>
+			<u-line color="#D8D8D8" />
+		</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comRequestDetailCard :dataContent="item" 
+							 @openDetail="openDetail">
+						</comRequestDetailCard>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<requestDetailInfoPopup ref="jobDetailPopup"></requestDetailInfoPopup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getCustomerReturnRequestDetail,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource,
+	} from '@/common/detail.js';
+
+
+	import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
+	import requestDetailInfoPopup from '@/pages/customerReturn/coms/requestDetailInfoPopup.vue'
+	import requestTop from "@/mycomponents/request/requestTop.vue"
+	
+	export default {
+		components: {
+			comRequestDetailCard,
+			requestDetailInfoPopup,
+			requestTop
+		},
+		data() {
+			return {
+				id: '',
+				requestContent: {}, //任务内容
+				subList: [], //接口返回的任务details
+				detailSource: [], //绑定在页面上的数据源
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			this.getDetail();
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getCustomerReturnRequestDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+					if (res.data.subList.length > 0) {
+						that.requestContent = res.data;
+						that.subList = res.data.subList;
+						that.detailSource = getDataSource(that.subList);
+					} else {
+						that.showMessage('列表数据为0');
+					}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+			},
+			
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+					}
+				});
+			},
+
+			openDetail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/deliver/coms/comDeliverDetailCard.vue b/pages/deliver/coms/comDeliverDetailCard.vue
new file mode 100644
index 0000000..81c35f2
--- /dev/null
+++ b/pages/deliver/coms/comDeliverDetailCard.vue
@@ -0,0 +1,170 @@
+<template>
+	<view>
+		<!-- <requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode"
+			:isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation> -->
+
+		<view v-for="(item,index) in dataContent.Items">
+			<uni-collapse ref="collapse">
+				<uni-collapse-item :open="true">
+					<template v-slot:title>
+						<!-- 物品 -->
+						<item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
+					</template>
+					<u-line />
+					<view v-for="(loacation,index) in item.Locations">
+						<view>
+							<view class="uni-flex uni-row space-between">
+								<!-- 推荐库位 -->
+								<location :locationCode="loacation.fromLocationCode">
+								</location>
+							</view>
+							<view v-for="(batch,index) in loacation.Batchs">
+								<recommend-balance style='margin-left: 20px;' :detail="batch"
+									:isShowLocation="false" :isShowPack="batch.packingNumber!=null && batch.packingNumber!=''">
+								</recommend-balance>
+								<view class="uni-flex uni-row" v-if='batch.Records.length>0'>
+									<view class="center " style=" width: 20px; color: #0CC2B6; margin-left: 40px;">
+										实际
+									</view>
+									<view class="uni-flex uni-column" style="width: 100%;">
+										<view v-for="(record,index) in batch.Records">
+											<uni-swipe-action ref="swipeAction">
+												<uni-swipe-action-item @click="swipeClick($event,batch,record,index)"
+													:right-options="scanOptions">
+													<handle-balance :detail="record" :isShowLocation="false"
+														:isShowBatch="batch.packingNumber!=null">
+													</handle-balance>
+												</uni-swipe-action-item>
+											</uni-swipe-action>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</uni-collapse-item>
+			</uni-collapse>
+		</view>
+	</view>
+	<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+	<comMessage ref="message"></comMessage>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
+	import handleBalance from '@/mycomponents/balance/handleBalance.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
+
+	import {
+		getDetailOption,
+		getEditRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		emits: ['updateData'],
+		components: {
+			itemQty,
+			recommend,
+			recommendBalance,
+			handleBalance,
+			recommendQtyEdit,
+			requiredLocation,
+			balanceQtyEdit,
+			location,
+			detailInfoPopup
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				option: [],
+				showItem: {},
+				editItem: {},
+				batchItem: {},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getEditRemoveOption();
+		},
+
+		methods: {
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.collapse.forEach(r => {
+						r.childrens.forEach(i => {
+							i.init();
+						})
+						r.resize();
+					})
+				});
+			},
+
+			swipeClick(e, batch, record, index) {
+				if (e.content.text == "编辑") {
+					this.edit(batch, record)
+				} else if (e.content.text == "移除") {
+					this.remove(batch, record, index)
+				}
+			},
+
+			edit(batch, item) {
+				let that = this;
+				that.editItem = item;
+				that.batchItem = batch;
+				item.balance.balanceQty=item.balance.qty;
+				that.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(batch, record, index) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							batch.Records.splice(index, 1);
+							this.resizeCollapse();
+							this.$emit('updateData', record)
+						}
+					});
+			},
+			confirm(val) {
+				this.editItem.qty = val;
+				this.$emit('updateData', this.editItem)
+				// let qty = 0;
+				// this.batchItem.Records.forEach(r => {
+				// 	qty += Number(r.qty);
+				// })
+				// this.batchItem.handleQty = qty;
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/deliver/coms/comDeliverJobCard.vue b/pages/deliver/coms/comDeliverJobCard.vue
new file mode 100644
index 0000000..6daab45
--- /dev/null
+++ b/pages/deliver/coms/comDeliverJobCard.vue
@@ -0,0 +1,50 @@
+<template>
+ 	<job-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				<view class="">
+ 					申请单号 : {{dataContent.requestNumber}}
+ 				</view>
+ 			</view>
+
+ 			<view class="task_text">
+ 				<view class="">
+ 					发货计划单号 : {{dataContent.deliverPlanNumber}}
+ 				</view>
+ 			</view>
+
+ 			<view class="task_text">
+ 				<view class="">
+ 					客户代码 : {{dataContent.customerCode}}
+ 				</view>
+ 			</view>
+ 		</view>
+ 	</job-com-main-card>
+ </template>
+
+ <script>
+ 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			jobComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/deliver/coms/comDeliverRequestCard.vue b/pages/deliver/coms/comDeliverRequestCard.vue
new file mode 100644
index 0000000..5c26c19
--- /dev/null
+++ b/pages/deliver/coms/comDeliverRequestCard.vue
@@ -0,0 +1,36 @@
+<template>
+ 	<request-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				客户代码 : {{dataContent.customerCode}}
+ 			</view>
+ 		</view>
+ 	</request-com-main-card>
+ </template>
+
+ <script>
+ 	import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			requestComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/deliver/coms/comDeliverRequestCreator.vue b/pages/deliver/coms/comDeliverRequestCreator.vue
new file mode 100644
index 0000000..5f75ab3
--- /dev/null
+++ b/pages/deliver/coms/comDeliverRequestCreator.vue
@@ -0,0 +1,59 @@
+<template>
+	<view class="">
+		<uni-collapse ref="collapse">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<view class="page-header" style="font-size: 32rpx;">
+						<view class="page-item">
+							{{dataContent.customerCode }} ({{dataContent.customerName}})
+						</view>
+					</view>
+				</template>
+				<uni-swipe-action ref="swipeAction">
+					<view v-for="(item, index) in dataContent.subList" :key="index">
+						<uni-swipe-action-item>
+							<item-qty :dataContent="item"></item-qty>
+						</uni-swipe-action-item>
+					</view>
+				</uni-swipe-action>
+			</uni-collapse-item>
+		</uni-collapse>
+	</view>
+</template>
+
+<script>
+	import uom from '@/mycomponents/qty/uom.vue'
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	export default {
+		components: {
+			uom,
+			itemQty
+		},
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+		methods: {
+			update() {
+				this.$nextTick(r => {
+					this.$refs.collapse.resize()
+				});
+			}
+
+
+
+
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/deliver/coms/comDeliverRequestPopup.vue b/pages/deliver/coms/comDeliverRequestPopup.vue
new file mode 100644
index 0000000..84f6101
--- /dev/null
+++ b/pages/deliver/coms/comDeliverRequestPopup.vue
@@ -0,0 +1,297 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup" :maskClick="false">
+			<view class="uni-flex uni-column pop_customer">
+				<view class="" style="padding:10rpx">
+					<view class="uni-flex u-col-center uni-row space-between" style="padding: 10rpx 10rpx 20rpx 10rpx">
+						<view class="" style="font-size: 35rpx;">
+							{{title}}
+						</view>
+						<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
+							@click="closeRequestPopup()"></image>
+					</view>
+					<u-line />
+					<view class="uni-flex uni-column" style="background-color: white; ">
+						<view class="uni-flex uni-column  ">
+							<view class="uni-flex uni-row padding title u-col-center">
+								<text>客户 : </text>
+								<view class="uni-flex u-col-center uni-row" @click="showSelect">
+									<view class="" style="margin-left: 20rpx;">
+										{{customerName}}
+									</view>
+									<u-select v-model="showCustomer" mode="single-column" :list="customerList"
+										@confirm="confirmSelect"></u-select>
+								</view>
+							</view>
+							<u-line />
+					
+							<view class="uni-flex uni-row padding title u-col-center">
+								<text>物料 : </text>
+								<view class="uni-flex u-col-center uni-row">
+									<u-input v-model="itemCode" :focus="itemCodeFocus" :border="true"
+										placeholder="请输入需求物料" @confirm="itemCodeConfirm" />
+									<image src="/static/search.svg" mode=""
+										style=" width: 40rpx;height: 40rpx;margin-left: 10rpx;" @click="itemCodeClick">
+									</image>
+					
+								</view>
+							</view>
+							<u-line />
+					
+							<view class="uni-flex uni-row  padding title u-col-center">
+								<text>数量 : </text>
+								<view class="uni-flex uni-row uni-center"
+									style="align-items: center;margin-left: 20rpx;">
+									<input style="text-align: center;" class="qty_input" v-model="counQty" type="number" 
+										@confirm="confirm()" :focus="numberFocus"  @input="checkNum" :maxlength="maxlength" />
+									
+									<uom :uom="uom"></uom>
+									<!-- <view class="" v-if="stdPackInfo!=undefined" style="display: flex;flex-direction: row;margin-left: 10rpx;">
+										(<stdPackQty :dataContent="stdPackInfo"></stdPackQty>)
+									</view> -->
+					
+								</view>
+							</view>
+							<u-line />
+						</view>
+					</view>
+				</view>
+				<view class="uni-flex uni-row hide_border">
+					<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button>
+					<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button>
+				</view>
+			</view>
+		</uni-popup>
+
+		<comMessage ref="comMessage"></comMessage>
+		<selectList ref='selectList' @selectedItem="selectedItem"></selectList>
+	</view>
+</template>
+
+<script>
+	import {
+		getBasicLocationByCode,
+		getBasicItemByCode,
+		getProductionlineItem,
+		getWorkShopLineStation,
+		getBasicCustomerList,
+	} from '@/api/request2.js';
+	import {
+		getLocationTypeName,
+		getListLocationTypeDesc,
+		checkDirectoryItemExist
+	} from '@/common/directory.js';
+	import uom from '@/mycomponents/qty/uom.vue'
+	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
+	import selectList from '@/mycomponents/popup/selectList.vue'
+
+
+	export default {
+		components: {
+			uom,
+			balanceStatus,
+			selectList
+		},
+		data() {
+			return {
+				// itemCode: 'CE115F11161AG',
+				itemCode: '',
+				itemName: "",
+				qty: 0,
+				itemCodeFocus: false,
+				requestInfo: null,
+				itemCodeList: [],
+				isCheckItemCode: false,
+				counQty: undefined,
+				editPosition: true,
+				numberFocus: false,
+				uom: "",
+				showCustomer: false,
+				isModifiedPosition: true,
+				customerList: [],
+				customerName: "请选择客户",
+				customerCode:"",
+				maxlength:10,
+				stdPackInfo:undefined
+			}
+		},
+		props: {
+			title: {
+				type: String,
+				default: '需求信息'
+			},
+		},
+		methods: {
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //包含小数点
+				let reg = /^[0-9]+$/; //正整数
+				if (dot > -1) {
+					this.maxlength = dot + 7; //长度是小数点后两位
+					if (value.length > dot + 7) {
+			
+					}
+				}
+				if (reg.test(value)) { //如果是正整数不包含小数点
+					this.maxlength = 10;
+				}
+				this.change(value)
+			},
+			openRequestPopup(editPosition) {
+				if (this.customerList.length == 0) {
+					getBasicCustomerList().then(res => {
+						if (res.data.length > 0) {
+							var list = res.data;
+							list.forEach(item => {
+								item.label = item.name
+								item.value = item.code
+							})
+							this.customerList = list;
+						}
+					}).catch(error => {
+
+					})
+				}
+
+				this.editPosition = editPosition;
+				if (this.isModifiedPosition) {
+					this.isModifiedPosition = false
+				} else {
+					this.itemCode = "";
+					this.uom = ""
+					this.qty = 0
+					this.counQty =undefined;
+					this.itemCodeGetFocus();
+				}
+
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closeRequestPopup() {
+				this.$refs.popup.close()
+			},
+			locationConfirm() {
+				//查询库位信息
+				this.checkLocatioCode();
+			},
+			itemCodeClick() {
+				if (this.customerName == "请选择客户") {
+					this.showErrorMessage("请选择客户")
+					return
+				}
+				this.$refs.selectList.queryList(this.customerCode)
+
+			},
+
+			itemCodeGetFocus() {
+				this.itemCodeFocus = true;
+			},
+			itemCodeLoseFocus() {
+				this.itemCodeFocus = false;
+			},
+			selectedItem(item) {
+				this.itemCode = item.itemCode;
+				this.checkItemCode();
+			},
+
+			confirm() {
+				if (this.itemCode == "" || !this.isCheckItemCode) {
+					this.showErrorMessage("请输入物料", "itemCode")
+					return
+				}
+				if (this.counQty == undefined) {
+					this.showErrorMessage("请输入数量")
+					return
+				}
+				
+				if (this.qty == 0) {
+					this.showErrorMessage("数量必须大于0")
+					return
+				}
+
+				this.callback('add');
+
+			},
+			
+			confirmSelect(e){
+				this.customerName = e[0].label
+				this.customerCode = e[0].value
+			},
+
+			checkItemCode() {
+				//校验物料
+				getBasicItemByCode(this.itemCode).then(res => {
+					uni.hideLoading();
+					if (res.data != null && res.data.list.length > 0) {
+						this.itemCode = res.data.list[0].code;
+						this.itemName = res.data.list[0].name
+						this.isCheckItemCode = true;
+						this.numberFocus = true
+						this.uom = res.data.list[0].uom
+					} else {
+						this.showErrorMessage('未查找到物料【' + this.itemCode + '】', "itemCode");
+					}
+
+				}).catch(error => {
+					uni.hideLoading();
+					this.showErrorMessage(error, "itemCode");
+				})
+			},
+
+
+			callback(action) {
+				let item = {
+					customerName :this.customerName,
+					customerCode:this.customerCode,
+					itemCode: this.itemCode,
+					itemName: this.itemName,
+					uom: this.uom,
+					qty: this.qty
+				};
+				this.closeRequestPopup();
+				this.$emit("confirm", action, item);
+			},
+
+			showErrorMessage(message, type) {
+				setTimeout(r => {
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (type == "itemCode") {
+							this.itemCodeGetFocus();
+						} else {
+							this.numberFocus = true;
+						}
+					})
+					if (type == "itemCode") {
+						this.itemCode = ""
+						this.isCheckItemCode = false;
+					}
+				})
+			},
+			itemCodeConfirm() {
+				this.checkItemCode();
+			},
+			change(value) {
+				this.qty = value;
+			},
+			cancel(e) {
+				this.closeRequestPopup();
+			},
+			showSelect() {
+				if (this.editPosition) {
+					this.showCustomer = true
+				}
+
+			},
+		
+
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.title {
+		font-size: 30rpx;
+	}
+</style>
diff --git a/pages/deliver/coms/comScanDeliverPack.vue b/pages/deliver/coms/comScanDeliverPack.vue
new file mode 100644
index 0000000..4339bef
--- /dev/null
+++ b/pages/deliver/coms/comScanDeliverPack.vue
@@ -0,0 +1,531 @@
+<template>
+	<view>
+		<uni-popup ref="popup" :maskClick='false'>
+			<view class="">
+				<view class="popup_box">
+					<view class="pop_title uni-flex space-between">
+						<view class="" style="font-size: 35rpx;">
+							扫描箱码
+						</view>
+					
+						<view class="">
+							<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
+								@click="closeScanPopup()"></image>
+						</view>
+					</view>
+					
+					<!-- <view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						padding:20rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center">
+							位置 :
+						</view>
+						<view class="" style="width: 75%;padding: 0rpx">
+							<view class="uni-flex u-col-center uni-row" @click="showSelect">
+								<view class="" style="margin-left: 15rpx;font-size: 30rpx;">
+									{{positionInfo}}
+								</view>
+								<u-select v-model="show" mode="mutil-column-auto" :list="positionList" :defaultValue="defaultValueList"
+									@confirm="confirmSelect"></u-select>
+							</view>
+						</view>
+					</view>
+					<u-line class='line_color'></u-line> -->
+
+					<view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						margin-top: 8rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center" style="width: 25%; ">
+							来源库位
+						</view>
+						<view class="" style="width: 75%; padding: 8rpx;">
+							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请选择库位"
+								@confirm="fromLocationUpdate"></uni-combox>
+						</view>
+					</view>
+
+					<view class="">
+						<view class="">
+							<win-com-scan ref="comscan" placeholder="箱标签" @getResult="onScan" :clearResult="true"
+								:headerType="headerType" :isShowHistory="false">
+							</win-com-scan>
+
+							<view style="width: 100%;">
+								<view style="width: 100%;" v-if="issueRecord.length>0">
+									<view class="uni-flex uni-row space-between u-col-center">
+										<view class="" style="padding: 10rpx;">
+											历史记录
+										</view>
+										<view class="" style="padding-right: 10rpx;">
+											<u-icon :name="expendIcon" size="35rpx" @click="expands()"></u-icon>
+										</view>
+									</view>
+									<u-line class='line_color' style='padding-top: 10rpx;padding-bottom: 20rpx;'>
+									</u-line>
+									<scroll-view scroll-y="true" class="scroll-view"
+										v-if="expand&&issueRecord.length>0">
+										<view class="uni-flex u-col" v-for="(record,index) in issueRecord">
+											<view style="width: 100%;">
+												<uni-swipe-action ref="swipeAction">
+													<uni-swipe-action-item @click="swipeClick($event,record,index)"
+														:right-options="scanOptions">
+														<view style="padding: 0px 10px">
+															<balance :dataContent="record" :isShowLocation="false"
+																:isShowStdPack="false"></balance>
+														</view>
+													</uni-swipe-action-item>
+												</uni-swipe-action>
+												<u-line class='line_color'></u-line>
+											</view>
+										</view>
+									</scroll-view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+		<comMessage ref="comMessage"></comMessage>
+		<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	</view>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+
+
+	import {
+		calc
+	} from '@/common/calc.js';
+	import {
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+
+	import {
+		getBalanceByManagementPrecision
+	} from '@/common/balance.js';
+
+	export default {
+		name: 'winScanPack',
+		components: {
+			winComScan,
+			balance,
+			balanceQtyEdit,
+			balanceSelect
+		},
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			headerType: {
+				type: String,
+				default: "HPQ,HMQ"
+			},
+
+
+		},
+		data() {
+			return {
+				dataContent: {},
+				jobContent: {},
+				expendIcon: 'arrow-down',
+				show: false,
+				scanList: [],
+				toLocation: null,
+				toLocationCode: '',
+				fromLocationList: [],
+				fromLocationCode: '',
+				fromLocation: null,
+				issueRecord: [], //发货历史
+				expand: true,
+				scanOptions: {},
+				editItem: {},
+				positionInfo: "请选择位置",
+				positionList: [],
+				defaultValueList: [],
+				label: {},
+				fromInventoryStatuses: "",
+				packageInfo: {}
+			}
+		},
+		created() {
+
+		},
+		watch: {},
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+		},
+		methods: {
+			openScanPopup(content, jobcontent) {
+				this.issueRecord = [];
+				this.dataContent = content;
+				this.jobContent = jobcontent;
+				this.initData();
+				this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
+					"-" + this.jobContent.subList[0].workStationCode
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+
+			closeScanPopup() {
+				this.$refs.popup.close();
+				this.$emit("closeScan")
+				//清除数据，恢复默认值
+				// Object.assign(this.$data, this.$options.data());
+			},
+
+			initData() {
+				let that = this;
+				that.fromLocationList = [];
+				if (that.dataContent != null) {
+					that.fromInventoryStatuses = this.jobContent.outInventoryStatuses
+					that.toLocation = that.dataContent[0];
+					that.toLocationCode = that.dataContent[0].toLocationCode;
+					that.fromLocationList = that.getFromLocationList();
+				}
+			},
+
+			showBalanceSelect(items, packageInfo) {
+				this.packageInfo = packageInfo;
+				this.$refs.balanceSelect.openPopup(items);
+			},
+
+			getFromLocationList() {
+				let list = [];
+				let location = this.dataContent.find(r => r.toLocationCode == this.toLocationCode);
+				if (location != undefined) {
+					location.Items.forEach(item => {
+						item.Locations.forEach(f => {
+							list.push(f.fromLocationCode)
+						})
+					})
+					this.fromLocationCode = list[0];
+					return list;
+				} else {
+					this.$refs.comMessage.showErrorMessages('需求库位【' + this.toLocationCode + '】不存在', res => {
+						this.toLocationCode = '';
+					});
+				}
+			},
+
+			fromLocationUpdate(fromlocation) {
+				let location = this.fromLocationList.find(r => r == fromlocation)
+				if (location == undefined) {
+					this.fromLocationCode = ''
+					this.showErrorMessage('发货库位【' + fromlocation + '】不存在')
+				}
+			},
+			onScan(result) {
+				try {
+					let that = this;
+
+					if (that.fromLocationCode == '') {
+						that.showErrorMessage('请选择来源库位', res => {
+							that.$refs.toLocationCombox.onFocus();
+						});
+						return;
+					}
+					let packageInfo = result.package;
+					let itemCode = result.label.itemCode;
+					let packingCode = result.label.packingNumber;
+					let lot = result.label.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+					if (item == undefined) {
+						that.showErrorMessage('未查找到物料【' + itemCode + '】的发货明细',
+							res => {
+								that.getfocus();
+							}
+						)
+						return;
+					} else {
+						//查找库存信息
+						uni.showLoading({
+							title: '加载中',
+							mask: true
+						})
+						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
+							balanceRes => {
+								if (balanceRes.success) {
+									if (balanceRes.data.list.length == 0) {
+										this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
+											res => {
+												this.packGetFocus();
+											})
+									} else if (balanceRes.data.list.length == 1) {
+										let balance = balanceRes.data.list[0];
+										this.afterGetBalance(result.label, balance, packageInfo);
+									} else {
+										this.label = result.label;
+										this.showBalanceSelect(balanceRes.data.list, packageInfo);
+									}
+								} else {
+									this.showErrorMessage(balanceRes.message.message);
+								}
+								uni.hideLoading();
+							});
+					}
+				} catch (e) {
+					this.showErrorMessage(e.stack)
+					uni.hideLoading();
+				}
+			},
+
+			selectBalanceItem(balance) {
+				this.afterGetBalance(this.label, balance, this.packageInfo);
+			},
+
+
+			afterGetBalance(label, balance, packageInfo) {
+				try {
+					let that = this;
+					let itemCode = label.itemCode;
+					let packingCode = label.packingNumber;
+					let lot = label.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+					let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode);
+					if (fromLocation != undefined) {
+						let batch = fromLocation.Batchs.find(r => r.batch == lot);
+						if (batch != undefined) {
+							if (batch.Records == undefined) {
+								batch.Records = [];
+							}
+
+							let record = batch.Records.find(r => r.packingNumber == packingCode);
+							if (record == undefined) {
+								//如果有推荐箱码
+								if (batch.Recommends.length > 0) {
+									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
+									if (recommend != undefined) {
+										that.addRecord(batch, label, balance, packageInfo)
+									} else {
+										//允许修改箱码
+										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
+											that.addRecord(batch, label, balance, packageInfo);
+										} else {
+											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
+												res => {
+													that.getfocus();
+												}
+											)
+										}
+									}
+								} else {
+									that.addRecord(batch, label, balance, packageInfo)
+								}
+							} else {
+								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
+									res => {
+										that.getfocus();
+									}
+								)
+							}
+						} else {
+							if (this.jobContent.AllowModifyBatch == null) {
+								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
+									'】的发货明细,是否要继续发货?', res => {
+										if (res) {
+											let batch = that.createBatchInfo(label, balance);
+											fromLocation.Batchs.unshift(batch);
+										}
+									})
+							} else {
+								that.showErrorMessage('未查找到批次【' + lot + '】的发货明细',
+									res => {
+										that.getfocus();
+									});
+							}
+						}
+					} else {
+						that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发货明细',
+							res => {
+								that.getfocus();
+							}
+						)
+					}
+				} catch (e) {
+					that.showErrorMessage(e.stack,
+						res => {
+							that.getfocus();
+						}
+					)
+				}
+			},
+
+			createBatchInfo(data, balance) {
+				let batch = {
+					batch: data.lot,
+					qty: 0,
+					uom: data.uom,
+					handleQty: Number(data.qty),
+					Records: []
+				}
+				let record = this.creatRecord(data, balance);
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				return batch;
+			},
+
+			creatRecord(label, balance, packageInfo) {
+				balance.stdPackQty = packageInfo.stdPackQty
+				balance.stdPackUnit = packageInfo.stdPackUnit
+				let record = {
+					itemCode: label.itemCode,
+					packingNumber: label.packingNumber,
+					batch: label.batch,
+					qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty),
+					uom: balance.uom,
+					inventoryStatus: balance.inventoryStatus,
+					balance: balance,
+					toLocationCode: this.toLocationCode,
+					supplierCode: label.supplierCode
+				}
+				return record;
+			},
+
+			calcBatchHandleQty(batch) {
+				let handleQty = 0;
+				batch.Records.forEach(res => {
+					handleQty = calc.add(handleQty,res.qty)
+				})
+				batch.handleQty = handleQty;
+			},
+
+			addRecord(batch, label, balance, packageInfo) {
+				let record = this.creatRecord(label, balance, packageInfo);
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				this.calcBatchHandleQty(batch);
+				this.getfocus();
+			},
+
+			getfocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			losefocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+
+			expands() {
+				this.expand = !this.expand;
+				this.expendIcon = this.expand == true ? "arrow-down" : "arrow-up"
+			},
+
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				// item.balance.balanceQty = item.balance.qty;
+				item.balance.balanceQty = item.balance.qty;
+				this.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(record, index) {
+				this.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							record.qty = 0;
+							this.issueRecord.splice(index, 1)
+
+							let item = this.toLocation.Items.find(r => r.itemCode == record.itemCode);
+							if (item != undefined) {
+								item.Locations.forEach(l => {
+									let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b
+										.batch == record.batch);
+									let rIndex = batch.Records.findIndex(r => r.packingNumber == record
+										.packingNumber && r
+										.batch == record.batch);
+									batch.Records.splice(rIndex, 1);
+								})
+							}
+							this.$emit('updateData', item);
+						}
+					});
+			},
+
+			packGetFocus() {
+				this.$refs.comscan.getfocus();
+			},
+			packLoseFocus() {
+				this.$refs.comscan.losefocus();
+			},
+			showMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showMessage(message, callback);
+				})
+			},
+			showErrorMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, callback);
+
+				})
+			},
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, callback);
+				})
+			},
+			confirm(val) {
+				this.editItem.qty = Number(val);
+				this.$emit('updateData', this.editItem)
+			},
+			cancle() {
+				this.closeScanPopup()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	button {
+		border: none;
+	}
+
+	button::after {
+		border: none
+	}
+
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+		padding: 10rpx;
+	}
+</style>
diff --git a/pages/deliver/coms/detailInfoPopup.vue b/pages/deliver/coms/detailInfoPopup.vue
new file mode 100644
index 0000000..487c199
--- /dev/null
+++ b/pages/deliver/coms/detailInfoPopup.vue
@@ -0,0 +1,57 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">销售订单号 : </text>
+							<text class="text_wrap">{{dataContent.SoNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">销售订单行 : </text>
+							<text class="text_wrap">{{dataContent.SoLine}} </text>
+						</view>
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/deliver/coms/jobInfoPopup.vue b/pages/deliver/coms/jobInfoPopup.vue
new file mode 100644
index 0000000..831b56e
--- /dev/null
+++ b/pages/deliver/coms/jobInfoPopup.vue
@@ -0,0 +1,76 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">发货计划单号 : </text>
+							<text class="text_wrap">{{dataContent.DeliverPlanNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">客户发货单号 : </text>
+							<text class="text_wrap">{{dataContent.CustomerDeliverNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">客户代码 : </text>
+							<text class="text_wrap">{{dataContent.CustomerCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">客户月台代码 : </text>
+							<text class="text_wrap">{{dataContent.CustomerDockCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">承运商 : </text>
+							<text class="text_wrap">{{dataContent.carrierCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">运输方式 : </text>
+							<text class="text_wrap">{{dataContent.transferMode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">车牌号 : </text>
+							<text class="text_wrap">{{dataContent.vehiclePlateNumber}} </text>
+						</view>
+					</view>
+				</view>
+				<u-line></u-line>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				this.$refs.popup.open('bottom')
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/deliver/coms/jobListPopup.vue b/pages/deliver/coms/jobListPopup.vue
new file mode 100644
index 0000000..f58edcf
--- /dev/null
+++ b/pages/deliver/coms/jobListPopup.vue
@@ -0,0 +1,47 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-deliver-job-card :dataContent="item" @click='selectItem(item)'></com-deliver-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	import comDeliverJobCard from '@/pages/deliver/coms/comDeliverJobCard.vue'
+	
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comDeliverJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/deliver/coms/requestDetailInfoPopup.vue b/pages/deliver/coms/requestDetailInfoPopup.vue
new file mode 100644
index 0000000..ac7ff32
--- /dev/null
+++ b/pages/deliver/coms/requestDetailInfoPopup.vue
@@ -0,0 +1,87 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<requestDetailCommonInfo :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						
+						
+						<view class="item">
+							<text class="item_title">销售订单号 : </text>
+							<text class="text_wrap">{{dataContent.soNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">销售订单行 : </text>
+							<text class="text_wrap">{{dataContent.soLine}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">包装号 : </text>
+							<text class="text_wrap">{{dataContent.packingNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">器具号 : </text>
+							<text class="text_wrap">{{dataContent.containerNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">批次 : </text>
+							<text class="text_wrap">{{dataContent.batch}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">库存状态 : </text>
+							<text class="text_wrap">{{dataContent.inventoryStatus}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到库位代码 : </text>
+							<text class="text_wrap">{{dataContent.toLocationCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从货主代码 : </text>
+							<text class="text_wrap">{{dataContent.fromOwnerCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到货主代码 : </text>
+							<text class="text_wrap">{{dataContent.toOwnerCode}} </text>
+						</view>
+					</view>
+				</view>
+			</requestDetailCommonInfo>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue'
+	export default {
+		components: {
+			requestDetailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/deliver/coms/requestInfoPopup.vue b/pages/deliver/coms/requestInfoPopup.vue
new file mode 100644
index 0000000..6ecf270
--- /dev/null
+++ b/pages/deliver/coms/requestInfoPopup.vue
@@ -0,0 +1,99 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<request-common-info :dataContent="dataContent"  @onClose="closePopup">
+				<view class="">
+					<comListItem :dataList="dataList"></comListItem>
+				</view>
+				
+				<u-line></u-line>
+			</request-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestCommonInfo from '@/mycomponents/request/requestCommonInfo.vue'
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+		components: {
+			requestCommonInfo,
+			comListItem
+		},
+		data() {
+			return {
+				dataContent:{},
+				dataList:[]
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				this.dataList=[{
+						title: '发货计划单号',
+						content: this.dataContent.deliverPlanNumber
+					}, {
+						title: '客户发货单号',
+						content: this.dataContent.customerDeliverNumber
+					},{
+						title: '客户代码',
+						content: this.dataContent.customerCode,
+					},{
+						title: '客户月台代码',
+						content: this.dataContent.customerDockCode,
+					},{
+						title: '承运商',
+						content: this.dataContent.carrierCode,
+					},{
+						title: '运输方式',
+						content: this.dataContent.transferMode,
+					},{
+						title: '车牌号',
+						content: this.dataContent.vehiclePlateNumber,
+					},{
+						title: '从月台代码',
+						content: this.dataContent.fromDockCode,
+					},{
+						title: '从仓库代码',
+						content: this.dataContent.fromWarehouseCode,
+					},{
+						title: '到仓库代码',
+						content: this.dataContent.toWarehouseCode
+					},
+					{
+						title: '从库位类型范围',
+						content: this.dataContent.fromLocationTypes,
+						type:"locationType"
+					},
+					{
+						title: '到库位类型范围',
+						content: this.dataContent.toLocationTypes,
+						type:"locationType"
+					},
+					{
+						title: '从库区代码范围',
+						content: this.dataContent.fromAreaCodes
+					},
+					{
+						title: '到库区代码范围',
+						content: this.dataContent.toAreaCodes
+					}];
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/deliver/job/deliverDetail.vue b/pages/deliver/job/deliverDetail.vue
new file mode 100644
index 0000000..26c8979
--- /dev/null
+++ b/pages/deliver/job/deliverDetail.vue
@@ -0,0 +1,462 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号：{{jobContent.requestNumber}}
+			</view>
+			<u-line color="#D8D8D8"></u-line>
+			<view class="cen_card" style="padding: 5rpx;">
+				<view class="cell_box uni-flex uni-row">
+					<view class="cell_info">
+						<view class="text_lightblue">客户代码</view>
+						<view>{{jobContent.customerCode}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">客户寄售库</view>
+						<view>{{toLocationCode}}</view>
+					</view>
+				</view>
+				<u-line />
+			</view>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="">
+				<view v-for="(toLocation, index) in detailSource">
+					<comDeliverDetailCard ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
+					</comDeliverDetailCard>
+				</view>
+			</scroll-view>
+		</view>
+
+		<div class="btn_bottom">
+			<view class="" style="display: flex;flex-direction: row;">
+				<view class="">
+					<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+				</view>
+			</view>
+		</div>
+		<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
+		<comScanDeliverPack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
+		</comScanDeliverPack>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getDeliverDetail,
+		getBasicLocationByCode,
+		takeDeliverJob,
+		cancleTakeDeliverJob,
+		deliverJobSubmit
+	} from '@/api/request2.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		goHome,
+		updateTitle,
+		navigateBack,
+		getRemoveOption,
+		getCurrDateTime,
+		getDirectoryItemArray,
+		getPackingNumberAndBatch,
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource
+	} from '@/pages/issue/js/issue.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comDeliverDetailCard from '@/pages/deliver/coms/comDeliverDetailCard.vue'
+	import comScanDeliverPack from '@/pages/deliver/coms/comScanDeliverPack.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+
+	export default {
+		name: 'issueDetail',
+		components: {
+			jobDetailPopup,
+			winScanButton,
+			comDeliverDetailCard,
+			comScanDeliverPack,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				status: "",
+				toLocationCode: "",
+				jobStatus:""
+			};
+		},
+
+		props: {
+
+		},
+
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务	
+					cancleTakeDeliverJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeDeliverJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getDeliverDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status;
+							
+							that.subList = res.data.subList;
+							that.detailSource = getDataSource(that.detailSource, that.subList)
+							that.toLocationCode = that.subList[0].toLocationCode
+							that.resizeCollapse();
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			closeScan() {
+				this.resizeCollapse();
+			},
+
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.comIssueDetailCard.forEach(r => {
+						r.resizeCollapse();
+					})
+				});
+			},
+
+
+
+			submit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				//目前任务只到一个库位
+				var itemCodes = []
+				let locationCode = this.detailSource[0].toLocationCode
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						itemCodes.push(item.itemCode)
+					})
+				})
+
+				//使用在途库，不查询管理模式
+				if (locationCode == null) {
+					this.submitJob();
+				} else {
+					//获取管理模式，封装参数
+					getManagementPrecisions(itemCodes, locationCode, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							this.submitJob();
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+					});
+				}
+			},
+
+			submitJob() {
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+
+				deliverJobSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成发货记录" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			setParams() {
+				var subList = []
+				var createTime = getCurrDateTime();
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						item.Locations.forEach(fromLocation => {
+							fromLocation.Batchs.forEach(batch => {
+								let subItem = batch.detail;
+								subItem.recordList = [];
+								if (batch.Records.length > 0) {
+									batch.Records.forEach(r => {
+										let record = {};
+										record.handleQty = r.qty;
+										record.toContainerNumber = r
+											.ContainerNumber;
+										record.toInventoryStatus = r
+											.inventoryStatus;
+										record.toLocationCode = subItem
+											.toLocationCode;
+										record.supplierCode = r.supplierCode;
+
+										//使用在途库不改变管理模式
+										if (this.toLocationCode ==null) {
+											record.toPackingNumber = r
+												.packingNumber;
+											record.toBatch = r.batch;
+										} else {
+											var info = getPackingNumberAndBatch(
+												this.managementList, r
+												.itemCode,
+												r.packingNumber, r
+												.batch);
+											record.toPackingNumber = info
+												.packingNumber;
+											record.toBatch = info.batch;
+										}
+										subItem.recordList.push(record);
+									})
+									subList.push(subItem);
+								}
+							})
+						})
+					})
+				})
+
+				this.jobContent.subList = subList
+				this.jobContent.createTime = createTime;
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			cancel() {
+				let that = this;
+				this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => {
+					if (res) {
+						that.clearInfo();
+					}
+				});
+			},
+
+			clearInfo() {
+				this.dataContent.itemCodeList.forEach(res => {
+					if (res.recommendList != null) {
+						res.recommendList.forEach(res1 => {
+							if (res1.locationCodeList != null) {
+								res1.locationCodeList.forEach(res2 => {
+									if (res2.packingCodeList != null) {
+										res2.packingCodeList.forEach(res3 => {
+											res3.itemCode = "";
+											res3.qty = 0;
+										})
+									}
+								})
+							}
+
+						})
+					}
+
+				})
+			},
+
+			updateData(record) {
+				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
+				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
+				let itemHandleQty = 0;
+				if (item != undefined) {
+					item.Locations.forEach(l => {
+						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
+								.packingNumber == null || b.packingNumber == '') && b.batch ==
+							record.batch);
+						let handleQty = 0;
+						if (batch != undefined) {
+							batch.Records.forEach(res => {
+								handleQty = calc.add(handleQty, res.qty)
+							})
+							batch.handleQty = handleQty;
+							itemHandleQty = calc.add(itemHandleQty, handleQty)
+						}
+					})
+				}
+				// item.handleQty=itemHandleQty;
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			showCommitSuccess() {
+				this.$refs.comMessage.showCommitSuccess();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+
+			showRescanMessage(message) {
+				this.$refs.comMessage.showRescanMessage(message);
+			},
+
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			confirm(data) {
+				this.dataContent = data;
+			},
+			confirmResult(result) {
+				this.dataContent = result;
+				this.$forceUpdate();
+			},
+			openScanDetailPopup() {
+				var datacontent = {}
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				// Object.assign(datacontent, this.detailSource);
+				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
+			},
+			closeScanPopup() {
+				this.updateCommitBtn();
+			},
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	.uni-numbox__value {
+		width: 40px;
+	}
+
+	button[disabled] {
+		background-color: #3C9CFF;
+		color: #fff;
+		opacity: 0.7;
+	}
+
+
+	// /deep/ .input-value {
+	// 	font-size: 16px;
+	// }
+
+	// /deep/ .uni-collapse-item__title-text {
+	// 	font-size: 16px;
+	// }
+
+	// /deep/ .uni-collapse-item--border {
+	// 	border-bottom-width: 0px;
+	// 	border-bottom-color: #ebeef5;
+	// }
+
+	// /deep/ .uni-collapse-item--border {
+	// 	border-bottom-width: 1px;
+	// 	border-bottom-color: #ebeef5;
+	// }
+</style>
diff --git a/pages/deliver/job/deliverJob.vue b/pages/deliver/job/deliverJob.vue
new file mode 100644
index 0000000..8d51443
--- /dev/null
+++ b/pages/deliver/job/deliverJob.vue
@@ -0,0 +1,286 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-deliver-job-card :dataContent="item" @click='openJobDetail(item)'></com-deliver-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+
+	import {
+		getDeliverJobList,
+		cancleTakeDeliverJob
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import comDeliverJobCard from '@/pages/deliver/coms/comDeliverJobCard.vue'
+	import jobListPopup from '@/pages/deliver/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/deliver/coms/jobInfoPopup.vue'
+
+
+	export default {
+		name: 'Deliver',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comDeliverJobCard,
+			jobListPopup,
+			jobInfoPopup
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+				
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getDeliverJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.receiptList.concat(list);
+					this.pageNo++;
+					updateTitle("制品发货任务(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("制品发货任务");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './deliverDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.jobListPopup.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeDeliverJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getDeliverJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/deliver/record/deliverRecord.vue b/pages/deliver/record/deliverRecord.vue
new file mode 100644
index 0000000..b8b1359
--- /dev/null
+++ b/pages/deliver/record/deliverRecord.vue
@@ -0,0 +1,502 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
+								:isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
+								@removePack="removePack">
+							</record-com-detail-card>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="uni-flex uni-row u-col-center" style="width: 100%;">
+				<view class="" style=" text-align: center;font-size: 32rpx;font-weight: 700;margin-left: 10rpx;">
+					客户 :
+				</view>
+				<uni-data-picker v-if="detailSource.length>0" style="padding: 20rpx; background-color:#fff;"
+					class='uni-data-picker' placeholder="请选择客户" popup-title="选择客户" :localdata="customerList"
+					@change="reasonChange">
+					
+				</uni-data-picker>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<requiredLocation  ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+							@getLocation='scanLocationCode' :isShowEdit="true"
+							:locationTypeList="tolocationTypeList"></requiredLocation>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' headerType="HMQ"></win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+	</view>
+
+</template>
+
+<script>
+	import {
+		getBasicCustomerList,
+		deliverRecordSubmit
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		getPackingNumberAndBatchByList,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+	
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				fromLocationCode: "",
+				toLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				businessType: {},
+				customerList: [],
+				customerText: "",
+				customerCode : "",
+				dataContent:{},
+				managementList:[]
+			};
+		},
+		onLoad(option) {
+
+			var typeCode = "Deliver"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+
+			getBasicCustomerList().then(res => {
+				if (res.data.length > 0) {
+					var list = res.data;
+					list.forEach(item => {
+						item.text = item.name
+						item.value = item.code
+					})
+					this.customerList = list;
+				}
+			}).catch(error => {
+				this.showErrorMessage(error)
+			})
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				let labelQty =result.label.qty;
+				let balanceQty =result.balance.qty;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			calcHandleQty() {
+				calcHandleQty(this.detailSource);
+				this.$forceUpdate();
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+			},
+
+			closeScanPopup() {
+				if(this.$refs.scanPopup!=undefined){
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if(this.$refs.scanPopup!=undefined){
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+
+			},
+
+			commit() {
+				if (this.customerText == "") {
+					this.showMessage("请先选择客户")
+					return;
+				}
+				console.log("客户", this.customerText)
+				if (this.toLocationCode == "") {
+					this.showMessage("请先选择目标库位")
+					return;
+				}
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					this.managementList = [];
+					var precisionStrategParams = this.setPrecisionStrategParams()
+					
+					getPrecisionStrategyList(precisionStrategParams, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							var params = this.setParams()
+							console.log("提交" + JSON.stringify(params))
+								deliverRecordSubmit(params).then(res => {
+									uni.hideLoading()
+									if (res.data) {
+										this.showCommitSuccessMessage("提交成功<br>生成制品发货记录<br>" + res.data)
+									} else {
+										this.showErrorMessage("提交失败[" + res.msg + "]")
+									}
+								}).catch(error => {
+									uni.hideLoading()
+									this.showErrorMessage(error)
+								})
+				
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+				
+					})
+				
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+
+
+			},
+
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.toLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+			
+						}
+					})
+				})
+				return itemList;
+			},
+			
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							var submitItem = deepCopyData(detail)
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+							
+							submitItem.inventoryStatus = detail.inventoryStatus;
+			
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.toPackingNumber = info.packingNumber;
+			
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+			
+							submitItem.fromBatch = info.batch;
+							submitItem.toBatch = info.batch;
+			
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+							
+							submitItem.qty = detail.handleQty;
+							submitItem.package ="";
+							
+							subList.push(submitItem)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.customerCode = this.customerCode;
+				this.dataContent.fromWarehouseCode = this.detailSource[0].subList[0].warehouseCode;
+				this.dataContent.toWarehouseCode = this.toWarehouseCode;
+				return this.dataContent;
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				this.toLocationCode = code;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
+			},
+			
+			clearData(){
+				this.fromLocationCode = '';
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+				this.toWarehouseCode = ""
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+			reasonChange(e) {
+				if (e.detail.value.length == 0) {
+					this.customerCode = ""
+					this.customerText = ""
+				} else {
+					this.customerCode = e.detail.value[0].value
+					this.customerText = e.detail.value[0].text
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/deliver/request/deliverRequest.vue b/pages/deliver/request/deliverRequest.vue
new file mode 100644
index 0000000..d770dfc
--- /dev/null
+++ b/pages/deliver/request/deliverRequest.vue
@@ -0,0 +1,390 @@
+<template>
+	<view>
+		<com-empty-view v-if="requestList.length==0"></com-empty-view>
+		<request-filter ref="filter" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
+			:checkedWaitTask="checkedWaitTask">
+		</request-filter>
+		<view v-if="requestList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in requestList" :key="index">
+					<uni-swipe-action-item :right-options="item.options" @click="swipeClick($event,item)">
+						<com-deliver-request-card :dataContent="item" @click='openRequestDetail(item)'>
+						</com-deliver-request-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+			<uni-load-more :status="loadingType" />
+			<request-info-popup ref='requestInfoPopup'></request-info-popup>
+		</view>
+		<requestButton @goScan='openScanDetailPopup'></requestButton>
+	</view>
+	<comMessage ref="comMessage"></comMessage>
+</template>
+
+<script>
+	import requestFilter from '@/mycomponents/request/requestFilter.vue'
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comDeliverRequestCard from '@/pages/deliver/coms/comDeliverRequestCard.vue'
+	import requestInfoPopup from '@/pages/deliver/coms/requestInfoPopup.vue'
+	import requestButton from '@/mycomponents/button/requestButton.vue'
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+	import {
+		getDeliverRequestList,
+		deliverRequestClose,
+		deliverRequestApprove,
+		deliverRequestApproveAgree,
+		deliverRequestApproveRefused,
+		deliverRequestHandle,
+		deliverRequestAddAgain
+	} from '@/api/request2.js';
+	import {
+		getDetailOption,
+		getDetailAndApproveOption,
+		getDetailAndApprovePassAndApproveNoOption,
+		getDetailAndHandleOption,
+		getDetailAndAddAndCloseOption,
+		getAddAgainOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			requestFilter,
+			requiredLocation,
+			comDeliverRequestCard,
+			requestInfoPopup,
+			requestButton
+		},
+		data() {
+			return {
+				requestList: [],
+				pageNo: 1,
+				pageSize: 10,
+				status: "1,2,3,4,5,6",
+				totalCount: 0,
+				checkedWaitTask: false,
+				detailOptions: [],
+				detailAndApproveOptions: [],
+				detailAndApprovePassAndApproveNoOption: [],
+				detailAndHandleOption: [],
+				detailAndAddAndCloseOption: [],
+				addAgainOption: [],
+				showOptions: [],
+				fromType: "requestType",
+				loadingType: "nomore",
+
+			};
+		},
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.addAgainOption = getAddAgainOption();
+			this.detailAndApproveOptions = getDetailAndApproveOption()
+			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
+			this.detailAndHandleOption = getDetailAndHandleOption()
+			this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
+
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+		onShow() {
+			this.getList('refresh');
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+
+		mounted() {
+
+		},
+		methods: {
+			requestConfirm(action, item) {
+
+			},
+
+			openRequestInfoPopup(item) {
+				this.$refs.requestInfoPopup.openPopup(item)
+			},
+			openRequestDetail(item) {
+				uni.navigateTo({
+					url: './deliverRequestDetail?id=' + item.id
+				});
+			},
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.requestList = [];
+				}
+				var filters = []
+					filters.push({
+						column: "status",
+						action: "in",
+						value: this.status
+					})
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getDeliverRequestList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					list.forEach(res => {
+						var options = this.updateOptions(res.status);
+						res.options = options;
+					})
+					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
+					this.pageNo++;
+					updateTitle("成品发货申请(" + this.totalCount + ")");
+
+				}).catch(error => {
+					updateTitle("成品发货申请");
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			updateOptions(status) {
+				if (status == "1") {
+					this.showOptions = this.detailAndApproveOptions;
+				} else if (status == "2") {
+					this.showOptions = this.detailAndApprovePassAndApproveNoOption;
+				} else if (status == "3") {
+					this.showOptions = this.detailAndHandleOption;
+				} else if (status == "4") {
+					this.showOptions = this.detailAndAddAndCloseOption;
+				} else if(status == "5"){
+					this.showOptions = this.addAgainOption;
+				}else {
+					this.showOptions = this.detailOptions;
+				}
+				return this.showOptions
+			},
+
+			openScanDetailPopup() {
+				uni.navigateTo({
+					url: "./deliverRequestCreate"
+				})
+			},
+
+
+			swipeClick(e, dataContent) {
+				var text = clearTirmAndWrap(e.content.text)
+				if (text == "详情") {
+					this.openRequestInfoPopup(dataContent);
+				} else if (text == "处理") {
+					this.showQuestionMessage("确定要处理当前申请吗?",res=>{
+						this.deliverRequestHandle(dataContent.id)
+					})
+				} else if (text == "提交审批") {
+					this.showQuestionMessage("确定要审批当前申请吗?",res=>{
+						this.deliverRequestApprove(dataContent.id)
+					})
+				} else if (text=="审批通过") {
+					this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
+						this.deliverRequestApproveAgree(dataContent.id)
+					})
+				} else if (text == "审批驳回") {
+					this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
+						this.deliverRequestApproveRefused(dataContent.id)
+					})
+				} else if (text == "关闭") {
+					this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
+						this.deliverRequestClose(dataContent.id)
+					})
+				}else if(text == "重新添加"){
+					this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{
+						this.deliverRequestAddAgain(dataContent.id)
+					})
+				}
+			},
+			showQuestionMessage(hint,callBack){
+				this.$refs.comMessage.showQuestionMessage(hint,
+					res => {
+						if (res) {
+							callBack()
+						}
+					});
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getDeliverRequestList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openRequestDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			deliverRequestApprove(id) {
+				deliverRequestApprove(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请提交审批成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请提交审批失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			
+			},
+			
+			deliverRequestClose(id) {
+				deliverRequestClose(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请关闭成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请关闭失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			deliverRequestAddAgain(id) {
+				deliverRequestAddAgain(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请重新添加成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请重新添加失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			deliverRequestApproveAgree(id) {
+				deliverRequestApproveAgree(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批通过成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批通过失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			deliverRequestApproveRefused(id) {
+				deliverRequestApproveRefused(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批驳回成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批驳回失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			deliverRequestHandle(id) {
+				deliverRequestHandle(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请处理成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请处理失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/deliver/request/deliverRequestCreate.vue b/pages/deliver/request/deliverRequestCreate.vue
new file mode 100644
index 0000000..d697fbf
--- /dev/null
+++ b/pages/deliver/request/deliverRequestCreate.vue
@@ -0,0 +1,198 @@
+<template>
+	<view class="page-wraper">
+		<view class="" v-if='detailSource.subList.length==0'>
+			<com-blank-view @goScan='goScan(true)'></com-blank-view>
+		</view>
+		<view v-else class="page-wraper">
+			<view class="page-main">
+				<comDeliverRequestCreator ref="deliverRequest" :dataContent="detailSource">
+				</comDeliverRequestCreator>
+				<button class="btn_add" @click="goScan(false)">+去添加</button>
+			</view>
+
+			<div class="btn_bottom">
+				<view class="" style="display: flex;flex-direction: row;">
+					<view class="">
+						<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+					</view>
+				</view>
+			</div>
+			<comMessage ref="comMessage"></comMessage>
+		</view>
+	</view>
+	<comDeliverRequestPopup ref="comDeliverRequestPopup" @confirm='requestConfirm'></comDeliverRequestPopup>
+</template>
+
+<script>
+	import {
+		deliverRequestSubmit,
+		issueRecordSubmit
+	} from '@/api/request2.js';
+	
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		goHome,
+		updateTitle,
+		getRemoveOption,
+		getISODateTime
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource
+	} from '@/pages/issue/js/issue.js';
+
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import comDeliverRequestPopup from '@/pages/deliver/coms/comDeliverRequestPopup.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import comDeliverRequestCreator from '@/pages/deliver/coms/comDeliverRequestCreator.vue'
+
+	export default {
+		name: 'issueRequestSubmit',
+		components: {
+			comBlankView,
+			comDeliverRequestPopup,
+			jobDetailPopup,
+			comDeliverRequestCreator
+		},
+		data() {
+			return {
+				subList: [], //接口返回的任务subList
+				detailSource: {
+					subList: []
+				}, //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				fromType: "",
+				dataContent: {}
+
+			}
+		},
+		mounted() {
+			this.goScan(true)
+		},
+		onLoad(option) {
+			this.fromType = option.fromType
+
+		},
+		methods: {
+			goScan(editPosition) {
+				this.$refs.comDeliverRequestPopup.openRequestPopup(editPosition);
+			},
+
+			//确定需求信息
+			requestConfirm(action, item) {
+
+				if (this.detailSource.subList.length == 0) {
+					this.detailSource = {
+						customerCode: item.customerCode,
+						customerName: item.customerName,
+						totalQty: 0,
+						subList: []
+					}
+					var subItem = {
+						itemCode: item.itemCode,
+						itemName: item.itemName,
+						qty: item.qty,
+						uom: item.uom
+					}
+					this.detailSource.subList.push(subItem)
+				} else {
+					var result = this.detailSource.subList.filter(res => {
+						if (res.itemCode == item.itemCode &&
+							res.productionLineCode == item.productionLineCode &&
+							res.workStationCode == item.workStationCode) {
+							return res
+						}
+					})
+
+					//没有添加数据
+					if (result.length == 0) {
+						var subItem = {
+							productionLineCode: item.productionLineCode,
+							productionLineName: item.productionLineName,
+							workStationCode: item.workStationCode,
+							workStationName: item.workStationName, //工位
+							itemCode: item.itemCode,
+							itemName: item.itemName,
+							qty: item.qty,
+							uom: item.uom
+						}
+
+						this.detailSource.subList.push(subItem)
+
+					} else {
+						//有了更新数据
+						result[0].qty = calc.add(result[0].qty,item.qty)
+
+					}
+				}
+				this.caclcQty();
+				if (this.$refs.deliverRequest != undefined) {
+					this.$refs.deliverRequest.update()
+				}
+			},
+
+			caclcQty() {
+				var totalQty = 0;
+				this.detailSource.subList.forEach(res => {
+					totalQty = calc.add(totalQty,res.qty)
+				})
+				this.detailSource.totalQty = totalQty;
+			},
+
+
+			setParams() {
+				return this.detailSource
+			},
+			submit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var params = this.setRequestParams()
+				console.log("提交参数", JSON.stringify(params));
+				deliverRequestSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成成品发货申请<br>" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			setRequestParams() {
+				let requestContent = {};
+				requestContent.customerCode = this.detailSource.customerCode;
+				var subList = []
+				this.detailSource.subList.forEach(detail => {
+					subList.push(detail)
+				})
+				requestContent.subList = subList;
+				return requestContent;
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					uni.navigateTo({
+						url: './deliverRequest'
+					})
+				})
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/deliver/request/deliverRequestDetail.vue b/pages/deliver/request/deliverRequestDetail.vue
new file mode 100644
index 0000000..9315192
--- /dev/null
+++ b/pages/deliver/request/deliverRequestDetail.vue
@@ -0,0 +1,137 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<request-top :dataContent="requestContent"></request-top>
+			</view>
+			<view class="header_item">
+				客户代码 : {{requestContent.customerCode}}
+			</view>
+			<u-line color="#D8D8D8" />
+		</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="page-header">
+					<view class="page-item">
+						{{detailSource.customerCode}}
+					</view>
+					<u-line />
+				</view>
+				<view class="detail-list" v-for="(item, index) in detailSource.subList" :key="item.id">
+					<view class="">
+						<item-qty :dataContent="item"></item-qty>
+						<!-- <comRequestDetailCard :dataContent="item" @openDetail="openDetail">
+						</comRequestDetailCard> -->
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<requestDetailInfoPopup ref="jobDetailPopup"></requestDetailInfoPopup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getDeliverRequestDetail,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource,
+	} from '@/common/detail.js';
+
+
+	import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
+	import requestDetailInfoPopup from '@/pages/deliver/coms/requestDetailInfoPopup.vue'
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import requestTop from "@/mycomponents/request/requestTop.vue"
+	
+	export default {
+		components: {
+			comRequestDetailCard,
+			requestDetailInfoPopup,
+			itemQty,
+			requestTop
+		},
+		data() {
+			return {
+				id: '',
+				requestContent: {}, //任务内容
+				detailSource: [], //绑定在页面上的数据源
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			this.getDetail();
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getDeliverRequestDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						that.detailSource = res.data
+						that.requestContent = res.data;
+						// if (res.data.subList.length > 0) {
+						// 	that.requestContent = res.data;
+						// 	that.subList = res.data.subList;
+						// 	that.subList.forEach(res => {
+						// 		res.fromLocationCode = res.toLocationCode
+						// 	})
+						// 	that.detailSource = getDataSource(that.subList);
+						// 	debugger;
+						// } else {
+						// 	that.showMessage('列表数据为0');
+						// }
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+			openDetail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/demo/demo.vue b/pages/demo/demo.vue
new file mode 100644
index 0000000..b9e7dbd
--- /dev/null
+++ b/pages/demo/demo.vue
@@ -0,0 +1,703 @@
+<template>
+	<view class="" style="width: 100%;">
+		<view class="">
+			公共组件
+		</view>
+		<u-gap height="10" bg-color="#bbb"></u-gap>
+		<button @click="takePhoto"> 拍照</button>
+		<view class="">
+			<view class="title-1">
+				按钮组件
+			</view>
+
+			<view class="">
+				<view class="" style="font-size: 35rpx; padding: 10rpx;">
+					页面按钮
+				</view>
+				<div class="">
+					<view class="" style="display: flex;flex-direction: row;">
+						<view class="">
+							<button class="btn_clear" style="button" hover-class="btn_clear_after" @click="">清空</button>
+						</view>
+						<view class="">
+							<button class="btn_commit" hover-class="btn_commit_after" @click="">提交</button>
+						</view>
+
+					</view>
+				</div>
+				<view class="" style="font-size: 35rpx; padding: 10rpx;">
+					弹出页按钮
+				</view>
+				<view class="uni-flex uni-row test">
+					<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="">取消</button>
+					<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="">确认</button>
+				</view>
+				<!-- 	<view class="" style="font-size: 35rpx; padding: 10rpx;">
+					去添加
+				</view>
+				<view>
+
+					<button style="margin-top: 30rpx;" class="btn_add_small" hover-class="btn_add_small_after"> +
+						去添加</button>
+				</view>
+ -->
+				<view class="" style="font-size: 35rpx; padding: 10rpx;">
+					去扫描
+				</view>
+				<view>
+					<com-blank-view @goScan='goScan'></com-blank-view>
+				</view>
+
+				<view class="" style="font-size: 35rpx; padding: 10rpx;">
+					扫描按钮
+				</view>
+				<view>
+					<win-scan-button @goScan='goScan'></win-scan-button>
+				</view>
+
+			</view>
+		</view>
+		<u-gap height="5" bg-color="#bbb"></u-gap>
+		<view class="">
+			<view class="" style=" font-size: 40rpx; padding: 20rpx;font-weight: 600;">
+				扫描组件
+			</view>
+			<view class="">
+				<button @click="openScanPopup">扫描箱码</button>
+				<winScanPack ref="scanPopup" :title="'箱码'"></winScanPack>
+			</view>
+			<view class="">
+				<button @click="openScanLocation">扫描库位</button>
+				<winScanLocation ref="scanLocationCodePopup" :title="'收货库位'"></winScanLocation>
+			</view>
+			<view class="">
+				<button @click="openScanNumber">扫描任务编号</button>
+				<winScanJobNumber ref="scanNumber" :title="'任务编号'"></winScanJobNumber>
+			</view>
+		</view>
+		<u-gap height="5" bg-color="#bbb"></u-gap>
+
+		<!-- 任务组件 -->
+		<view>
+			<view class="title-1">
+				任务组件
+			</view>
+			<view style="uni-flex uni-col ">
+				<view>
+					<view class="title-2">任务编号 - jobNumer</view>
+					<view class="view-com">
+						<job-number :number="jobDataContent.Number"></job-number>
+					</view>
+				</view>
+
+				<view>
+					<view class="title-2">任务状态 - jobStatus</view>
+					<view class="view-com">
+						<job-status :jobStatus="jobDataContent.status"></job-status>
+					</view>
+				</view>
+
+				<view>
+					<view class="title-2">任务顶部 - jobTop</view>
+					<view class="view-com">
+						<job-top :dataContent="jobDataContent"></job-top>
+					</view>
+				</view>
+
+				<view>
+					<view class="title-2">任务底部 - jobBottom</view>
+					<view class="view-com">
+						<job-bottom :dataContent="jobDataContent"></job-bottom>
+					</view>
+				</view>
+
+				<view>
+					<view class="title-2">任务其它属性 - jobProperty</view>
+					<view class="view-com">
+						<job-property></job-property>
+					</view>
+				</view>
+
+				<view>
+					<view class="title-2">任务卡片 - jobCard</view>
+					<view class="view-com">
+						<job-card :dataContent="jobDataContent"></job-card>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 数量组件 -->
+		<u-gap height="5" bg-color="#bbb"></u-gap>
+		<view>
+			<view class="title-1">
+				数量组件
+			</view>
+			<view style="uni-flex uni-col ">
+				<view class="">
+					<button @click="openRecommendQtyEdit">任务数量编辑 recommendQtyEdit</button>
+					<recommend-qty-edit ref="recommendQtyEdit" :dataContent="detailDataContent"
+						:handleQty="recordDataContent.qty">
+					</recommend-qty-edit>
+				</view>
+
+				<view class="">
+					<button @click="openBalanceQtyEdit">库存数量编辑 balanceQtyEdit</button>
+					<balance-qty-edit ref="balanceQtyEdit" :dataContent="balancDataContent"></balance-qty-edit>
+				</view>
+			</view>
+			<view class="">
+				<view class="uni-flex uni-column  content">
+					<text>数量组件通用属性</text>
+					<text> isShowStatus:显示状态</text>
+					<text> isShowStdPack:显示标包</text>
+				</view>
+				<view class="title-2">默认数量 qty</view>
+				<view class="view-com">
+					<view class="uni-flex uni-row ">
+						<qty :dataContent='detailDataContent' :isShowStdPack="false"></qty>
+					</view>
+				</view>
+
+				<view class="title-2">推荐数量 recommendQty</view>
+				<view class="view-com">
+					<view class="uni-flex uni-row ">
+						<recommend-qty :dataContent="detailDataContent" :isShowStatus="true"></recommend-qty>
+					</view>
+				</view>
+
+				<view class="title-2">对比数量 compareQty</view>
+				<view class="view-com">
+					<view class="uni-flex uni-row ">
+						<compare-qty :dataContent="detailDataContent" :recommendQty="detailDataContent.qty"
+							:handleQty="100" :isShowStatus="true">
+						</compare-qty>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<u-gap height="5" bg-color="#bbb"></u-gap>
+		<!-- 物料组件 -->
+		<view>
+			<view class="title-1">
+				物料组件
+			</view>
+			<view class="">
+				<view class="title-2">物料 item</view>
+				<view class="view-com">
+					<view class="uni-flex uni-row ">
+						<item :dataContent="detailDataContent"></item>
+					</view>
+				</view>
+
+				<view class="title-2">物料数量 itemQty</view>
+				<view class="view-com">
+					<item-qty :dataContent="detailDataContent" :handleQty="recordDataContent.qty"></item-qty>
+				</view>
+
+				<view class="title-2">物料数量 itemQty</view>
+				<view class="view-com">
+					<partCodeSelect :list="list"></partCodeSelect>
+				</view>
+			</view>
+		</view>
+
+		<u-gap height="5" bg-color="#bbb"></u-gap>
+
+		<view>
+			<view class="title-1">
+				卡片组件
+			</view>
+			<view class="">
+				<view class="title-2">箱码 pack</view>
+				<view class="view-com">
+					<pack :packingCode="detailDataContent.packingNumber"></pack>
+				</view>
+
+				<view class="title-2">托码 暂无</view>
+				<view class="view-com">
+				</view>
+
+				<view class="title-2">批次 batch</view>
+				<view class="view-com">
+					<batch :batch="detailDataContent.batch"></batch>
+				</view>
+
+				<view class="title-2">库位 location</view>
+				<view class="view-com">
+					<location :locationCode="detailDataContent.fromLocationCode"></location>
+				</view>
+
+
+				<view class="title-2">推荐卡片 recommend</view>
+				<view class="view-com">
+					<recommend :detail="detailDataContent" :isScaned="false"></recommend>
+				</view>
+
+				<view class="title-2">推荐卡片/实际/已扫描 recommend</view>
+				<view class="view-com">
+					<recommend :detail="detailDataContent"></recommend>
+				</view>
+
+				<view class="title-2">库存卡片 balance</view>
+				<view>
+					<radio-group>
+						<radio class="title-2" checked="true" @click="compareQtyClick">对比数量</radio>
+						<radio class="title-2" @click="defaultQtyClick">默认数量</radio>
+					</radio-group>
+
+				</view>
+				<view class="view-com">
+					<balance :dataContent="detailDataContent"></balance>
+				</view>
+
+				<view class="title-2">单箱管理 </view>
+				<view class="view-com">
+					<balance :dataContent="detailDataContent"></balance>
+				</view>
+
+				<view class="title-2">批次管理 </view>
+				<view class="view-com">
+					<balance :dataContent="detailDataContent" :isShowPack="false"></balance>
+				</view>
+
+				<view class="title-2">批量管理 </view>
+				<view class="view-com">
+					<balance :dataContent="detailDataContent" :isShowPack="false" :isShowBatch="false"
+						:isShowStdPack="false"></balance>
+				</view>
+			</view>
+		</view>
+
+		<u-gap height="10" bg-color="#bbb"></u-gap>
+
+		<view class="">
+			<view class="title-1">
+				消息框-comMessage
+			</view>
+
+			<view>
+				<u-button @click="openMessage">
+					信息提示弹窗-showMessage
+				</u-button>
+				<u-button @click="openSuccess">
+					成功提示弹窗-showSuccessMessage
+				</u-button>
+				<u-button @click="openError">
+					错误提示弹窗-showErrorMessage
+				</u-button>
+				<u-button @click="openWarn">
+					警告提示弹窗-showWarningMessage
+				</u-button>
+				<u-button @click="openGray">
+					问题选择弹窗-showQuestionMessage
+				</u-button>
+				<comMessage ref="message"></comMessage>
+			</view>
+		</view>
+
+		<view class="">
+			<view class="title-1">
+				库存状态组件-balanceStatus
+			</view>
+			<view class="view-com">
+				<status status="kcztINSP"></status>
+
+				<balance-status ref="balanceStatus" status="kcztINSP"></balance-status>
+			</view>
+		</view>
+		<view class="">
+			<view class="title-1">
+				物料状态组件-itemStatus
+			</view>
+
+			<view class="uni-flex uni-row space-between" style="margin:20rpx">
+				<item-status status="wpztENABLE"></item-status>
+				<item-status status="wpztHOLD"></item-status>
+				<item-status status="wpztNEW"></item-status>
+				<item-status status="wpztPLAN"></item-status>
+			</view>
+		</view>
+
+		<u-gap height="10" bg-color="#bbb"></u-gap>
+		<view class="">
+			<view class="" style=" font-size: 40rpx; padding: 20rpx;font-weight: 600;">
+				无数据
+			</view>
+			<comEmptyView></comEmptyView>
+		</view>
+	 
+	 <u-gap height="10" bg-color="#bbb"></u-gap>
+		<view class="">
+			<view class="" style=" font-size: 40rpx; padding: 20rpx;font-weight: 600;">
+				库位相关组件
+			</view>
+			<u-gap height="5" bg-color="#bbb"></u-gap>
+			<u-gap height="5" bg-color="#bbb"></u-gap>
+			<view class="">
+				<view class="" style="font-size: 35rpx; padding: 10rpx;">
+					选择库位
+				</view>
+
+				<locationDrop :listLode="listLode"></locationDrop>
+				<view class="" style="font-size: 35rpx; padding: 100rpx;">
+					下拉列表
+					<pullDown label="所在城市市111" @change="change" v-model="value1" :options="candidates1"
+						@confirm="pullDownConfirm" :height="100" />
+
+				</view>
+
+				<pullDown label="所在城市市111" @change="change" v-model="value1" :options="candidates2" :isSearch="true"
+					@confirm="pullDownConfirm" />
+
+			</view>
+			<u-gap height="5" bg-color="#bbb"></u-gap>
+		</view>
+		<u-gap height="10" bg-color="#bbb"></u-gap>
+	</view>
+</template>
+
+<script>
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import locationDrop from '@/mycomponents/location/locationDrop.vue'
+	import partCodeSelect from '@/mycomponents/partCode/partCodeSelect.vue'
+	import partCode from "@/mycomponents/partCode/partCode.vue"
+	import winScanJobNumber from "@/mycomponents/scan/winScanJobNumber.vue"
+
+	import jobNumber from '@/mycomponents/job/jobNumber.vue'
+	import jobStatus from '@/mycomponents/job/jobStatus.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import jobBottom from '@/mycomponents/job/jobBottom.vue'
+	import jobProperty from '@/mycomponents/job/jobProperty.vue'
+	import jobCard from '@/mycomponents/job/jobCard.vue'
+
+	import qty from '@/mycomponents/qty/qty.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+	import item from '@/mycomponents/item/item.vue'
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import itemStatus from '@/mycomponents/item/itemStatus.vue'
+
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import status from '@/mycomponents/status/status.vue'
+	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
+	import statusEdit from '@/mycomponents/status/statusEdit.vue'
+
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
+
+
+	export default {
+		components: {
+			winScanPack,
+			winScanJobNumber,
+			comEmptyView,
+			jobFilter,
+			locationDrop,
+			partCodeSelect,
+			partCode,
+			jobNumber,
+			jobStatus,
+			jobTop,
+			jobBottom,
+			jobProperty,
+			jobCard,
+			qty,
+			recommendQty,
+			compareQty,
+			recommendQtyEdit,
+			balanceQtyEdit,
+			item,
+			itemQty,
+			itemStatus,
+			pack,
+			batch,
+			location,
+			balance,
+			recommend,
+			status,
+			balanceStatus,
+			statusEdit,
+			comBlankView,
+			winScanButton,
+			winScanLocation
+		},
+		data() {
+			return {
+				value1: '',
+				candidates1: ['北京1', '南京1', '东京1', '西京1'],
+				candidates2: ['北京', '南京', '东京', '西京'],
+				jobDataContent: {
+					Number: '0000001',
+					status: "JOB_PENDING",
+					creatorName: 'admin',
+					creationTime: '2023-07-27 10:30:00'
+				},
+				detailDataContent: {
+					itemCode: "LJH16540NAA",
+					itemName: "门板金属螺丝钉",
+					itemDesc1: "门板金属螺丝",
+					stdPackQty: 1000,
+					stdPackUnit: '箱',
+					uom: 'EA',
+					qty: 3000,
+					inventoryStatus: 2,
+
+					packingNumber: "516456579",
+					batch: "20230510",
+					fromLocationCode: "B0101",
+					locationCode: "B0101",
+					record: {
+						qty: 1000
+					}
+				},
+
+				recordDataContent: {
+					itemCode: "LJH16540NAA",
+					itemName: "门板金属螺丝钉",
+					itemDesc1: "门板金属螺丝",
+					stdPackQty: 1000,
+					stdPackUnit: 'EA',
+					uom: 'EA',
+					qty: 500,
+					inventoryStatus: 2,
+
+					packingNumber: "516456579",
+					batch: "20230510",
+					toLocationCode: "B0101",
+				},
+				balancDataContent: {
+					itemCode: "LJH16540NAA",
+					itemName: "门板金属螺丝钉",
+					itemDesc1: "门板金属螺丝",
+					stdPackQty: 1000,
+					stdPackUnit: 'EA',
+					uom: 'EA',
+					qty: 1000,
+					UsableQty: 500,
+					inventoryStatus: 2,
+					packingNumber: "516456579",
+					batch: "20230510",
+					locationCode: "B0101",
+				},
+
+				dataList: [{
+						title: "供应商",
+						content: "一汽富维东阳"
+					},
+					{
+						title: "订单号",
+						content: "1652899744"
+					},
+					{
+						title: "到货单",
+						content: "05689113577"
+					},
+					{
+						title: "发货单",
+						content: "96851521215"
+					},
+					{
+						title: "要货计划单",
+						content: "558484812"
+					},
+					{
+						title: "预计到货时间",
+						content: "2022/02/22 9:58:00"
+					},
+					{
+						title: "时间窗口",
+						content: "2022/02/25 11:3:00"
+					}
+				],
+				listLode: [{
+						value: 1,
+						label: '库区',
+						children: [{
+								value: 2,
+								label: '库位组',
+								children: [{
+										value: 3,
+										label: 'D0101'
+									},
+									{
+										value: 4,
+										label: 'D0202'
+									}
+								]
+							},
+							{
+								value: 5,
+								label: 'KQ1',
+								children: [{
+										value: 6,
+										label: 'KW2'
+									},
+									{
+										value: 7,
+										label: 'D2525'
+									}
+								]
+							}
+						]
+					},
+					{
+						value: 8,
+						label: 'KQ2',
+						children: [{
+							value: 9,
+							label: 'KWZ2',
+							children: [{
+								value: 10,
+								label: 'D3000'
+							}]
+						}]
+					}
+				],
+				list: [{
+						value: 1,
+						label: 'LJH1654005NAA'
+					},
+					{
+						value: 2,
+						label: 'VC800D0A411AB'
+					}
+				],
+
+
+			};
+
+
+		},
+		onLoad() {},
+
+		methods: {
+			change(index, item) {
+				this.$u.toast(`点击了第${index}项---${item}`);
+			},
+			goScan() {
+				this.$u.toast(`弹出扫描窗体`);
+			},
+
+			pullDownConfirm(item) {
+				this.$u.toast(`回车校验---${item}`);
+			},
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+			openScanLocation() {
+				this.$refs.scanLocationCodePopup.openScanPopup();
+			},
+			openRecommendQtyEdit() {
+				this.$refs.recommendQtyEdit.openEditPopup()
+			},
+			openBalanceQtyEdit() {
+				this.$refs.balanceQtyEdit.openEditPopup()
+			},
+			stockCountEditBtn() {
+				this.$refs.stockCountEdit.openScanPopup()
+			},
+			updateState(state) {
+				this.state = state;
+			},
+			filter() {
+				this.$refs.filter.openFilter();
+			},
+
+			defaultQtyClick() {
+				this.detailDataContent.record.qty = 0;
+			},
+
+			compareQtyClick() {
+				this.detailDataContent.record.qty = 1000;
+			},
+
+			scanedClick() {
+				this.detailDataContent.scaned = true;
+			},
+
+			unScanedClick() {
+				this.detailDataContent.scaned = false;
+			},
+
+			openMessage() {
+				this.$refs.message.showMessage("消息", res => {
+
+				});
+			},
+
+			openSuccess() {
+				this.$refs.message.showSuccessMessage("提交成功", res => {
+
+				});
+			},
+			openWarn() {
+				this.$refs.message.showWarningMessage("警告对话框", res => {
+
+				});
+			},
+			openError() {
+				this.$refs.message.showErrorMessage("库存余额不足", res => {
+
+				});
+			},
+			openGray() {
+				this.$refs.message.showQuestionMessage("是否确定", res => {
+					this.$u.toast(`点击了` + res);
+				});
+			},
+			 
+			openScanNumber() {
+				this.$refs.scanNumber.openScanPopup()
+			},
+
+			takePhoto() {
+				uni.chooseImage({
+					count: 6, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album', 'camera'], //album 从相册选图，camera 使用相机
+					success: function(res) {
+						console.log(JSON.stringify(res.tempFilePaths)); //拍照图片的路径
+					}
+				});
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		font-size: 30rpx;
+
+		padding: 20rpx;
+	}
+
+	.title-1 {
+		font-size: 40rpx;
+		font-weight: 600;
+		padding: 20rpx;
+	}
+
+	.title-2 {
+		font-size: 30rpx;
+		font-weight: 600;
+		padding: 20rpx;
+	}
+
+	.view-com {
+		padding: 0rpx 20rpx;
+	}
+</style>
diff --git a/pages/demo/page.vue b/pages/demo/page.vue
new file mode 100644
index 0000000..491d6a2
--- /dev/null
+++ b/pages/demo/page.vue
@@ -0,0 +1,128 @@
+<template>
+	 <!-- 页面容器 -->
+	    <view class="page-wraper">
+	        <!-- 页面头部 -->
+	        <view class="page-header">
+	            标题栏
+	        </view>
+	
+	        <!-- 页面主体 -->
+	        <view class="page-main">
+	            <scroll-view class="page-main-scroll" style="height: 100%" :scroll-y="true" :scroll-with-animation="true">
+	                <view class="page-main-list" v-for="(item,index) in list" :key="index">
+	                    {{item.cont}}
+	                </view>
+	            </scroll-view>
+	        </view>
+	
+	        <!-- 页面底部 -->
+	        <view class="page-footer">
+	            <button type="primary">提交</button>
+	        </view>
+	    </view>
+</template>
+
+<script>
+	export default {
+	        data() {
+	            return {
+	                list: [{
+	                        cont: "张三"
+	                    },
+	                    {
+	                        cont: "张三"
+	                    },
+	                    {
+	                        cont: "张三"
+	                    },
+	                    {
+	                        cont: "张三"
+	                    },
+	
+	                    {
+	                        cont: "张三"
+	                    },
+	                    {
+	                        cont: "张三"
+	                    },
+	                    {
+	                        cont: "张三"
+	                    },
+	                    {
+	                        cont: "张三"
+	                    },
+	
+	                    {
+	                        cont: "张三"
+	                    },
+	                    {
+	                        cont: "张三"
+	                    },
+	                    {
+	                        cont: "张三"
+	                    },
+	                    {
+	                        cont: "张三"
+	                    },
+	                    {
+	                        cont: "张三"
+	                    },
+	                    {
+	                        cont: "张三"
+	                    },
+	                    {
+	                        cont: "张三=="
+	                    },
+	                ],
+	            }
+	        }
+	    }
+</script>
+
+<style lang="scss" scoped>
+	
+	 page {
+	        background-color: #ddd;
+	        width: 100%;
+	        height: 100%;
+	    }
+	
+    .page-wraper {
+        display: flex;
+        flex-direction: column;
+        width: 100%;
+        height: 100%;
+    }
+    .page-header {
+        background: rgb(8, 117, 94);
+        color: #fff;
+        line-height: 100rpx;
+        /* 不放大不缩小固定100rpx */
+        flex: 0 0 100rpx;
+    }
+    .page-main {
+        flex: 1;
+        position: relative;
+    }
+    .page-main-scroll {
+        position: absolute;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+    }
+    .page-main-list {
+        height: 80rpx;
+        line-height: 80rpx;
+        text-align: center;
+        background: #e0e0e0;
+
+    }
+    .page-footer {
+        color: #fff;
+        line-height: 100rpx;
+        /* 不放大不缩小固定100rpx */
+        flex: 0 0 100rpx;
+        background-color: #00AAFF;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/error/404.vue b/pages/error/404.vue
new file mode 100644
index 0000000..2f29e39
--- /dev/null
+++ b/pages/error/404.vue
@@ -0,0 +1,34 @@
+<template>
+    <view>
+        <view>
+            <text style="font-size: 25px;color: #333;">
+                404 Page Not Found
+            </text>
+        </view>
+        <view>
+            <text style="font-size: 18px;color: #999;">
+                {{errMsg}}
+            </text>
+        </view>
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+
+            }
+        },
+        onLoad(query) {
+            this.errMsg = query.errMsg || ''
+        },
+        methods: {
+
+        }
+    }
+</script>
+
+<style>
+
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
new file mode 100644
index 0000000..d4de446
--- /dev/null
+++ b/pages/index/index.vue
@@ -0,0 +1,494 @@
+<template>
+	<view class="u-wrap">
+		<!-- <view class="u-search-box"> -->
+		<!-- <view class="u-search-inner">
+				<u-icon name="search" color="#909399" :size="28"></u-icon>
+				<text class="u-search-text">搜索</text>
+			</view> -->
+		<!-- </view> -->
+		<view class="u-menu-wrap">
+			<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop"
+				:scroll-into-view="itemId">
+				<view v-for="(item,index) in tabbar" :key="index" class="u-tab-item"
+					:class="[current == index ? 'u-tab-item-active' : '']" @tap.stop="swichMenu(index)">
+					<text class="u-line-1">{{item.name}}</text>
+				</view>
+			</scroll-view>
+			<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box"
+				@scroll="rightScroll">
+				<view class="page-view" style="margin-bottom: 200rpx;">
+					<view class="class-item" :id="'item' + index" v-for="(item , index) in tabbar" :key="index">
+						<view class="item-title">
+							<text>{{item.name}}</text>
+						</view>
+						<view class="item-container">
+							<view class="thumb-box" v-for="(item1, index1) in item.children" :key="index1"
+								@click="openCheck(item1.path)">
+								<view class="" style="position: relative; ">
+								<!-- 	<u-badge  class="item-menu-badge" v-if="item1.count>0" type="error" :count="item1.count" :offset="position"
+										:showZero="false"></u-badge> -->
+									<text class="item-menu-badge"
+										v-if="item1.count>0">{{item1.count>9?'9+':item1.count}}</text>
+
+									<image class="item-menu-image" :src="'/static/menus/'+item1.componentName" mode="">
+									</image>
+									<view class="">
+										<text class="item-menu-name">{{item1.name}}</text>
+									</view>
+
+								</view>
+
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getDictionaryItem,
+		getMainMessage
+	} from '@/api/request2.js';
+import { useCountStore } from '@/store'
+
+	// 获取自定义的store
+	const store = useCountStore()
+	export default {
+		components: {
+		},
+		data() {
+			return {
+				title: 'WMS仓库管理系统',
+				scrollTop: 0, //tab标题的滚动条位置
+				oldScrollTop: 0,
+				current: 0, // 预设当前项的值
+				menuHeight: 0, // 左边菜单的高度
+				menuItemHeight: 0, // 左边菜单item的高度
+				itemId: '', // 栏目右边scroll-view用于滚动的id
+				tabbar: [],
+				menuItemPos: [],
+				arr: [],
+				scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
+				timer: null, // 定时器
+				forcedLogin: false,
+				count: 1,
+				position: [-10, -10],
+				timer: null,
+				menusCount: {}
+			}
+		},
+		onLoad() {
+			if (uni.getStorageSync("hasLogin")) {
+				uni.showLoading({
+					title: "正在获取菜单...",
+					mask: true
+				})
+				store.GetPermissionInfo().then(res => {
+					uni.hideLoading()
+					if (res.menus.length > 0) {
+						var menus = res.menus.filter(item => item.name == "PDA菜单管理")
+						if (menus.length > 0) {
+							var tab = menus[0].children.filter(res => res.visible == true)
+							tab.forEach(res => {
+								for (var i = 0; i < res.children.length; i++) {
+									if (res.children[i].visible == false) {
+										res.children.splice(i, 1)
+									}
+								}
+							})
+							this.tabbar = tab;
+							var i = 0;
+							this.tabbar.forEach(res => {
+								res.children.forEach(res => {
+									i++
+									console.log(res.name, i)
+								})
+							})
+							this.getDictory()
+							this.timerRefresh();
+						} else {
+							this.showMessage("获取菜单失败")
+						}
+					}
+
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				});
+			}
+
+		},
+		onReady() {
+			if (uni.getStorageSync("hasLogin")) {
+				this.getMenuItemTop()
+			}
+			
+
+		},
+		onHide() {
+			this.stopRefresh();
+		},
+		onShow() {
+			if (uni.getStorageSync("hasLogin") == null || uni.getStorageSync("hasLogin") == false) {
+				uni.showModal({
+					title: '未登录',
+					content: '您未登录 , 需要登录后才能继续', //如果需要强制登录，不显示取消按钮
+					showCancel: !this.forcedLogin,
+					success: (res) => {
+						if (res.confirm) {
+							//如果需要强制登录，使用reLanch方式
+							if (this.forcedLogin) {
+								uni.reLaunch({
+									url: '../login/index'
+								})
+							} else {
+								uni.navigateTo({
+									url: '../login/index'
+								})
+							}
+						}
+					}
+				})
+			} else {
+				this.timerRefresh();
+			}
+		},
+		onUnload() {
+			this.stopRefresh();
+		},
+
+		mounted() {},
+		methods: {
+			timerRefresh() {
+				this.getMainMessage();
+				this.stopRefresh();
+				var that = this;
+				this.timer = setInterval(function() {
+					that.getMainMessage();
+					console.log('刷新菜单');
+				}, 1000 * 60)
+			},
+			stopRefresh() {
+				if (this.timer) {
+					clearInterval(this.timer);
+					this.timer = null;
+				}
+			},
+			getMainMessage() {
+				getMainMessage().then(res => {
+					this.menusCount = res.data;
+					this.tabbar.forEach(item => {
+						item.children.forEach(rightItem => {
+							var count = this.menusCount[rightItem.component]
+							if (count != undefined) {
+								rightItem.count = count;
+							}
+						})
+					})
+					this.$forceUpdate()
+
+				}).catch(res=>{
+					console.log("获取消息失败",res)
+				});
+			},
+
+			findList(tab) {
+				let res = null
+				for (let i = 0; i < tab.length; i++) {
+					if (tab[i].visible === true) {
+						res = tab[i]
+						return tab[i]
+					} else if (tab[i].children && tab[i].children.length > 0) {
+						res = findList(tab[i].children)
+					}
+					if (res) break
+				}
+				return res
+			},
+			// 点击左边的栏目切换
+			async swichMenu(index) {
+				if (this.arr.length == 0) {
+					await this.getMenuItemTop();
+				}
+				if (index == this.current) return;
+				this.scrollRightTop = this.oldScrollTop;
+				this.$nextTick(function() {
+					this.scrollRightTop = this.arr[index];
+					this.current = index;
+					this.leftMenuStatus(index);
+				})
+			},
+			// 获取一个目标元素的高度
+			getElRect(elClass, dataVal) {
+				new Promise((resolve, reject) => {
+					const query = uni.createSelectorQuery().in(this);
+					query.select('.' + elClass).fields({
+						size: true
+					}, res => {
+						// 如果节点尚未生成，res值为null，循环调用执行
+						if (!res) {
+							setTimeout(() => {
+								this.getElRect(elClass);
+							}, 10);
+							return;
+						}
+						this[dataVal] = res.height;
+						resolve();
+					}).exec();
+				})
+			},
+			// 观测元素相交状态
+			async observer() {
+				this.tabbar.map((val, index) => {
+					let observer = uni.createIntersectionObserver(this);
+					// 检测右边scroll-view的id为itemxx的元素与right-box的相交状态
+					// 如果跟.right-box底部相交，就动态设置左边栏目的活动状态
+					observer.relativeTo('.right-box', {
+						top: 0
+					}).observe('#item' + index, res => {
+						if (res.intersectionRatio > 0) {
+							let id = res.id.substring(4);
+							this.leftMenuStatus(id);
+						}
+					})
+				})
+			},
+			// 设置左边菜单的滚动状态
+			async leftMenuStatus(index) {
+				this.current = index;
+				// 如果为0，意味着尚未初始化
+				if (this.menuHeight == 0 || this.menuItemHeight == 0) {
+					await this.getElRect('menu-scroll-view', 'menuHeight');
+					await this.getElRect('u-tab-item', 'menuItemHeight');
+				}
+				// 将菜单活动item垂直居中
+				this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
+			},
+			// 获取右边菜单每个item到顶部的距离
+			getMenuItemTop() {
+				new Promise(resolve => {
+					let selectorQuery = uni.createSelectorQuery();
+					selectorQuery.selectAll('.class-item').boundingClientRect((rects) => {
+						// 如果节点尚未生成，rects值为[](因为用selectAll，所以返回的是数组)，循环调用执行
+						if (!rects.length) {
+							setTimeout(() => {
+								this.getMenuItemTop();
+							}, 10);
+							return;
+						}
+						rects.forEach((rect) => {
+							// 这里减去rects[0].top，是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况)
+							this.arr.push(rect.top - rects[0].top);
+							resolve();
+						})
+					}).exec()
+				})
+			},
+			// 右边菜单滚动
+			async rightScroll(e) {
+				this.oldScrollTop = e.detail.scrollTop;
+				if (this.arr.length == 0) {
+					await this.getMenuItemTop();
+				}
+				if (this.timer) return;
+				if (!this.menuHeight) {
+					await this.getElRect('menu-scroll-view', 'menuHeight');
+				}
+				setTimeout(() => { // 节流
+					this.timer = null;
+					// scrollHeight为右边菜单垂直中点位置
+					let scrollHeight = e.detail.scrollTop + this.menuHeight / 2;
+					for (let i = 0; i < this.arr.length; i++) {
+						let height1 = this.arr[i];
+						let height2 = this.arr[i + 1];
+						// 如果不存在height2，意味着数据循环已经到了最后一个，设置左边菜单为最后一项即可
+						if (!height2 || scrollHeight >= height1 && scrollHeight < height2) {
+							this.leftMenuStatus(i);
+							return;
+						}
+					}
+				}, 10)
+			},
+			getDictory() {
+				var params = {
+					types: ["job_status", "location_type", "item_status","item_type","uom",
+						"inventory_status", "container_type", "pack_unit", "unplanned_receipt_reason",
+						"unplanned_issue_reason", "scrap_reason", "inspect_failed_reason",
+						"request_status", "inspect_type", "next_action", "sample_method", "transfer_mode",
+						"count_stage","inspect_result"
+					]
+				}
+				getDictionaryItem(params).then(res => {
+					if (res.data.length > 0) {
+						uni.setStorageSync("dictionary", res.data)
+					}
+				}).catch(res=>{
+					console.log("获取字典失败",res)
+				})
+
+			},
+
+			openCheck(url) {
+				uni.navigateTo({
+					url: "/" + url
+				});
+			},
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.u-wrap {
+		height: calc(100vh);
+		/* #ifdef H5 */
+		height: calc(100vh - var(--window-top));
+		/* #endif */
+		display: flex;
+		flex-direction: column;
+	}
+
+	.u-search-box {
+		padding: 18rpx 30rpx;
+	}
+
+	.u-menu-wrap {
+		flex: 1;
+		display: flex;
+		overflow: hidden;
+	}
+
+	.u-search-inner {
+		background-color: rgb(234, 234, 234);
+		border-radius: 100rpx;
+		display: flex;
+		align-items: center;
+		padding: 10rpx 16rpx;
+	}
+
+	.u-search-text {
+		font-size: 26rpx;
+		color: $u-tips-color;
+		margin-left: 10rpx;
+	}
+
+	.u-tab-view {
+		width: 180rpx;
+		height: 100%;
+	}
+
+	.u-tab-item {
+		height: 110rpx;
+		background: #f6f6f6;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 30rpx;
+		color: #444;
+		font-weight: 400;
+		line-height: 1;
+	}
+
+	.u-tab-item-active {
+		position: relative;
+		color: #000;
+		font-size: 30rpx;
+		font-weight: 600;
+		background: #fff;
+	}
+
+	.u-tab-item-active::before {
+		content: "";
+		position: absolute;
+		border-left: 4px solid $u-type-primary;
+		height: 32rpx;
+		left: 0;
+		top: 39rpx;
+	}
+
+	.u-tab-view {
+		height: 100%;
+	}
+
+	.right-box {
+		background-color: rgb(250, 250, 250);
+	}
+
+	.page-view {
+		padding: 16rpx;
+	}
+
+	.class-item {
+		margin-bottom: 30rpx;
+		background-color: #fff;
+		padding: 16rpx;
+		border-radius: 8rpx;
+	}
+
+	.class-item:last-child {
+		min-height: 100vh;
+	}
+
+	.item-title {
+		font-size: 32rpx;
+		color: $u-main-color;
+		font-weight: bold;
+	}
+
+	.item-menu-name {
+		font-weight: normal;
+		font-size: 28rpx;
+		color: $u-main-color;
+		width: 120rpx;
+		// word-wrap: break-word;
+		// word-break: break-all;
+		// white-space: pre-wrap;
+	}
+
+	.item-container {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.thumb-box {
+		width: 33.333333%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		margin-top: 20rpx;
+		text-align: center;
+	}
+
+	.item-menu-image {
+		width: 32px;
+		height: 32px;
+	}
+
+	.item-menu-badge {
+		width: 36rpx;
+		height: 36rpx;
+		align-items: center;
+		// top: -5px;
+		// right: -5px;
+		font-size: 0.6rem;
+		background-color: #fa3534;
+		position: absolute;
+		right: 0;
+		color: #fff;
+		text-align: center;
+		line-height: 36rpx;
+		border-radius: 50%;
+	}
+</style>
diff --git a/pages/inspect/coms/comInspectDetailCard.vue b/pages/inspect/coms/comInspectDetailCard.vue
new file mode 100644
index 0000000..850fbac
--- /dev/null
+++ b/pages/inspect/coms/comInspectDetailCard.vue
@@ -0,0 +1,154 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item :right-options="item.scaned?scanOptions:detailOptions"
+							@click="swipeClick($event,item)">
+							<recommend :detail="item" ></recommend>
+						<view :class="item.scaned?'scan_view':'' ">
+							<view class="" style="font-size: 30rpx;">
+								不合格数量 : {{item.FailedQty}}
+							</view>
+							<view class="" style="font-size: 30rpx;margin-top: 10rpx;">
+								不合格原因 : {{item.FailedReason}}
+							</view>
+						</view>
+							<u-line />
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<inspectQtyEdit ref="qtyEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
+		</inspectQtyEdit>
+		<job-detail-popup ref="receiptHint" :dataContent="showItem"></job-detail-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import Batch from "@/mycomponents/Batch/Batch.vue"
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import inspectQtyEdit from '@/mycomponents/qty/inspectQtyEdit.vue'
+
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+
+	import {
+		getDetailOption,
+		getDetailRemoveOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+
+
+	export default {
+		components: {
+			Batch,
+			itemQty,
+			recommend,
+			inspectQtyEdit,
+			jobDetailPopup,
+		},
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+			// dataContent: {
+			// 	handler(newName, oldName) {},
+			// 	immediate: true,
+			// 	deep: true
+			// }
+		},
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				// this.scanOptions = getDetailEditRemoveOption();
+				if (this.settingParam.allowModifyQty == 1) {
+					this.scanOptions = getDetailEditRemoveOption();
+				} else {
+					this.scanOptions = getDetailRemoveOption();
+				}
+			}
+		},
+		methods: {
+			openDetailCardPopup() {
+				this.$refs.winHint.openScanPopup()
+			},
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+
+			edit(item) {
+				this.editItem = item;
+				this.$refs.qtyEdit.openEditPopup(item.record, item.record.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.record = {}
+							item.balance = {}
+							item.inventoryStatus = item.RecommendInventoryStatus;
+							// item.record.qty = 0;
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty,faileQty,reasonInfo) {
+				this.editItem.record.qty = qty;
+				this.editItem.record.FailedQty = faileQty;
+				this.editItem.FailedQty = faileQty;
+				
+				this.editItem.FailedReason = reasonInfo.text;
+				this.editItem.record.FailedReason = reasonInfo.text;
+				this.$emit('updateData', this.editItem)
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inspect/coms/comInspectJobCard.vue b/pages/inspect/coms/comInspectJobCard.vue
new file mode 100644
index 0000000..ec68ce9
--- /dev/null
+++ b/pages/inspect/coms/comInspectJobCard.vue
@@ -0,0 +1,49 @@
+<template>
+	<job-com-main-card :dataContent="dataContent">
+		<view class="task_item">
+			<view class="task_text">
+				<view class="">
+					物料号 : {{dataContent.itemCode}}
+				</view>
+				<view class="">
+					批次 : {{dataContent.batch}}
+				</view>
+				<view class="">
+					检验类型 : {{getInspectType(dataContent.inspectType)}}
+				</view>
+				
+			</view>
+		</view>
+	</job-com-main-card>
+</template>
+
+<script>
+	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+	import {getInspectType} from '@/common/directory.js'
+	export default {
+		components: {
+			jobComMainCard,
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+			getInspectType(value){
+				return getInspectType(value)
+			}
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/inspect/coms/comInspectJobList.vue b/pages/inspect/coms/comInspectJobList.vue
new file mode 100644
index 0000000..87f0b01
--- /dev/null
+++ b/pages/inspect/coms/comInspectJobList.vue
@@ -0,0 +1,43 @@
+<template>
+	<!-- <page-meta root-font-size="18px"></page-meta> -->
+	<uni-popup ref="popupItems">
+		<scroll-view scroll-y="true" >
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-receipt-job-card :dataContent="item" @click='selectItem(item)'></com-receipt-job-card>
+				<u-line></u-line>
+			</view>
+		</scroll-view>
+	</uni-popup>
+</template>
+
+<script>
+	import comReceiptJobCard from '@/pages/purchaseReceipt/coms/comReceiptJobCard.vue'
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comReceiptJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: [] 
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inspect/coms/comInspectRequestCard.vue b/pages/inspect/coms/comInspectRequestCard.vue
new file mode 100644
index 0000000..f6c7931
--- /dev/null
+++ b/pages/inspect/coms/comInspectRequestCard.vue
@@ -0,0 +1,45 @@
+<template>
+ 	<request-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+			<view class="task_text">
+				采购收货记录单号 : {{dataContent.purchaseReceiptRecordNumber}}
+			</view>
+			<view class="task_text">
+				订单号 : {{dataContent.poNumber}}
+			</view>
+			<view class="task_text">
+				订单行 : {{dataContent.poLine}}
+			</view>
+ 			<view class="task_text">
+ 				供应商代码 : {{dataContent.supplierCode}}
+ 			</view>
+ 		</view>
+ 	</request-com-main-card>
+ </template>
+
+ <script>
+ 	import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			requestComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/inspect/coms/inspectComDetailCard.vue b/pages/inspect/coms/inspectComDetailCard.vue
new file mode 100644
index 0000000..417d5bc
--- /dev/null
+++ b/pages/inspect/coms/inspectComDetailCard.vue
@@ -0,0 +1,235 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<view class="">
+			<view class="">
+				<view class="cell_box uni-flex uni-row">
+					<!-- 	<view class="cell_info">
+						<view class="text_lightblue">类型</view>
+						<view>{{getInspectType(jobContent.inspectType)}}</view>
+					</view> -->
+					<view class="cell_info">
+						<view class="text_lightblue">收货数</view>
+						<view>{{jobContent.receiveQty}}{{getUnitInfo(jobContent.uom)}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">检验数</view>
+						<view>{{jobContent.sampleQty}}{{getUnitInfo(jobContent.uom)}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">不合格数</view>
+						<view style="color: #F56C6C;">{{jobContent.failedQty}}{{getUnitInfo(jobContent.uom)}}</view>
+					</view>
+
+					<view class="cell_info">
+						<view class="text_lightblue">报废数</view>
+						<view style="color: #EC9C00">{{jobContent.crackQty}}{{getUnitInfo(jobContent.uom)}}</view>
+					</view>
+				</view>
+				<!-- <u-line /> -->
+			</view>
+		</view>
+		<u-line />
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<item-compare-qty :dataContent="dataContent" :handleQty="Number(dataContent.handleQty)"
+						:isShowStdPack="false">
+					</item-compare-qty>
+					<view class="" style="margin-left: 20rpx; ">
+						<batch :batch="jobContent.batch"></batch>
+					</view>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item,index)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend :detail="item" :isShowPack="true" :isShowBatch="isShowBatch"
+								:isShowFromLocation="isShowLocation" style=' border-bottom: 0upx solid #fff;'></recommend>
+							<view v-if="item.failedQty>0||item.crackQty>0" :class="item.scaned?'scan_view':''"
+								style="font-size: 32rpx;padding-left: 2px;">
+								<view class="cell_box uni-flex uni-row">
+									<view class="cell_info uni-flex uni-row">
+										<view class="text_lightblue">
+											不合格
+										</view>
+										<view style="padding-left: 12rpx;color: #F56C6C;">
+											{{item.failedQty}}
+										</view>
+									</view>
+									<view class="cell_info uni-flex uni-row">
+										<view class="text_lightblue">
+											报废
+										</view>
+										<view style="padding-left: 12rpx;color: #EC9C00">
+											{{item.crackQty}}
+										</view>
+									</view>
+									<view class="cell_info uni-flex uni-row">
+										<view class="text_lightblue">
+											合格
+										</view>
+										<view style="padding-left: 12rpx;color: #34C759">
+											{{item.goodQty}}
+										</view>
+									</view>
+								</view>
+							</view>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<u-line />
+				</view>
+
+			</uni-collapse-item>
+		</uni-collapse>
+		<inspectEdit ref='inspectEdit' @getInspectResult='getInspectResult'>
+		</inspectEdit>
+		<job-detail-popup ref="receiptHint" :dataContent="showItem"></job-detail-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import inspectEdit from "@/pages/inspect/coms/inspectEdit.vue"
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getDetailRemoveOption
+	} from '@/common/array.js';
+	import {
+		getUnitInfo,
+		getInspectType
+	} from '@/common/directory.js';
+
+	export default {
+		components: {
+			itemCompareQty,
+			recommend,
+			jobDetailPopup,
+			batch,
+			inspectEdit
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			jobContent: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			jobType: {
+				type: String,
+				default: ""
+			},
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				option: [],
+				showItem: {},
+				editItem: {},
+				editIndex: 0,
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getDetailEditRemoveOption();
+				// if (this.dataContent.allowModifyQty == 1) {
+				// 	this.scanOptions = getDetailEditRemoveOption();
+				// } else {
+				// 	this.scanOptions = getDetailRemoveOption();
+				// }
+			}
+		},
+
+		methods: {
+			getInspectType(value) {
+				return getInspectType(value)
+			},
+
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item, index)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item, index) {
+				this.editIndex = index;
+				this.editItem = item;
+				this.$refs.inspectEdit.openEditPopup(this.editItem);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup(item)
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.failedQty = 0;
+							item.crackQty = 0;
+							item.sampleQty = 0;
+							item.notPassedQty = 0;
+							item.inspectResult = ""
+							item.failedReason = ""
+							// item.handleQty = 0;
+							item.handleQty = null;
+							item.photos = ""
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.$emit('updateData')
+			},
+			getInspectResult(result) {
+				this.dataContent.subList[this.editIndex] = result;
+				if (this.$refs.collapse1 != undefined) {
+					this.$nextTick(res => {
+						this.$refs.collapse1.resize()
+					})
+				}
+				this.$emit('updateData', )
+			},
+			getUnitInfo(value) {
+				return getUnitInfo(value).label
+			},
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inspect/coms/inspectEdit.vue b/pages/inspect/coms/inspectEdit.vue
new file mode 100644
index 0000000..a313af6
--- /dev/null
+++ b/pages/inspect/coms/inspectEdit.vue
@@ -0,0 +1,291 @@
+<template>
+	<view class="">
+		<uni-popup ref="editPopup" class="nopadpop camera_pop" :maskClick="false">
+			<view class="uni-list popuni_list camera_list">
+				<view class="list_cell uni-flex uni-row space-between">
+					<view class="title">箱码</view>
+					<text class="info">{{dataContent.packingNumber}}</text>
+				</view>
+				<view class="list_cell uni-flex uni-row space-between">
+					<view class="title">收货数量</view>
+					<view class="uni-flex uni-row u-col-center">
+						<text class="info">{{dataContent.qty}}</text>
+						<uom :uom="dataContent.uom"></uom>
+					</view>
+				</view>
+
+				<view class="list_cell uni-flex uni-row space-between">
+					<view class="title">不合格数量</view>
+					<view class="uni-flex uni-row u-col-center" style="">
+						<input class="qty_inspect_input" v-model="dataContent.failedQty" :focus="true" type="number" @input="checkNum" :maxlength="maxlength" />
+						<uom :uom="dataContent.uom"></uom>
+					</view>
+
+				</view>
+				<view class="list_cell uni-flex uni-row space-between">
+					<view class="title">报废数量</view>
+					<view class="uni-flex uni-row u-col-center" style="">
+						<input class="qty_inspect_input" v-model="dataContent.crackQty" :focus="true" type="number" @input="checkNum" :maxlength="maxlength" />
+						<uom :uom="dataContent.uom"></uom>
+					</view>
+
+				</view>
+
+				<view class="list_cell uni-flex uni-row space-between">
+					<view class="title">不合格原因</view>
+					<view class="info" style="padding: 0;">
+						<uni-data-picker :class="disabled===true?'disabled':''" :border="false" placeholder="请选择原因"
+							popup-title="不合格原因" :localdata="failedReasonArray" v-model="dataContent.failedReason">
+						</uni-data-picker>
+					</view>
+				</view>
+				
+				<view class="list_cell uni-flex uni-row space-between">
+					<view class="title">检验结果</view>
+					<view class="info" style="padding: 0;">
+						<uni-data-picker :class="disabled===true?'disabled':''" :border="false" placeholder="请选择检验结果"
+							popup-title="检验结果" :localdata="inspectResultArray" v-model="dataContent.inspectResult">
+						</uni-data-picker>
+					</view>
+				</view>
+
+				<uploadCamera ref="uploadImage" style="margin: 10rpx;" :disabled="disabled" @delete="deleteImg"
+					@select="select"></uploadCamera>
+			</view>
+			<view class="pop_btn uni-flex uni-row space-between" v-if="!disabled">
+				<button class="cancel" @click="back">返回</button>
+				<button class="save" @click="save">保存</button>
+			</view>
+		</uni-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getInspectFailedReasonList,
+		getInspectResultList
+	} from '@/common/directory.js';
+	
+	import {
+		deepCopyData,
+	} from '@/common/basic.js';
+	
+	import {
+		calc,
+	} from '@/common/calc.js';
+	
+	import {
+		uploadFile,
+		getFileList,
+		deleteFileById
+	} from '@/api/request2.js';
+
+	import uploadCamera from '@/pages/inspect/coms/uploadCamera.vue'
+	import uom from '@/mycomponents/qty/uom.vue'
+	export default {
+		components: {
+			uploadCamera,
+			uom
+		},
+		name: 'receipt_check',
+		data() {
+			return {
+				id: '',
+				failedReasonIndex: 0,
+				failedReasonArray: [],
+				dataContent: {},
+				inspectResultArray: [],
+				picInfoList: [],
+				maxlength: 10
+			}
+		},
+		props: {
+			// dataContent: {
+			// 	type: Object,
+			// 	value: null
+			// },
+
+			disabled: {
+				type: Boolean,
+				value: true
+			},
+		},
+
+		methods: {
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //包含小数点
+				let reg = /^[0-9]+$/; //正整数
+				if (dot > -1) {
+					this.maxlength = dot + 7; //长度是小数点后两位
+					if (value.length > dot + 7) {
+			
+					}
+				}
+				if (reg.test(value)) { //如果是正整数不包含小数点
+					this.maxlength = 10;
+				}
+			},
+			openEditPopup(item) {
+				this.failedReasonArray = getInspectFailedReasonList();
+				this.inspectResultArray =getInspectResultList()
+				//拷贝数据到页面显示，防止修改数据原数据修改
+				this.dataContent = deepCopyData(item);
+				this.getFileList();
+				this.$refs['editPopup'].open("bottom");
+
+			},
+			
+			getFileList() {
+				getFileList("jobInspectDetail", this.dataContent.id).then(res => {
+					if(res.data){
+						var imageFiles = [];
+						 res.data.forEach(item=>{
+							 var image = this.createImage(item.id, item.url, item.path, item.size)
+							 imageFiles.push(image)
+						 })
+					}
+
+					if (imageFiles.length > 0) {
+						this.$nextTick(function() {
+							this.$refs.uploadImage.setFiles(imageFiles);
+							this.setPhotosInfo();
+						})
+
+					}
+				})
+			},
+			
+			setPhotosInfo(){
+				var list = this.$refs.uploadImage.getFiles()
+				var photoItem = "";
+				for (var i = 0; i < list.length; i++) {
+					if (list.length - 1 == i) {
+						photoItem = photoItem + list[i].url
+					} else {
+						photoItem = photoItem + list[i].url + ","
+					}
+				}
+				this.dataContent.photos = photoItem;
+			},
+
+
+			createImage(id, url, fileName, size) {
+
+				let image = {
+					id: id,
+					name: fileName,
+					extname: "png",
+					fileType: "image",
+					url: url,
+					size: size,
+					image: {
+						width: 175,
+						height: 175,
+						location: url,
+					},
+					path: url,
+					progress: 100,
+					status: "ready"
+				}
+
+				return image;
+			},
+
+			deleteImg(content) {
+				var id = content.id
+				if (id != undefined) {
+					deleteFileById(id).then(res => {
+						if (res.data) {
+							uni.showToast({
+								title: "删除成功"
+							})
+						}
+					}).catch(error => {
+						console.log(error)
+					})
+				} else {
+					this.getFileList();
+				}
+
+			},
+			select(content) {
+				this.uploadFile(content);
+			},
+
+			back() {
+				this.$refs['editPopup'].close();
+				// this.afterSave()
+			},
+			maskClick() {
+
+			},
+
+			afterSave() {
+				this.$emit('getInspectResult', this.dataContent)
+				this.$refs['editPopup'].close();
+			},
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						// this.afterCloseMessage()
+					}
+				});
+			},
+
+
+			save() {
+				var failedQty = Number(this.dataContent.failedQty);
+				var crackQty = Number(this.dataContent.crackQty);
+				var qty = Number(this.dataContent.qty);
+				if (calc.add(crackQty,failedQty)> qty) {
+					var total = calc.add(crackQty,failedQty)
+					this.showMessage("不合格数[" + failedQty + "]+报废数量[" + crackQty + "]等于[" + total + "]大于收货数量[" +
+						qty + "]")
+					return
+				}
+				if (failedQty > 0 || crackQty > 0) {
+					if (this.dataContent.failedReason == null||this.dataContent.failedReason == "") {
+						this.showMessage("请选择不合格原因")
+						return
+					}
+				}
+				
+				if(this.dataContent.inspectResult == null||this.dataContent.inspectResult == ""){
+					this.showMessage("请选择检验结果")
+					return;
+				}
+				
+				this.dataContent.failedQty = failedQty;
+				this.dataContent.crackQty = crackQty
+				var temp=calc.sub(this.dataContent.handleQty,failedQty);
+				this.dataContent.goodQty =calc.sub(temp,failedQty,crackQty);
+				this.afterSave()
+
+
+			},
+			uploadFile(content) {
+				uploadFile("jobInspectDetail", this.dataContent.id, content.path, res => {
+					if (res != undefined) {
+						uni.showToast({
+							title: "上传成功"
+						})
+					} else {
+						uni.showToast({
+							title: "上传失败"
+						})
+					}
+					this.getFileList();
+				})
+			}
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.disabled {
+		pointer-events: none;
+	}
+</style>
diff --git a/pages/inspect/coms/inspectInfoPopup.vue b/pages/inspect/coms/inspectInfoPopup.vue
new file mode 100644
index 0000000..33d87d5
--- /dev/null
+++ b/pages/inspect/coms/inspectInfoPopup.vue
@@ -0,0 +1,121 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">申请单号 : </text>
+							<text class="text_wrap">{{dataContent.requestNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">采购收货记录单号 : </text>
+							<text class="text_wrap">{{dataContent.purchaseReceiptRecordNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">供应商代码 : </text>
+							<text class="text_wrap">{{dataContent.supplierCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">仓库代码 : </text>
+							<text class="text_wrap">{{dataContent.warehouseCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">货主代码 : </text>
+							<text class="text_wrap">{{dataContent.ownerCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.poNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">批次 : </text>
+							<text class="text_wrap">{{dataContent.batch}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">物品代码 : </text>
+							<text class="text_wrap">{{dataContent.itemCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">检验类型 : </text>
+							<text class="text_wrap">{{getInspectType(dataContent.inspectType)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">下一步检验动作 : </text>
+							<text class="text_wrap">{{dataContent.nextAction}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">抽检方式 : </text>
+							<text class="text_wrap">{{getSampleMethod(dataContent.sampleMethod)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">计量单位 : </text>
+							<text class="text_wrap">{{getUnitInfo(dataContent.uom)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">收货数量 : </text>
+							<text class="text_wrap">{{dataContent.receiveQty}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">样品数量 : </text>
+							<text class="text_wrap">{{dataContent.sampleQty}} </text>
+						</view>
+					</view>
+				</view>
+				<u-line></u-line>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	import{getInspectType,
+	getSampleMethod,
+	getUnitInfo
+	} from "@/common/directory.js"
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			getInspectType(value){
+				return getInspectType(value);
+			},
+			getSampleMethod(value){
+				return getSampleMethod(value);
+			},
+			getUnitInfo(value){
+				var info = getUnitInfo(value)
+				return info.label;
+			},
+			
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/inspect/coms/requestDetailInfoPopup.vue b/pages/inspect/coms/requestDetailInfoPopup.vue
new file mode 100644
index 0000000..13ec899
--- /dev/null
+++ b/pages/inspect/coms/requestDetailInfoPopup.vue
@@ -0,0 +1,85 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<requestDetailCommonInfo :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">包装号 : </text>
+							<text class="text_wrap">{{dataContent.packingNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">器具号 : </text>
+							<text class="text_wrap">{{dataContent.containerNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">批次 : </text>
+							<text class="text_wrap">{{dataContent.batch}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从库位代码 : </text>
+							<text class="text_wrap">{{dataContent.fromLocationCode	}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">库存状态 : </text>
+							<text class="text_wrap">{{dataContent.inventoryStatus}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.poNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.poLine}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从货主代码 : </text>
+							<text class="text_wrap">{{dataContent.fromOwnerCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到货主代码 : </text>
+							<text class="text_wrap">{{dataContent.toOwnerCode}} </text>
+						</view>
+					</view>
+				</view>
+			</requestDetailCommonInfo>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue'
+	export default {
+		components: {
+			requestDetailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/inspect/coms/requestInfoPopup.vue b/pages/inspect/coms/requestInfoPopup.vue
new file mode 100644
index 0000000..0fcc258
--- /dev/null
+++ b/pages/inspect/coms/requestInfoPopup.vue
@@ -0,0 +1,116 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<request-common-info :dataContent="dataContent"  @onClose="closePopup">
+				<view class="">
+					<comListItem :dataList="dataList"></comListItem>
+				</view>
+				<u-line></u-line>
+			</request-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestCommonInfo from '@/mycomponents/request/requestCommonInfo.vue'
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+		components: {
+			requestCommonInfo,
+			comListItem
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				},
+				dataList:[]
+			}
+		},
+		watch:{
+			dataContent: {
+				handler(newName, oldName) {
+					this.dataList=[{
+							title: '采购收货记录单号',
+							content: this.dataContent.purchaseReceiptRecordNumber
+						}, {
+							title: '供应商代码',
+							content: this.dataContent.supplierCode
+						},{
+							title: '从仓库代码',
+							content: this.dataContent.fromWarehouseCode
+						},{
+							title: '从库位类型范围',
+							content: this.dataContent.fromLocationTypes,
+							type:"locationType"
+						},{
+							title: '从库区代码范围',
+							content: this.dataContent.fromAreaCodes
+						},{
+							title: '货主代码',
+							content: this.dataContent.ownerCode
+						},{
+							title: '订单号',
+							content: this.dataContent.poNumber
+						},{
+							title: '订单行',
+							content: this.dataContent.poLine
+						},{
+							title: '批次',
+							content: this.dataContent.batch
+						},{
+							title: '物品代码',
+							content: this.dataContent.itemCode,
+						},{
+							title: '计量单位',
+							content: this.dataContent.uom,
+							type:"uom"
+						},
+						{
+							title: '收货数量',
+							content: this.dataContent.receiveQty
+						},{
+							title: '检验类型',
+							content: this.dataContent.inspectType,
+							type:'inspectType'
+						},{
+							title: '下一步检验动作',
+							content: this.dataContent.nextAction
+						},
+						{
+							title: '抽检方式',
+							content: this.dataContent.sampleMethod,
+							type:'sampleMethod'
+						},
+						{
+							title: '样品数量',
+							content: this.dataContent.sampleQty
+						}];
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/inspect/coms/uploadCamera.vue b/pages/inspect/coms/uploadCamera.vue
new file mode 100644
index 0000000..13718fd
--- /dev/null
+++ b/pages/inspect/coms/uploadCamera.vue
@@ -0,0 +1,122 @@
+<!--拍照上传-->
+<template>
+	<view>
+		<!-- <button @click="camera">拍照</button> -->
+		<uni-file-picker ref="files" limit="3" title="最多选择3张图片" :auto-upload="false" v-model="imageValue"
+			:sizeType="sizeType" fileMediatype="image" mode="grid" file-extname="png,jpg" @select="select"
+			@delete="deleteImg" @progress="progress" @success="success" 
+			:disabled="disabled" :del-icon='!disabled'
+			@fail="fail" />
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "uploadCamera",
+		data() {
+			return {
+				imageValue: [],
+				sizeType: ['compressed']
+			}
+		},
+		props: {
+			disabled: {
+				type: Boolean,
+				value: false
+			}
+		},
+		watch: {},
+		methods: {
+			// 父组件上传调用
+			upload() {
+				this.$refs.files.upload()
+			},
+			// 获取上传状态
+			select(e) {
+				// console.log('选择文件：', e)
+				this.$emit("select",e.tempFiles[0])
+			},
+
+			//删除
+			deleteImg(e) {
+				// console.log('删除：', e)
+				this.$emit("delete",e.tempFile)
+			},
+
+			// 获取上传进度
+			progress(e) {
+				console.log('上传进度：', e)
+			},
+
+			// 上传成功
+			success(e) {
+				console.log('上传成功')
+			},
+
+			// 上传失败
+			fail(e) {
+				console.log('上传失败：', e)
+			},
+
+			getFiles() {
+				return this.$refs.files.files;
+			},
+			setFiles(files) {
+				this.$refs.files.files = files;
+			},
+			clearFiles() {
+				this.$refs.files.files = []
+			}
+
+
+			// camera(){
+			// 	let that = this
+			// 	uni.chooseImage({
+			// 		count: 3, //默认9
+			// 		sizeType: ['original'], //原图
+			// 		sourceType: ['camera'], //拍照
+			// 		success: function (res) {
+			// 			console.log(res.tempFilePaths)
+			// 			console.log(JSON.stringify(res.tempFilePaths));
+			// 			that.select({
+			// 				tempFilePaths:[
+			// 					JSON.stringify(res.tempFilePaths[0])
+			// 				],
+			// 				tempFiles:[
+			// 					{path: res.tempFilePaths[0]}
+			// 				]})
+			// 		}
+			// 	});
+			// },
+			// camera(){
+			// 	// 获取摄像头管理对象 getCamera 参数 index 指定要获取摄像头的索引值，1表示主摄像头，2表示辅摄像头。如果没有设置则使用系统默认主摄像头。
+			// 	// 安卓不能默认打开前置摄像头 ios可以
+			// 	const cmr = plus.camera.getCamera()
+			// 	// 字符串数组，摄像头支持的拍照分辨率
+			// 	const res = cmr.supportedImageResolutions[0]
+			// 	// 字符串数组，摄像头支持的拍照文件格式
+			// 	const fmt = cmr.supportedImageFormats[0]
+			// 	// 进行拍照操作
+			// 	cmr.captureImage((path) => {
+			// 	    // this.compressImage(path)
+			// 	    // path 图片地址
+			// 	    console.log(path)
+			// 		plus.gallery.save( path, function () {
+			// 			alert( "保存图片到相册成功" );
+			// 		},(error) => {
+			// 			alert(error);
+			// 		});
+			// 	},
+			// 	(error) => {
+			// 	    console.log('Capture image failed: ' + error.message)
+			// 	}, {
+			// 	    resolution: res,
+			// 	    format: fmt,
+			// 		filename:''
+			// 	})
+			// },
+		}
+	}
+</script>
+<style scoped lang="scss">
+</style>
diff --git a/pages/inspect/job/inspectDetail.vue b/pages/inspect/job/inspectDetail.vue
new file mode 100644
index 0000000..54b85aa
--- /dev/null
+++ b/pages/inspect/job/inspectDetail.vue
@@ -0,0 +1,533 @@
+<template>
+	<view class="page-wraper">
+		<view style="margin: 5px;">
+			<job-top :dataContent="jobContent"></job-top>
+			<view>
+				<view class="card_content"> 检验类型 : {{getInspectType(jobContent.inspectType)}}</view>
+			</view>
+		</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<inspect-com-detail-card :dataContent="item" :jobContent="jobContent" @remove="updateData"
+						:isShowBatch="false" @updateData='updateData'>
+					</inspect-com-detail-card>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		takeInspectJob,
+		cancleTakeInspectJob,
+		getInspectJobDetail,
+		inspectJobSubmit,
+		getFileList,
+		deleteFileByTable,
+		createPutAwayRequest
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		getCurrDateTime,
+		getPackingNumberAndBatch,
+		navigateBack
+	} from '@/common/basic.js';
+	import {
+		getInventoryStatusName,
+		getDirectoryItemArray,
+		getInspectType
+	} from '@/common/directory.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import inspectComDetailCard from "@/pages/inspect/coms/inspectComDetailCard.vue"
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	export default {
+		name: 'returnDetail',
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			winScanPackAndLocation,
+			inspectComDetailCard,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				received: false,
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				businessTypeInfo: {},
+				fromInventoryStatuses: "",
+				managementList: [],
+				selectedItem: {},
+				failedQty: 0,
+				crackQty: 0,
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			this.failedQty = option.failedQty;
+			this.crackQty = option.crackQty;
+
+			if (this.id != undefined) {
+				// 	//新建的任务自动接收
+				this.getDetail();
+			}
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.received) {
+					//取消承接任务	
+					cancleTakeInspectJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			deleteFileByTable(id) {
+				debugger
+				deleteFileByTable("jobInspectDetail", id).then(res => {})
+			},
+
+			clearPicList(subList) {
+				subList.forEach(item => {
+					this.deleteFileByTable(item.id)
+				})
+			},
+
+
+			//接收
+			receive(callback) {
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				if (this.id != null) {
+					takeInspectJob(this.id).then(res => {
+						uni.hideLoading();
+						callback();
+					}).catch(error => {
+						uni.hideLoading();
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getInspectJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobContent.failedQty = this.failedQty
+							that.jobContent.crackQty = this.crackQty;
+							that.subList = res.data.subList;
+							this.clearPicList(that.subList);
+							that.subList.forEach(res => {
+								res.batch = that.jobContent.batch
+								res.goodQty = 0;
+								res.failedQty = 0;
+								res.crackQty = 0;
+								res.sampleQty = 0;
+								res.notPassedQty = 0;
+								res.failedReason = "";
+								res.photos = ""
+								res.inspectResult = ""
+							})
+							that.fromInventoryStatuses = that.jobContent.outInventoryStatuses
+							that.detailSource = getDataSource(that.subList);
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+
+			calcScanCount(closeScan) {
+				let items = this.subList.filter(r => {
+					if (r.scaned) {
+						return r;
+					}
+				})
+				this.scanCount = items != null ? items.length : 0;
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				}
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.continueScan()
+				this.$forceUpdate();
+			},
+
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch
+						})
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showMessage("箱码【" + packingNumber + "】已经扫描")
+							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,是否继续检验?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty)
+													itemDetail.balance = result.balance;
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									} else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.balance = result.balance;
+									itemDetail.handleQty = Number(result.balance.qty)
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+					this.scanPopupGetFocus();
+				} catch (e) {
+					this.showErrorMessage(e.message);
+				}
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this
+							.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+
+
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var params = this.setParams();
+				console.log("提交参数", JSON.stringify(params));
+				inspectJobSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成到货检验记录<br>" + res.data)
+						// createPutAwayRequest(res.data).then(putawayres => {
+						// 	this.showCommitSuccessMessage("生成上架申请单号<br>" + putawayres.data)
+						// }).catch(error => {
+						// 	uni.hideLoading();
+						// 	this.showErrorMessage(error);
+						// })
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					this.showErrorMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			setParams() {
+				var list = []
+				this.detailSource.forEach(res => {
+					res.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.sampleQty = detail.qty;
+							detail.failedQty = detail.failedQty;
+							detail.crackQty = detail.crackQty;
+							detail.notPassedQty = detail.failedQty;
+							detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty;
+							detail.inspectUser = this.$store.state.user.id
+
+							//合格数==样品数，全部合格
+							if (detail.goodQty == detail.handleQty) {
+								detail.toInventoryStatus = "OK"
+							} else {
+								//合格数！=样品数，全部合格
+								//报废数量>0
+								if (detail.crackQty > 0) {
+									detail.toInventoryStatus = "SCRAP"
+								} else {
+									detail.toInventoryStatus = "NOK"
+								}
+							}
+						}
+
+						// else {
+						// 	detail.sampleQty = detail.qty;
+						// 	detail.failedQty = 0;
+						// 	detail.crackQty = 0;
+						// 	detail.notPassedQty = 0;
+						// 	detail.handleQty = 0;
+						// 	detail.goodQty = detail.qty;
+						// 	detail.inspectUser = this.$store.state.user.id
+						// 	detail.toInventoryStatus = "OK"
+						// }
+
+						list.push(detail)
+					})
+				})
+				this.jobContent.subList = list
+				this.jobContent.nextAction = "PARTIAL_OK";
+				return this.jobContent;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(2);
+				})
+			},
+			getInspectType(value) {
+				return getInspectType(value)
+			}
+
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/inspect/job/inspectFullDetail.vue b/pages/inspect/job/inspectFullDetail.vue
new file mode 100644
index 0000000..94ecd79
--- /dev/null
+++ b/pages/inspect/job/inspectFullDetail.vue
@@ -0,0 +1,553 @@
+<template>
+	<view class="page-wraper">
+		<view style="margin: 5px;">
+			<job-top :dataContent="jobContent"></job-top>
+			<view>
+				<view class="card_content"> 检验类型 : {{getInspectType(jobContent.inspectType)}}</view>
+			</view>
+		</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<inspect-com-detail-card :dataContent="item" :jobContent="jobContent" @remove="updateData"
+						:isShowBatch="false" @updateData='updateData'>
+					</inspect-com-detail-card>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		takeInspectJob,
+		cancleTakeInspectJob,
+		getInspectJobDetail,
+		inspectJobSubmit,
+		deleteFileById,
+		getFileList,
+		deleteFileByTable,
+		createPutAwayRequest
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		getCurrDateTime,
+		getPackingNumberAndBatch,
+		navigateBack
+	} from '@/common/basic.js';
+	import {
+		getInventoryStatusName,
+		getDirectoryItemArray,
+		getInspectType
+	} from '@/common/directory.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import inspectComDetailCard from "@/pages/inspect/coms/inspectComDetailCard.vue"
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	export default {
+		name: 'returnDetail',
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			winScanPackAndLocation,
+			inspectComDetailCard,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				businessTypeInfo: {},
+				fromInventoryStatuses: "",
+				managementList: [],
+				selectedItem: {},
+				jobStatus: ""
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				// 	//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus == "2") {
+					//取消承接任务	
+					cancleTakeInspectJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			deleteFileByTable(id) {
+				deleteFileByTable("jobInspectDetail", id).then(res => {})
+			},
+
+			clearPicList(subList) {
+				subList.forEach(item => {
+					this.deleteFileByTable(item.id)
+				})
+			},
+
+			//接收
+			receive(callback) {
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				if (this.id != null) {
+					takeInspectJob(this.id).then(res => {
+						uni.hideLoading();
+						callback();
+					}).catch(error => {
+						uni.hideLoading();
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getInspectJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status
+							this.jobContent.failedQty = 0;
+							this.jobContent.crackQty = 0;
+							this.jobContent.notPassedQty = 0;
+							that.subList = res.data.subList;
+							this.clearPicList(that.subList);
+							that.subList.forEach(res => {
+								res.batch = that.jobContent.batch
+								res.goodQty = 0;
+								res.failedQty = 0;
+								res.crackQty = 0;
+								res.sampleQty = 0;
+								res.notPassedQty = 0;
+								res.failedReason = "";
+								res.photos = ""
+								res.inspectResult = ""
+							})
+							that.fromInventoryStatuses = that.jobContent.outInventoryStatuses
+							that.detailSource = getDataSource(that.subList);
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+
+			calcScanCount(closeScan) {
+				let items = this.subList.filter(r => {
+					if (r.scaned) {
+						return r;
+					}
+				})
+				this.scanCount = items != null ? items.length : 0;
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				}
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.calcJobQty();
+				this.continueScan()
+				this.$forceUpdate();
+			},
+			calcJobQty() {
+				var failedQty = 0;
+				var crackQty = 0;
+				for (let item of this.detailSource) {
+					for (let detail of item.subList) {
+						if (detail != undefined && detail.scaned) {
+							failedQty = calc.add(failedQty, detail.failedQty)
+							crackQty = calc.add(crackQty, detail.crackQty)
+						}
+					}
+				}
+				this.jobContent.failedQty = failedQty;
+				this.jobContent.crackQty = crackQty;
+
+			},
+
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch
+						})
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showMessage("箱码【" + packingNumber + "】已经扫描")
+							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,是否继续检验?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty)
+													itemDetail.balance = result.balance;
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									} else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.balance = result.balance;
+									itemDetail.handleQty = Number(result.balance.qty)
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+					this.scanPopupGetFocus();
+				} catch (e) {
+					this.showErrorMessage(e.message);
+				}
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				} else {
+					if (this.scanCount == this.subList.length) {
+						this.submitJob();
+					} else {
+						//如果是全检，必须全部扫描-------改为:任务中的是否允许部分提交：nxt 2023年12月13日
+						if (this.jobContent.allowPartialComplete == "TRUE") {
+							this.submitJob();
+						} else {
+							//不允许部分提交，提示
+							this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+								"]箱总共[" + this
+								.subList.length + "]箱", res => {
+									if (res) {
+										this.openScanPopup();
+									}
+								});
+						}
+					}
+				}
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var params = this.setParams();
+				console.log("提交参数", JSON.stringify(params));
+				inspectJobSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data)
+						//创建完检验记录后创建上架申请
+						// createPutAwayRequest(res.data).then(putawayres => {
+						// 	this.showCommitSuccessMessage("生成上架申请单号<br>" + putawayres.data)
+						// }).catch(error => {
+						// 	uni.hideLoading();
+						// 	this.showErrorMessage(error);
+						// }) 
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					this.showErrorMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			setParams() {
+				var list = []
+				this.detailSource.forEach(res => {
+					res.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.sampleQty = detail.qty;
+							detail.failedQty = detail.failedQty;
+							detail.crackQty = detail.crackQty;
+							detail.notPassedQty = detail.failedQty;
+							var tempQty = calc.sub(detail.handleQty, detail.failedQty)
+							detail.goodQty = calc.sub(tempQty, detail.crackQty);
+							detail.inspectUser = this.$store.state.user.id
+
+							//合格数==样品数，全部合格
+							if (detail.goodQty == detail.handleQty) {
+								detail.toInventoryStatus = "OK"
+							} else {
+								//合格数！=样品数，全部合格
+								//报废数量>0
+								if (detail.crackQty > 0) {
+									detail.toInventoryStatus = "SCRAP"
+								} else {
+									detail.toInventoryStatus = "NOK"
+								}
+							}
+
+						} else {
+							detail.sampleQty = detail.qty;
+							detail.failedQty = 0;
+							detail.crackQty = 0;
+							detail.notPassedQty = 0;
+							detail.goodQty = detail.qty;
+							detail.inspectUser = this.$store.state.user.id
+							detail.toInventoryStatus = "OK"
+						}
+
+						list.push(detail)
+					})
+				})
+				this.jobContent.notPassedQty = Number(this.jobContent.failedQty) + Number(this.jobContent.crackQty)
+				this.jobContent.subList = list
+				this.jobContent.nextAction = "PARTIAL_OK";
+				return this.jobContent;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1);
+				})
+			},
+			getInspectType(value) {
+				return getInspectType(value)
+			}
+
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/inspect/job/inspectJob.vue b/pages/inspect/job/inspectJob.vue
new file mode 100644
index 0000000..2cb2ab9
--- /dev/null
+++ b/pages/inspect/job/inspectJob.vue
@@ -0,0 +1,295 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-inspect-job-card :dataContent="item" @click='openJobDetail(item)'></com-inspect-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+			<inspectInfoPopup ref='jobInfoPopup'></inspectInfoPopup>
+			<com-inspect-job-list ref="comReceiptJobList" @selectedItem="selectedItem"></com-inspect-job-list>
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		cancleTakeInspectJob,
+		getInspectJobList,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import inspectInfoPopup from '@/pages/inspect/coms/inspectInfoPopup.vue'
+	import comInspectJobCard from '@/pages/inspect/coms/comInspectJobCard.vue'
+	import comInspectJobList from '@/pages/inspect/coms/comInspectJobList.vue'
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comInspectJobCard,
+			inspectInfoPopup,
+			comInspectJobList,
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getInspectJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("到货检验(" + this.totalCount + ")");
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("到货检验");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+
+			openJobDetail(item) {
+				// uni.navigateTo({
+				// 	url: './inspectDetail?id=' + item.id + '&status=' + item.status
+				// });
+				
+				if(item.inspectType=="FULL"){
+					uni.navigateTo({
+						url: './inspectFullDetail?id=' + item.id + '&status=' + item.status
+					});
+				}else {
+					uni.navigateTo({
+						url: './inspectResult?id=' + item.id + '&status=' + item.status
+					});
+				}
+				
+				
+			},
+
+			showItemList(itemList) {
+				this.$refs.comReceiptJobList.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeInspectJob(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "放弃任务成功"
+						})
+					} else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getInspectJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/inspect/job/inspectResult.vue b/pages/inspect/job/inspectResult.vue
new file mode 100644
index 0000000..c755674
--- /dev/null
+++ b/pages/inspect/job/inspectResult.vue
@@ -0,0 +1,585 @@
+<template>
+	<view class="" v-if="jobContent!=null">
+
+		<view class="pda-list">
+			<view class="pda-list-cell">
+				<view class="pda-list-cell-left">
+					<view class="uni-label">类型</view>
+				</view>
+				<view class="pda-list-cell-db">
+					{{getInspectName(jobContent.inspectType) }}
+				</view>
+			</view>
+			<view class="pda-list-cell">
+				<view class="pda-list-cell-left">
+					<view class="uni-label">物料号</view>
+				</view>
+				<view class="pda-list-cell-db">
+					<view class="uni-flex space-between">
+						<input class="display-input" type="text" :disabled="true" v-model="jobContent.itemCode" />
+					</view>
+				</view>
+			</view>
+			<view class="pda-list-cell">
+				<view class="pda-list-cell-left">
+					<view class="uni-label">批次</view>
+				</view>
+				<view class="pda-list-cell-db">
+					<input class="display-input" type="text" :disabled="true" v-model="jobContent.batch" />
+				</view>
+			</view>
+			<view class="pda-list-cell" style="margin-top: 10rpx;margin-bottom: 10rpx;">
+				<view class="pda-list-cell-left">
+					<view class="uni-label">收货数量</view>
+				</view>
+				<view class="pda-list-cell-db">
+					<text>{{jobContent.receiveQty}} {{getUnitInfo(jobContent.uom)}}</text>
+				</view>
+
+			</view>
+			<view class="pda-list-cell">
+				<view class="pda-list-cell-left">
+					<view class="uni-label">检验数量</view>
+				</view>
+				<view class="pda-list-cell-db">
+					<text>{{jobContent.sampleQty}} {{getUnitInfo(jobContent.uom)}}</text>
+				</view>
+			</view>
+
+			<view class="pda-list-cell">
+				<view class="pda-list-cell-left">
+					<view class="uni-label">下一步动作</view>
+				</view>
+				<view class="pda-list-cell-db">
+					<uni-data-picker class='uni-data-picker' placeholder="请选择下一步动作" popup-title="下一步动作"
+						@change="nextStepChange" :localdata="nextActionList" v-model="nextAction">
+					</uni-data-picker>
+				</view>
+			</view>
+
+			<view class="pda-list-cell">
+				<view class="pda-list-cell-left">
+					<view class="uni-label">不合格数量</view>
+				</view>
+				<view class="pda-list-cell-db">
+					<uni-easyinput :inputBorder="true" type="number" placeholder="请输入数字" v-model="jobContent.failedQty"
+						@clear="clearFailedQty" @blur="failedQtyConfirm" class="count-input">
+					</uni-easyinput>
+				</view>
+			</view>
+
+
+			<view class="pda-list-cell">
+				<view class="pda-list-cell-left">
+					<view class="uni-label">报废数量</view>
+				</view>
+				<view class="pda-list-cell-db">
+					<uni-easyinput placeholder="请输入数字" type="number" v-model="jobContent.crackQty" @blur=""
+						@clear="clearCrackQty" class="count-input">
+					</uni-easyinput>
+				</view>
+			</view>
+
+
+
+			<view class="pda-list-cell">
+				<view class="pda-list-cell-left">
+					<view class="uni-label">最终不合格</view>
+				</view>
+				<view class="pda-list-cell-db">
+					<uni-easyinput placeholder="待计算" type="number" :disabled="true" v-model="jobContent.notPassedQty"
+						class="count-input">
+					</uni-easyinput>
+				</view>
+			</view>
+
+			<view class="pda-list-cell">
+				<view class="pda-list-cell-left">
+					<view class="uni-label">备注</view>
+				</view>
+				<view class="pda-list-cell-db">
+					<uni-easyinput placeholder="请输入备注" type="text" autoHeight v-model="jobContent.remark"
+						class="count-input">
+					</uni-easyinput>
+				</view>
+			</view>
+		</view>
+
+		<view class="" v-if="false">
+			<uni-collapse>
+				<uni-collapse-item title="库位列表" style='font-size: 40rpx;' :open='true'>
+					<view style="">
+						<scroll-view scroll-y="true" class="scroll-detail">
+							<view class=""
+								style="font-size: 35rpx;display: flex;flex-direction: row;align-items: center;width: 100%;"
+								v-for="(item, index) in detailList" :key="item.id">
+								<text style="font-size: 35rpx;margin-right: 20rpx;">{{index+1}}.</text>
+
+								<view class="">
+									<view class="">
+										箱码:{{item.packingNumber}}
+									</view>
+									<view class="">
+										库位:{{item.fromLocationCode}}
+									</view>
+									<u-line />
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+				</uni-collapse-item>
+			</uni-collapse>
+		</view>
+
+		<view class="bottom" style="padding-bottom: 20rpx;">
+			<button :disabled="submitting" type="primary" class="save-button" @click="commit">提交</button>
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getInspectJobDetail,
+		takeInspectJob,
+		cancleTakeInspectJob,
+		inspectJobSubmit,
+		createPutAwayRequest
+	} from '@/api/request2.js';
+
+	import {
+		getInspectFailedReasonList,
+		getNextActionList,
+		getInspectType,
+		getUnitInfo
+	} from '@/common/directory.js';
+
+	import {
+		goHome,
+		navigateBack
+	} from '@/common/basic.js';
+
+	export default {
+		components: {},
+		data() {
+			return {
+				id: '',
+				status: "",
+				itemDetail: {},
+				inspectType: '', //免检 全检 抽检 
+				failedReasonIndex: 0,
+				failedReasonArray: [],
+				nextStep: '',
+				submitting: false,
+				locations: [],
+				value: ['0'],
+				jobContent: {}, //任务内容
+				detailList: [], //接口返回的任务details
+				detailSource: [], //绑定在页面上的数据源
+				nextActionList: [],
+				nextAction: null,
+				jobStatus: ""
+
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		onLoad(option) {
+			this.id = option.id;
+			this.status = option.status;
+			this.nextActionList = getNextActionList();
+
+			if (this.id != undefined) {
+				// 	//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus == "2") {
+					//取消承接任务	
+					cancleTakeInspectJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				if (this.id != null) {
+					takeInspectJob(this.id).then(res => {
+						uni.hideLoading();
+						callback();
+					}).catch(error => {
+						uni.hideLoading();
+						this.showErrorMessage(error)
+					})
+				}
+			},
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getInspectJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.detailList = res.data.subList;
+							that.jobStatus = res.data.status
+							that.inspectType = that.jobContent.inspectType;
+							that.jobContent.goodQty = null, //合格数量
+								that.jobContent.failedQty = null, //不合格数量
+								that.jobContent.crackQty = null, //报废数量
+								that.jobContent.notPassedQty = null; //最终不合格数量
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+
+			},
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						// this.afterCloseMessage()
+					}
+				});
+			},
+			//不合格数量确认事件
+			failedQtyConfirm(value) {
+				// if (value.detail.value > this.jobContent.receiveQty) {
+				// 	this.jobContent.failedQty = null
+				// 	this.showMessage("不合格数[" + value.detail.value + "]不能大于收货数量[" + this.jobContent.receiveQty + "]")
+				// 	return
+				// }
+				// if (value.detail.value+ this.jobContent.crackQty> this.jobContent.receiveQty) {
+				// 	this.jobContent.failedQty = null
+				// 	this.showMessage("不合格数[" + value.detail.value +"+报废数量["+this.jobContent.crackQty+ "]不能大于收货数量[" + this.jobContent.receiveQty + "]")
+				// 	return
+				// }
+				this.calcNotPassQty()
+			},
+			getInspectName(value) {
+				return getInspectType(value)
+			},
+			getUnitInfo(value) {
+				return getUnitInfo(value).label
+			},
+
+			nextStepChange(e) {
+				if (e.detail.value.length > 0) {
+					this.nextAction = e.detail.value[0].value;
+					this.calcNotPassQty();
+				}
+			},
+
+			calcNotPassQty() {
+				var failedQty = Number(this.jobContent.failedQty == null ? 0 : this.jobContent.failedQty)
+				//检验类型：全检(全部合格)
+				if (this.inspectType == 'FUll') {
+					//最终不合格数量等于不合格数量
+					this.jobContent.notPassedQty = failedQty
+				} else if (this.inspectType == 'SAMPLING') {
+					//检验类型：抽检
+					//下一步动作
+					//全检、部分合格
+					if (this.nextAction == "FULL_INSPECT" || this.nextAction == "PARTIAL_OK") {
+						// 最终不合格数量=不合格数量
+						this.jobContent.notPassedQty = failedQty
+					} else if (this.nextAction == "ALL_NOK") {
+						//最终不合格数量=收货数量-报废数量
+						this.jobContent.notPassedQty = Number(this.jobContent.receiveQty) - Number(this.jobContent
+							.crackQty == null ? 0 : this.jobContent.crackQty)
+
+					}
+				}
+			},
+
+			clearFailedQty() {
+				this.jobContent.failedQty = null;
+			},
+
+			clearCrackQty() {
+				this.jobContent.crackQty = null
+			},
+
+			commit() {
+				if (this.nextAction == null) {
+					this.showMessage("请选择下一步动作")
+					return
+				}
+
+				if (this.nextAction == "ALL_OK") {
+					//全合格
+					this.jobContent.subList.forEach(res => {
+						res.handleQty = res.qty //要查询库存余额
+						res.failedQty = 0;
+						res.notPassedQty = 0;
+						res.crackQty = 0;
+						res.goodQty = res.qty;
+						res.failedReason = "";
+						res.photos = ""
+						res.inspectResult = ""
+						res.toInventoryStatus = "OK"
+						res.inspectUser = this.$store.state.user.id
+					})
+					this.jobContent.goodQty = this.jobContent.receiveQty
+					this.jobContent.nextAction = this.nextAction;
+					this.submitJob(this.jobContent)
+
+				} else if (this.nextAction == "ALL_NOK") {
+					//全都不合格
+					this.jobContent.subList.forEach(res => {
+						res.handleQty = res.qty
+						res.failedQty = res.qty;
+						res.notPassedQty = res.failedQty;
+						res.crackQty = 0;
+						res.goodQty = 0;
+						res.failedReason = "";
+						res.photos = ""
+						res.inspectResult = ""
+						res.toInventoryStatus = "NOK"
+						res.inspectUser = this.$store.state.user.id
+					})
+					this.jobContent.nextAction = this.nextAction;
+					this.jobContent.goodQty = 0
+					this.submitJob(this.jobContent)
+
+				} else if (this.nextAction == "PARTIAL_OK") {
+					//部分合格
+					if (this.jobContent.failedQty == null) {
+						this.showMessage("请输入不合格数量")
+						return
+					}
+					if (this.jobContent.crackQty == null) {
+						this.showMessage("请输入报废数量")
+						return
+					}
+					var receiveQty = Number(this.jobContent.receiveQty)
+					var failedQty = Number(this.jobContent.failedQty);
+					var crackQty = Number(this.jobContent.crackQty);
+
+					if (crackQty + failedQty > receiveQty) {
+						var total = crackQty + failedQty;
+						this.showMessage("不合格数[" + failedQty + "]+报废数量[" + crackQty + "]等于[" + total + "]大于收货数量[" +
+							receiveQty + "]")
+						return
+					}
+					uni.navigateTo({
+						url: './inspectDetail?id=' + this.id +
+							'&status=' + this.status +
+							'&failedQty=' + this.jobContent.failedQty +
+							'&crackQty=' + this.jobContent.crackQty
+					});
+				} else if (this.nextAction == "FULL_INSPECT") {
+					//全检
+					this.jobContent.subList.forEach(res => {
+						res.handleQty = res.qty
+						res.failedQty = 0;
+						res.notPassedQty = res.failedQty;
+						res.crackQty = 0;
+						// res.goodQty = res.qty;
+						res.goodQty = 0;
+						res.failedReason = "";
+						res.photos = ""
+						res.inspectResult = ""
+						res.toInventoryStatus = "OK"
+						res.inspectUser = this.$store.state.user.id
+					})
+					this.jobContent.goodQty = this.jobContent.receiveQty
+					this.jobContent.nextAction = this.nextAction;
+					this.submitJob(this.jobContent)
+				}
+
+				//不合格数量==0、(全部合格)、明细全部合格
+				// if (failedQty == 0) {
+				// 	if (crackQty == 0) {
+				// 		if (this.nextAction == "ALL_NOK") {
+				// 			this.jobContent.subList.forEach(res => {
+				// 				res.handleQty = res.qty
+				// 				res.failedQty = res.qty;
+				// 				res.notPassedQty = res.failedQty;
+				// 				res.crackQty = 0;
+				// 				res.goodQty = 0;
+				// 				res.failedReason = "";
+				// 				res.photos = ""
+				// 				res.inspectResult = ""
+				// 				res.toInventoryStatus = "NOK"
+				// 				res.inspectUser = this.$store.state.user.id
+				// 			})
+				// 			this.jobContent.nextAction = this.nextAction;
+				// 			this.jobContent.goodQty = 0
+				// 			this.submitJob(this.jobContent)
+				// 		}else {
+				// 			//报废数==0，直接提交
+				// 			this.jobContent.subList.forEach(res => {
+				// 				res.handleQty = res.qty
+				// 				res.failedQty = 0;
+				// 				res.notPassedQty = res.failedQty;
+				// 				res.crackQty = 0;
+				// 				res.goodQty = res.qty;
+				// 				res.failedReason = "";
+				// 				res.photos = ""
+				// 				res.inspectResult = ""
+				// 				res.toInventoryStatus = "OK"
+				// 				res.inspectUser = this.$store.state.user.id
+				// 			})
+
+				// 			this.jobContent.nextAction = "";
+				// 			this.jobContent.goodQty = this.jobContent.receiveQty
+				// 			this.submitJob(this.jobContent)
+				// 		}
+
+				// 	} else {
+				// 		//报废数大于0，进入详情
+				// 		//进入下一页面
+				// 		uni.navigateTo({
+				// 			url: './inspectDetail?id=' + this.id +
+				// 				'&status=' + this.status +
+				// 				'&failedQty=' + this.jobContent.failedQty +
+				// 				'&crackQty=' + this.jobContent.crackQty
+				// 		});
+				// 	}
+
+				// } else {
+
+				// 	//不合格数量>0
+				// 	//下一步动作
+				// 	if (this.nextAction == null) {
+				// 		this.showMessage("请选择下一步动作")
+				// 		return
+				// 	}
+
+				// 	//全不合格
+				// 	if (this.nextAction == "ALL_NOK") {
+				// 		//提交
+				// 		this.jobContent.subList.forEach(res => {
+				// 			res.handleQty = res.qty
+				// 			res.failedQty = res.qty;
+				// 			res.notPassedQty = res.failedQty;
+				// 			res.crackQty = 0;
+				// 			res.goodQty = 0;
+				// 			res.failedReason = "";
+				// 			res.photos = ""
+				// 			res.inspectResult = ""
+				// 			res.toInventoryStatus = "NOK"
+				// 			res.inspectUser = this.$store.state.user.id
+				// 		})
+				// 		this.jobContent.nextAction = this.nextAction;
+				// 		this.jobContent.goodQty = 0
+				// 		this.submitJob(this.jobContent)
+				// 		//部分合格
+				// 	} else if (this.nextAction == "PARTIAL_OK") {
+				// 		//进入下一页面
+				// 		uni.navigateTo({
+				// 			url: './inspectDetail?id=' + this.id +
+				// 				'&status=' + this.status +
+				// 				'&failedQty=' + this.jobContent.failedQty +
+				// 				'&crackQty=' + this.jobContent.crackQty
+				// 		});
+				// 		//全检 生成全检任务
+				// 	} else if (this.nextAction == "FULL_INSPECT") {
+				// 		//提交
+				// 		this.jobContent.subList.forEach(res => {
+				// 			res.handleQty = res.qty
+				// 			res.failedQty = 0;
+				// 			res.notPassedQty = res.failedQty;
+				// 			res.crackQty = 0;
+				// 			res.goodQty = res.qty;
+				// 			res.failedReason = "";
+				// 			res.photos = ""
+				// 			res.inspectResult = ""
+				// 			res.toInventoryStatus = "OK"
+				// 			res.inspectUser = this.$store.state.user.id
+				// 		})
+				// 		this.jobContent.goodQty = this.jobContent.receiveQty
+				// 		this.jobContent.nextAction = this.nextAction;
+				// 		this.submitJob(this.jobContent)
+				// 	}
+
+				// }
+
+			},
+			submitJob(params) {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				console.log("提交参数", JSON.stringify(params));
+				inspectJobSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						var hint = "";
+						if (this.jobContent.nextAction == "FULL_INSPECT") {
+							hint = "提交成功<br>生成到货检验任务<br>" + res.data
+						} else {
+							hint = "提交成功<br>生成到货检验记录<br>" + res.data
+							//全都合格创建上架申请
+							// if (this.jobContent.nextAction == "ALL_OK") {
+							// 	createPutAwayRequest(res.data).then(putawayres => {
+							// 		this.showCommitSuccessMessage("生成上架申请单号<br>" + putawayres.data)
+							// 	}).catch(error => {
+							// 		uni.hideLoading();
+							// 		this.showErrorMessage(error);
+							// 	})
+							// }
+						}
+						this.showCommitSuccessMessage(hint)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/inspect/request/inspectRequest.vue b/pages/inspect/request/inspectRequest.vue
new file mode 100644
index 0000000..bd7b966
--- /dev/null
+++ b/pages/inspect/request/inspectRequest.vue
@@ -0,0 +1,380 @@
+<template>
+	<view>
+		<com-empty-view v-if="requestList.length==0"></com-empty-view>
+		<request-filter ref="filter" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
+			:checkedWaitTask="checkedWaitTask">
+		</request-filter>
+		<view v-if="requestList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in requestList" :key="index">
+					<uni-swipe-action-item :right-options="item.options" @click="swipeClick($event,item)">
+						<comInspectRequestCard :dataContent="item" @click='openRequestDetail(item)'>
+						</comInspectRequestCard>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+			<uni-load-more :status="loadingType" v-if="requestList.length>0" />
+			<request-info-popup ref='requestInfoPopup'></request-info-popup>
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import requestFilter from '@/mycomponents/request/requestFilter.vue'
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import comInspectRequestCard from '@/pages/inspect/coms/comInspectRequestCard.vue'
+	import requestInfoPopup from '@/pages/inspect/coms/requestInfoPopup.vue'
+	import {
+		goHome,
+		updateTitle,
+		clearTirmAndWrap
+	} from '@/common/basic.js';
+	import {
+		getInspectRequestList,
+		inspectRequestClose,
+		inspectRequestApprove,
+		inspectRequestApproveAgree,
+		inspectRequestApproveRefused,
+		inspectRequestHandle,
+		inspectRequestAddAgain
+	} from '@/api/request2.js';
+
+	import {
+		getDetailOption,
+		getDetailAndApproveOption,
+		getDetailAndApprovePassAndApproveNoOption,
+		getDetailAndHandleOption,
+		getDetailAndAddAndCloseOption,
+		getAddAgainOption
+	} from '@/common/array.js';
+
+
+	export default {
+		components: {
+			comEmptyView,
+			requestFilter,
+			comInspectRequestCard,
+			requestInfoPopup,
+		},
+		data() {
+			return {
+				requestList: [],
+				pageNo: 1,
+				pageSize: 10,
+				status: "1,2,3,4,5,6",
+				totalCount: 0,
+				checkedWaitTask: false,
+				detailOptions: [],
+				detailAndApproveOptions: [],
+				detailAndApprovePassAndApproveNoOption: [],
+				detailAndHandleOption: [],
+				detailAndAddAndCloseOption: [],
+				addAgainOption:[],
+				showOptions: [],
+				fromType: "requestType",
+				loadingType: "nomore",
+
+			};
+		},
+		onLoad() {
+			this.detailOptions = getDetailOption();
+			this.addAgainOption = getAddAgainOption();
+			this.detailAndApproveOptions = getDetailAndApproveOption()
+			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
+			this.detailAndHandleOption = getDetailAndHandleOption()
+			this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
+
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+		onShow() {
+			this.getList('refresh');
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+
+		mounted() {
+
+		},
+		methods: {
+			openRequestDetail(item) {
+				uni.navigateTo({
+					url: './inspectRequestDetail?id=' + item.id
+				});
+			},
+
+			openRequestInfoPopup(item) {
+				this.$refs.requestInfoPopup.openPopup(item)
+			},
+			updateOptions(status) {
+				if (status == "1") {
+					this.showOptions = this.detailAndApproveOptions;
+				} else if (status == "2") {
+					this.showOptions = this.detailAndApprovePassAndApproveNoOption;
+				} else if (status == "3") {
+					this.showOptions = this.detailAndHandleOption;
+				} else if (status == "4") {
+					this.showOptions = this.detailAndAddAndCloseOption;
+				} else if(status == "5"){
+					this.showOptions = this.addAgainOption;
+				}else {
+					this.showOptions = this.detailOptions;
+				}
+				return this.showOptions
+			},
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.requestList = [];
+				}
+				var filters = []
+					filters.push({
+						column: "status",
+						action: "in",
+						value: this.status
+					})
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getInspectRequestList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					list.forEach(res => {
+						var options = this.updateOptions(res.status);
+						res.options = options;
+					})
+					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
+
+					this.pageNo++;
+					updateTitle("检验单申请(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					this.loadingType = "";
+					updateTitle("检验单申请");
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			swipeClick(e, dataContent) {
+				var text = clearTirmAndWrap(e.content.text)
+				if (text == "详情") {
+					this.openRequestInfoPopup(dataContent);
+				} else if (text == "处理") {
+					this.showQuestionMessage("确定要处理当前申请吗?",res=>{
+						this.inspectRequestHandle(dataContent.id)
+					})
+				} else if (text == "提交审批") {
+					this.showQuestionMessage("确定要审批当前申请吗?",res=>{
+						this.inspectRequestApprove(dataContent.id)
+					})
+				} else if (text=="审批通过") {
+					this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
+						this.inspectRequestApproveAgree(dataContent.id)
+					})
+				} else if (text == "审批驳回") {
+					this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
+						this.inspectRequestApproveRefused(dataContent.id)
+					})
+				} else if (text == "关闭") {
+					this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
+						this.inspectRequestClose(dataContent.id)
+					})
+				}else if(text == "重新添加"){
+					this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{
+						this.inspectRequestAddAgain(dataContent.id)
+					})
+				}
+			},
+			showQuestionMessage(hint,callBack){
+				this.$refs.comMessage.showQuestionMessage(hint,
+					res => {
+						if (res) {
+							callBack()
+						}
+					});
+			},
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getInspectRequestList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的检验单申请');
+					} else if (res.data.list.length == 1) {
+						that.openRequestDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			inspectRequestApprove(id) {
+				inspectRequestApprove(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请提交审批成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请提交审批失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			
+			},
+			
+			inspectRequestClose(id) {
+				inspectRequestClose(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请关闭成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请关闭失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			inspectRequestAddAgain(id) {
+				inspectRequestAddAgain(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请重新添加成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请重新添加失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			inspectRequestApproveAgree(id) {
+				inspectRequestApproveAgree(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批通过成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批通过失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			inspectRequestApproveRefused(id) {
+				inspectRequestApproveRefused(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批驳回成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批驳回失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			inspectRequestHandle(id) {
+				inspectRequestHandle(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请处理成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请处理失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inspect/request/inspectRequestDetail.vue b/pages/inspect/request/inspectRequestDetail.vue
new file mode 100644
index 0000000..4f89b76
--- /dev/null
+++ b/pages/inspect/request/inspectRequestDetail.vue
@@ -0,0 +1,130 @@
+<template>
+	<view class="page-wraper">
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="" style="background-color: #fff; padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx;">
+					<view class="" style="font-size: 35rpx;">
+						单据号 : {{requestContent.number}}
+					</view>
+					<view class="" style="font-size: 35rpx;">
+						<text>供应商代码 :  {{requestContent.supplierCode}} </text>
+					</view>
+				</view>
+				<u-line />
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comRequestDetailCard :dataContent="item" 
+						:isShowBatch ="false"
+							 @openDetail="openDetail">
+						</comRequestDetailCard>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<requestDetailInfoPopup ref="jobDetailPopup"></requestDetailInfoPopup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	
+	import {
+		getInspectRequestDetail,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource,
+	} from '@/common/detail.js';
+
+
+	import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
+	import requestDetailInfoPopup from '@/pages/productPutaway/coms/requestDetailInfoPopup.vue'
+
+	export default {
+		components: {
+			comRequestDetailCard,
+			requestDetailInfoPopup,
+		},
+		data() {
+			return {
+				id: '',
+				requestContent: {}, //任务内容
+				subList: [], //接口返回的任务details
+				detailSource: [], //绑定在页面上的数据源
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			this.getDetail();
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getInspectRequestDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+					if (res.data.subList.length > 0) {
+						that.requestContent = res.data;
+						that.subList = res.data.subList;
+						that.detailSource = getDataSource(that.subList)
+						// that.subList = res.data[0];
+						// that.subList.forEach(res=>{
+						// 	res.packingNumber =res.toPackingNumber
+						// 	res.batch =res.fromBatch
+						// })
+					} else {
+						that.showMessage('列表数据为0');
+					}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+			},
+			
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+					}
+				});
+			},
+
+			openDetail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/inventoryMove/coms/comInventoryDetailCard.vue b/pages/inventoryMove/coms/comInventoryDetailCard.vue
new file mode 100644
index 0000000..1ccf22e
--- /dev/null
+++ b/pages/inventoryMove/coms/comInventoryDetailCard.vue
@@ -0,0 +1,142 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item :right-options="item.scaned?scanOptions:detailOptions"
+							@click="swipeClick($event,item)">
+							<recommend :detail="item"  :isShowFromLocation="true" :isShowToLocation="true"></recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</view>
+				<u-line />
+			</uni-collapse-item>
+		</uni-collapse>
+		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm" :allowEditStatus="true"></balance-qty-edit>
+		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
+			></win-scan-location>
+		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import detailInfoPopup from '@/pages/inventoryMove/coms/detailInfoPopup.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	
+	import {
+		getDetailOption,
+		getPurchaseReceiptOption
+	} from '@/common/array.js';
+
+
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			balanceQtyEdit,
+			detailInfoPopup,
+			winScanLocation
+		},
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {
+					
+				},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+			// dataContent: {
+			// 	handler(newName, oldName) {},
+			// 	immediate: true,
+			// 	deep: true
+			// }
+		},
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, this.settingParam
+					.allowModifyLocation)
+			}
+		},
+		methods: {
+			openDetailCardPopup() {
+				this.$refs.winHint.openScanPopup()
+			},
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "库位") {
+					this.showLocation(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+
+			edit(item) {
+				this.editItem = item;
+				this.$refs.qtyEdit.openEditPopup(item.balance, item.handleQty);
+			},
+
+			detail(item) {
+				this.$emit('openDetail', item);
+			},
+
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.balance = {}
+							item.handleQty = 0;
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.handleQty = qty;
+				this.$emit('updateData')
+			},
+			showLocation(item) {
+				this.locatonItem = item;
+				this.$refs.scanLocationCode.openScanPopup();
+			},
+			//扫描源库位
+			getLocation(location, code) {
+				this.locatonItem.toLocationCode =code;
+				this.$emit('updateData')
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inventoryMove/coms/comInventoryJobCard.vue b/pages/inventoryMove/coms/comInventoryJobCard.vue
new file mode 100644
index 0000000..98946e3
--- /dev/null
+++ b/pages/inventoryMove/coms/comInventoryJobCard.vue
@@ -0,0 +1,38 @@
+<template>
+ 	<job-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				<view class="">
+ 					申请单号 : {{dataContent.requestNumber}}
+ 				</view>
+ 			</view>
+ 		</view>
+ 	</job-com-main-card>
+ </template>
+
+ <script>
+ 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			jobComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/inventoryMove/coms/comMove.vue b/pages/inventoryMove/coms/comMove.vue
new file mode 100644
index 0000000..8ed05bf
--- /dev/null
+++ b/pages/inventoryMove/coms/comMove.vue
@@ -0,0 +1,409 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<u-line />
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<com-move-record :dataContent="item" :index="index" @removeData="removeData"
+								:isShowStatus="isShowStatus" @updateData="updateData" @removePack='removePack'
+								:allowEditStatus="allowEditStatus">
+							</com-move-record>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
+							:locationTypeList="toLocationTypeArray" :isShowEdit="toLocationCode==''"></requiredLocation>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
+		</win-scan-pack-and-location>
+		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comMoveRecord from '@/pages/inventoryMove/coms/comMoveRecord.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import {
+		inventoryMoveRecordSubmit,
+	} from '@/api/request2.js';
+
+	import {
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+
+	import {
+		getPackingNumberAndBatchByList
+	} from '@/common/basic.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			winScanButton,
+			requiredLocation,
+			comMoveRecord,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+		},
+		props: {
+			// fromInventoryStatus: {
+			// 	type: String,
+			// 	default: ""
+			// },
+			// toInventoryStatus: {
+			// 	type: String,
+			// 	default: ""
+			// },
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+			allowEditStatus: {
+				type: Boolean,
+				default: false
+			},
+			businessTypeCode: {
+				type: String,
+				default: "Move"
+			}, //业务类型
+			toLocationCode: {
+				type: String,
+				default: ""
+			},
+		},
+		data() {
+			return {
+				fromLocationCode: "",
+				// toLocationCode: "",
+				toLocationInfo: {},
+				toLocationTypeArray: [],
+				toInventoryStatus: "",
+				businessType: {}, //业务类型
+				detailSource: [], //绑定在页面上的数据源
+				title: "",
+				dataContent: {},
+				toWarehouseCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+			}
+		},
+
+		mounted() {
+			getBusinessType(this.businessTypeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+			this.updateTitle();
+		},
+
+		onLoad() {
+
+		},
+
+		methods: {
+			updateTitle() {
+				if (this.businessTypeCode == "Move") {
+					this.title = "库存转移记录";
+					this.toInventoryStatus = "OK"
+				} else if (this.businessTypeCode == "HoldToOk") {
+					this.title = "隔离转合格记录";
+					this.toInventoryStatus = "OK"
+				} else if (this.businessTypeCode == "HoldToScrap") {
+					this.title = "隔离转报废记录";
+					this.toInventoryStatus = "SCRAP"
+				} else if (this.businessTypeCode == "OkToHold") {
+					this.title = "合格转隔离记录";
+					this.toInventoryStatus = "HOLD"
+				} else if (this.businessTypeCode == "OktoScrap") {
+					this.title = "合格转报废记录";
+					this.toInventoryStatus = "SCRAP"
+				} else if (this.businessTypeCode == "ScrapToHold") {
+					this.title = "报废转隔离记录";
+					this.toInventoryStatus = "HOLD"
+				}
+				uni.setNavigationBarTitle({
+					title: this.title
+				})
+			},
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanFromLocationCode.openScanPopup();
+				})
+
+			},
+			getLocation(location) {
+				this.getfromLocationCode(location)
+			},
+			getfromLocationCode(location) {
+				this.fromLocationCode = location.code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				this.toWarehouseCode = location.warehouseCode
+				this.toLocationCode = code;
+			},
+			getScanResult(result) {
+				this.getDataSource(result)
+			},
+
+			getDataSource(result) {
+				var balance = result.balance;
+				var pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					newDetail.inventoryStatus = balance.inventoryStatus;
+					newDetail.toInventoryStatus = this.toInventoryStatus
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus &&
+							r.scaned == true) {
+							return r;
+						}
+					})
+
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						newDetail.inventoryStatus = balance.inventoryStatus;
+						newDetail.toInventoryStatus = this.toInventoryStatus
+						item.subList.push(newDetail);
+					} else {
+						this.showErrorMessage(balance.packingNumber + "已经在列表中")
+					}
+				}
+				calcHandleQty(this.detailSource);
+
+			},
+
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			updateData() {
+				calcHandleQty(this.detailSource);
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+
+			removeData(item) {
+				for (let i = 0; i < this.detailSource.length; i++) {
+					if (this.detailSource[i].itemCode == item.itemCode) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData()
+				})
+			},
+			clearData() {
+				this.fromLocationCode = '';
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+				this.toWarehouseCode = ""
+			},
+			commit() {
+
+				if (this.toLocationCode == "") {
+					this.showMessage("请先选择目标库位")
+					return;
+				}
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					this.managementList = [];
+					var precisionStrategParams = this.setPrecisionStrategParams()
+
+					getPrecisionStrategyList(precisionStrategParams, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							var params = this.setParams()
+							console.log("提交" + JSON.stringify(params))
+							inventoryMoveRecordSubmit(params).then(res => {
+								uni.hideLoading()
+								if (res.data) {
+									this.showCommitSuccessMessage("提交成功<br>生成" + this.title + "记录<br>" +
+										res.data)
+								} else {
+									this.showErrorMessage("提交失败[" + res.msg + "]")
+								}
+							}).catch(error => {
+								uni.hideLoading()
+								this.showErrorMessage(error)
+							})
+
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+
+					})
+
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+
+			},
+
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.toLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+			setParams() {
+
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							detail.itemCode = detail.itemCode;
+							detail.itemName = detail.package.itemName;
+							detail.itemDesc1 = detail.package.itemDesc1;
+							detail.itemDesc2 = detail.package.itemDesc2;
+
+							detail.fromInventoryStatus = detail.inventoryStatus;
+							// detail.toInventoryStatus = this.toInventoryStatus;
+
+							detail.fromPackingNumber = info.packingNumber;
+							detail.toPackingNumber = info.packingNumber;
+
+							detail.fromContainerNumber = detail.containerNumber;
+							detail.toContainerNumber = detail.containerNumber
+
+							detail.fromBatch = info.batch;
+							detail.toBatch = info.batch;
+
+							detail.fromLocationCode = detail.locationCode;
+							detail.toLocationCode = detail.toLocationCode;
+
+							subList.push(detail)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.fromWarehouseCode = this.detailSource[0].subList[0].warehouseCode;
+				this.dataContent.toWarehouseCode = this.toWarehouseCode;
+				this.dataContent.businessType = this.businessTypeCode;
+				return this.dataContent;
+			},
+
+
+
+
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inventoryMove/coms/comMoveJob.vue b/pages/inventoryMove/coms/comMoveJob.vue
new file mode 100644
index 0000000..1b19648
--- /dev/null
+++ b/pages/inventoryMove/coms/comMoveJob.vue
@@ -0,0 +1,321 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-inventory-job-card :dataContent="item" @click='openJobDetail(item)'>
+						</com-inventory-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getInventoryMoveJobList,
+		cancleTakeInventoryMoveJob
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		getCurrDate
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+
+	import comInventoryJobCard from '@/pages/inventoryMove/coms/comInventoryJobCard.vue'
+	import jobListPopup from '@/pages/inventoryMove/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/inventoryMove/coms/jobInfoPopup.vue'
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comInventoryJobCard,
+			jobListPopup,
+			jobInfoPopup,
+		},
+		props: {
+			businessTypeCode: {
+				type: String,
+				default: "Move"
+			} //业务类型
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+				titleName:""
+			};
+		},
+
+		onShow() {
+
+		},
+
+		mounted() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+
+		methods: {
+			updateTitle() {
+				var title = ""
+				var name = ""
+				if (this.businessTypeCode == "Move") {
+					name = "库存转移";
+				} else if (this.businessTypeCode == "HoldToOk") {
+					name = "隔离转合格";
+				} else if (this.businessTypeCode == "HoldToScrap") {
+					name = "隔离转报废";
+				} else if (this.businessTypeCode == "OkToHold") {
+					name = "合格转隔离";
+				} else if (this.businessTypeCode == "OktoScrap") {
+					name = "合格转报废";
+				} else if (this.businessTypeCode == "ScrapToHold") {
+					name = "报废转隔离";
+				}
+				this.titleName =name;
+				if (this.totalCount > 0) {
+					title = name + "(" + this.totalCount + ")";
+				} else {
+					title = name;
+				}
+				uni.setNavigationBarTitle({
+					title: title
+				})
+			},
+
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.receiptList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				filters.push({
+					column: "business_type",
+					action: "==",
+					value: this.businessTypeCode
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getInventoryMoveJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					this.updateTitle();
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+			
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './inventoryMoveDetail?id=' + item.id + '&status=' + item.status+'&businessTypeCode='+this.businessTypeCode
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.comReceiptJobList.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeInventoryMoveJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getInventoryMoveJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			openFilter() {
+				this.$refs.filter.openFilter();
+			},
+			toHome() {
+				goHome()
+			},
+			refresh(){
+				this.getList("refresh")
+			}
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/inventoryMove/coms/comMoveRecord.vue b/pages/inventoryMove/coms/comMoveRecord.vue
new file mode 100644
index 0000000..652f54e
--- /dev/null
+++ b/pages/inventoryMove/coms/comMoveRecord.vue
@@ -0,0 +1,440 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<u-line />
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<com-move-record-card :dataContent="item" :index="index" @removeData="removeData"
+								:isShowStatus="isShowStatus" @updateData="updateData" @removePack='removePack'
+								:allowEditStatus="allowEditStatus">
+							</com-move-record-card>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocation'
+							:locationTypeList="tolocationTypeList" :isShowEdit="isShowEditLocation"></requiredLocation>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
+		</win-scan-pack-and-location>
+		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comMoveRecordCard from '@/pages/inventoryMove/coms/comMoveRecordCard.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import {
+		inventoryMoveRecordSubmit,
+		getBasicLocationByCode,
+	} from '@/api/request2.js';
+
+	import {
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+
+	import {
+		getPackingNumberAndBatchByList,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			winScanButton,
+			requiredLocation,
+			comMoveRecordCard,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+		},
+		props: {
+			// fromInventoryStatus: {
+			// 	type: String,
+			// 	default: ""
+			// },
+			// toInventoryStatus: {
+			// 	type: String,
+			// 	default: ""
+			// },
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+			allowEditStatus: {
+				type: Boolean,
+				default: false
+			},
+			businessTypeCode: {
+				type: String,
+				default: "Move"
+			}, //业务类型
+			// toLocationCode: {
+			// 	type: String,
+			// 	default: ""
+			// },
+		},
+		data() {
+			return {
+				fromLocationCode: "",
+				fromLocationInfo: {},
+				toLocationCode: "",
+				toLocationInfo: {},
+				toLocationTypeArray: [],
+				toInventoryStatus: "",
+				businessType: {}, //业务类型
+				detailSource: [], //绑定在页面上的数据源
+				title: "",
+				dataContent: {},
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				isShowEditLocation:false
+			}
+		},
+
+		mounted() {
+			getBusinessType(this.businessTypeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+			this.initData();
+			this.getLocationInfo();
+		},
+
+		onLoad() {
+			
+		},
+
+		methods: {
+			initData() {
+				if (this.businessTypeCode == "Move") {
+					this.title = "库存转移记录";
+					this.toInventoryStatus = ""
+					this.toLocationCode = ""
+					this.isShowEditLocation =true;
+				} else if (this.businessTypeCode == "HoldToOk") {
+					this.title = "隔离转合格记录";
+					this.toInventoryStatus = "OK"
+					this.toLocationCode = ""
+					this.isShowEditLocation =true;
+				} else if (this.businessTypeCode == "HoldToScrap") {
+					this.title = "隔离转报废记录";
+					this.toInventoryStatus = "SCRAP"
+					this.toLocationCode = "SCRAP"
+				} else if (this.businessTypeCode == "OkToHold") {
+					this.title = "合格转隔离记录";
+					this.toInventoryStatus = "HOLD"
+					this.toLocationCode = "HOLD"
+				} else if (this.businessTypeCode == "OkToScrap") {
+					this.title = "合格转报废记录";
+					this.toInventoryStatus = "SCRAP"
+					this.toLocationCode = "SCRAP"
+				} else if (this.businessTypeCode == "ScrapToHold") {
+					this.title = "报废转隔离记录";
+					this.toInventoryStatus = "HOLD"
+					this.toLocationCode = "HOLD"
+				}
+				uni.setNavigationBarTitle({
+					title: this.title
+				})
+			},
+			getLocationInfo(){
+				if (this.toLocationCode != "") {
+					getBasicLocationByCode(this.toLocationCode).then(res => {
+						if (res.data.total > 0) {
+							let result = res.data.list[0];
+							var type = result.type;
+							var available = result.available;
+							if (available == "TRUE") {
+								this.toLocationInfo = res.data.list[0];
+							} else {
+								this.showErrorMessage("扫描库位[" + this.code + "]不可用")
+							}
+						} else {
+							this.showErrorMessage('库位[' + this.toLocationCode + ']不存在')
+						}
+				
+					}).catch(error => {
+						uni.hideLoading();
+						this.showErrorMessage(error)
+					})
+				}
+			},
+			
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanFromLocationCode.openScanPopup();
+				})
+			},
+			getFromLocation(location) {
+				this.fromLocationCode = location.code;
+				this.fromLocationInfo = location;
+				this.openScanPopup();
+			},
+			getToLocation(location, code) {
+				this.toLocationCode = code;
+				this.toLocationInfo = location;
+			},
+			getScanResult(result) {
+				var balance = result.balance;
+				var pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack);
+					// newDetail.inventoryStatus = balance.inventoryStatus;
+					newDetail.toInventoryStatus = this.toInventoryStatus;
+					newDetail.toLocationCode = this.toLocationCode;
+					newDetail.fromLocationCode = result.fromLocationCode
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.fromLocationCode == balance.locationCode &&
+							r.toInventoryStatus == balance.inventoryStatus &&
+							r.scaned == true) {
+							return r;
+						}
+					})
+
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						// newDetail.inventoryStatus = balance.inventoryStatus;
+						newDetail.toInventoryStatus = this.toInventoryStatus;
+						newDetail.toLocationCode = this.toLocationCode;
+						newDetail.fromLocationCode = result.fromLocationCode
+						item.subList.push(newDetail);
+					} else {
+						this.showErrorMessage(balance.packingNumber + "已经在列表中")
+					}
+				}
+				calcHandleQty(this.detailSource);
+
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			updateData() {
+				calcHandleQty(this.detailSource);
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+
+			removeData(item) {
+				for (let i = 0; i < this.detailSource.length; i++) {
+					if (this.detailSource[i].itemCode == item.itemCode) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData()
+				})
+			},
+			clearData() {
+				this.fromLocationCode = '';
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+				this.toWarehouseCode = ""
+			},
+			commit() {
+				if (this.toLocationCode == "") {
+					this.showErrorMessage("请先选择目标库位")
+					return;
+				}
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					this.managementList = [];
+					var precisionStrategParams = this.setPrecisionStrategParams()
+
+					getPrecisionStrategyList(precisionStrategParams, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							var params = this.setParams()
+							console.log("提交" + JSON.stringify(params))
+							inventoryMoveRecordSubmit(params).then(res => {
+								uni.hideLoading()
+								if (res.data) {
+									this.showCommitSuccessMessage("提交成功<br>生成" + this.title + "<br>" +
+										res.data)
+								} else {
+									this.showErrorMessage("提交失败[" + res.msg + "]")
+								}
+							}).catch(error => {
+								uni.hideLoading()
+								this.showErrorMessage(error)
+							})
+
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+
+					})
+
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+
+			},
+
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							if (detail.toLocationCode == '')
+							{
+								detail.toLocationCode = this.toLocationCode;
+							}
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							var submitItem = deepCopyData(detail)
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+
+							submitItem.fromInventoryStatus = detail.inventoryStatus;
+							submitItem.toInventoryStatus = detail.toInventoryStatus;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.toPackingNumber = info.packingNumber;
+
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+
+							submitItem.fromBatch = info.batch;
+							submitItem.toBatch = info.batch;
+
+							submitItem.fromLocationCode = detail.fromLocationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+
+							submitItem.package = null;
+							submitItem.Records = null;
+							
+							submitItem.qty = detail.handleQty;
+
+							subList.push(submitItem)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.fromWarehouseCode = this.fromLocationInfo.warehouseCode;
+				this.dataContent.toWarehouseCode = this.toLocationInfo.warehouseCode;
+				this.dataContent.businessType = this.businessTypeCode;
+				return this.dataContent;
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inventoryMove/coms/comMoveRecordCard.vue b/pages/inventoryMove/coms/comMoveRecordCard.vue
new file mode 100644
index 0000000..1387b86
--- /dev/null
+++ b/pages/inventoryMove/coms/comMoveRecordCard.vue
@@ -0,0 +1,193 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
+							<item-qty :dataContent="dataContent" 
+								:isShowBalanceQty="false"
+								:isShowBalance="true"></item-qty>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</template>
+
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item,index)"
+							:right-options="item.scaned?scanOptions:detailOptions">	
+							<comMovebalance :dataContent="item" :isShowStdPack="false" :isShowPack="true"
+								:fromInventoryStatus="item.inventoryStatus" :toInventoryStatus="item.toInventoryStatus"
+								:isShowLocation="true" :allowEditStatus='allowEditStatus'></comMovebalance>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<u-line color="#D8D8D8"></u-line>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<balanceQtyEdit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="isShowStatus"
+			:allowEditStatus="allowEditStatus">
+		</balanceQtyEdit>
+		<job-detail-popup ref="winHint" :dataContent="showItem"></job-detail-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import balanceMove from '@/mycomponents/balance/balanceMove.vue'
+	import comMovebalance from '@/pages/inventoryMove/coms/comMovebalance.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getRemoveOption
+	} from '@/common/array.js';
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			jobDetailPopup,
+			balance,
+			balanceQtyEdit,
+			balanceMove,
+			comMovebalance,
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			fromInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			toInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+			allowEditStatus: {
+				type: Boolean,
+				default: false
+			},
+
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined && this.$refs.collapse1 != null) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {},
+				detailOptions: [],
+				scanOptions: [],
+				removeOptions: [],
+				dataList: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+			this.removeOptions = getRemoveOption();
+		},
+
+		methods: {
+			removeData(e, dataContent) {
+				if (e.content.text == "移除") {
+					this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+						res => {
+							if (res) {
+								this.$emit('removeData', dataContent)
+							}
+						});
+				}
+			},
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+
+			edit(item) {
+				this.editItem = item;
+				this.$refs.balanceQtyEdit.openEditPopup(item, item.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.dataList = [
+
+					{
+						title: "箱码",
+						content: item.packingNumber
+					},
+					{
+						title: "批次",
+						content: item.batch
+					},
+					{
+						title: "库位",
+						content: item.locationCode
+					},
+					{
+						title: "数量",
+						content: item.qty
+					},
+					{
+						title: "单位",
+						content: item.uom
+					}
+				]
+				this.$refs.winHint.openScanPopup(this.showItem)
+			},
+			remove(item, index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							this.dataContent.subList.splice(index, 1)
+							this.$emit('removePack', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.handleQty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inventoryMove/coms/comMovebalance.vue b/pages/inventoryMove/coms/comMovebalance.vue
new file mode 100644
index 0000000..3aebfeb
--- /dev/null
+++ b/pages/inventoryMove/coms/comMovebalance.vue
@@ -0,0 +1,106 @@
+<template>
+	<view :class="dataContent.scaned?'scan_view':''">
+		<view class="uni-flex uni-column ">
+			<view class="uni-flex uni-row space-between " style="align-items: center">
+				<view>
+					<pack v-if="isShowPack && dataContent.packingNumber!=''" :packingCode="dataContent.packingNumber">
+					</pack>
+					<batch v-if="isShowBatch" :batch="dataContent.batch"></batch>
+					<location v-if="isShowLocation" title="来源库位" :locationCode="dataContent.fromLocationCode"></location>
+				</view>
+				<view>
+					<!-- <qty :isShowStatus="false"
+						 :dataContent="dataContent"
+						:isShowStdPack="isShowStdPack"></qty> -->
+					<compare-qty :dataContent="dataContent" :recommendQty="dataContent.qty"
+						:handleQty="dataContent.handleQty" :isShowStdPack="isShowStdPack">
+					</compare-qty>
+					<move-status :fromInventoryStatus="fromInventoryStatus" :toInventoryStatus="toInventoryStatus" :showToInventoryStatus="allowEditStatus">
+					</move-status>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import qty from '@/mycomponents/qty/qty.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+	import moveStatus from '@/mycomponents/balance/moveStatus.vue'
+	import purchaseInfo from '@/mycomponents/purchase/purchaseInfo.vue'
+	import status from '@/mycomponents/status/status.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			qty,
+			recommendQty,
+			compareQty,
+			moveStatus,
+			purchaseInfo,
+			status
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowStdPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBusiness: {
+				type: Boolean,
+				default: false
+			},
+			scaned: {
+				type: Boolean,
+				default: true
+			},
+			fromInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			toInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			allowEditStatus: {
+				type: Boolean,
+				default: false
+			},
+		},
+		watch: {
+
+		},
+		methods: {
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inventoryMove/coms/detailInfoPopup.vue b/pages/inventoryMove/coms/detailInfoPopup.vue
new file mode 100644
index 0000000..8a7d67b
--- /dev/null
+++ b/pages/inventoryMove/coms/detailInfoPopup.vue
@@ -0,0 +1,57 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.PoNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.PoLine}} </text>
+						</view>
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/inventoryMove/coms/jobInfoPopup.vue b/pages/inventoryMove/coms/jobInfoPopup.vue
new file mode 100644
index 0000000..9f72ee9
--- /dev/null
+++ b/pages/inventoryMove/coms/jobInfoPopup.vue
@@ -0,0 +1,53 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">供应商代码 : </text>
+							<text class="text_wrap">{{dataContent.supplierCode}} </text>
+						</view>
+					</view>
+				</view>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/inventoryMove/coms/jobListPopup.vue b/pages/inventoryMove/coms/jobListPopup.vue
new file mode 100644
index 0000000..59ace1d
--- /dev/null
+++ b/pages/inventoryMove/coms/jobListPopup.vue
@@ -0,0 +1,47 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-inventory-job-card :dataContent="item" @click='selectItem(item)'></com-inventory-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	import comInventoryJobCard from '@/pages/inventoryMove/coms/comInventoryJobCard.vue'
+	
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comInventoryJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inventoryMove/job/holdToOkMoveJob.vue b/pages/inventoryMove/job/holdToOkMoveJob.vue
new file mode 100644
index 0000000..149213d
--- /dev/null
+++ b/pages/inventoryMove/job/holdToOkMoveJob.vue
@@ -0,0 +1,39 @@
+<template>
+	<view class="page-wraper">
+		<comMoveJob ref="comMoveJob" businessTypeCode='HoldToOk'> </comMoveJob>
+	</view>
+</template>
+
+<script>
+	import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
+
+	export default {
+		components: {
+			comMoveJob
+		},
+		data() {
+
+			return {
+
+			}
+		},
+		onPullDownRefresh() {
+			this.$refs.comMoveJob.refresh();
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				this.$refs.comMoveJob.toHome();
+			} else if (e.index == 1) {
+				this.$refs.comMoveJob.openFilter();
+			}
+		},
+
+		onLoad() {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inventoryMove/job/holdToScrapMoveJob.vue b/pages/inventoryMove/job/holdToScrapMoveJob.vue
new file mode 100644
index 0000000..410b2ab
--- /dev/null
+++ b/pages/inventoryMove/job/holdToScrapMoveJob.vue
@@ -0,0 +1,39 @@
+<template>
+	<view class="page-wraper">
+		<comMoveJob ref="comMoveJob" businessTypeCode='HoldToScrap'> </comMoveJob>
+	</view>
+</template>
+
+<script>
+	import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
+
+	export default {
+		components: {
+			comMoveJob
+		},
+		data() {
+
+			return {
+
+			}
+		},
+		onPullDownRefresh() {
+			this.$refs.comMoveJob.refresh();
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				this.$refs.comMoveJob.toHome();
+			} else if (e.index == 1) {
+				this.$refs.comMoveJob.openFilter();
+			}
+		},
+
+		onLoad() {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inventoryMove/job/inventoryMoveDetail.vue b/pages/inventoryMove/job/inventoryMoveDetail.vue
new file mode 100644
index 0000000..1d212af
--- /dev/null
+++ b/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -0,0 +1,567 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+			<u-line color="#D8D8D8"></u-line>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comInventoryDetailCard :dataContent="item" :settingParam="jobContent" @remove="updateData"
+							@updateData='updateData' @openDetail="openDetail">
+						</comInventoryDetailCard>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<detailInfoPopup ref="jobDetailPopup"></detailInfoPopup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getInventoryMoveJobDetail,
+		getBasicLocationByCode,
+		takeInventoryMoveJob,
+		cancleTakeInventoryMoveJob,
+		inventoryMoveSubmit
+	} from '@/api/request2.js';
+	import {
+		getManagementPrecisions,
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+
+	import {
+		getDataSource,
+		getScanCount,
+		calcHandleQty
+	} from '@/common/detail.js';
+	import {
+		goHome,
+		updateTitle,
+		navigateBack,
+		getCurrDateTime,
+		getPackingNumberAndBatchByList,
+		getInventoryStatusName,
+	} from '@/common/basic.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comInventoryDetailCard from '@/pages/inventoryMove/coms/comInventoryDetailCard.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import detailInfoPopup from '@/pages/inventoryMove/coms/detailInfoPopup.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+
+
+	export default {
+		name: 'inventoryMoveDetail',
+		components: {
+			winScanButton,
+			winScanPack,
+			comInventoryDetailCard,
+			requiredLocation,
+			winScanPackAndLocation,
+			detailInfoPopup,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				toLocationInfo: {},
+				businessTypeInfo: {},
+				locationTypeList: [],
+				managementList: [],
+				businessTypeCode: '',
+				toLocationCode: '',
+				toInventoryStatus: '',
+				jobStatus:""
+			};
+		},
+		props: {
+
+		},
+		onLoad(option) {
+			this.id = option.id;
+			this.businessTypeCode = option.businessTypeCode;
+			if (this.id != undefined) {
+				// 	//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+				this.initData();
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务	
+					cancleTakeInventoryMoveJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			initData() {
+				var name = ""
+				if (this.businessTypeCode == "Move") {
+					name = "库存转移";
+				} else if (this.businessTypeCode == "HoldToOk") {
+					name = "隔离转合格";
+					this.toLocationCode = '';
+					this.toInventoryStatus = 'OK';
+				} else if (this.businessTypeCode == "HoldToScrap") {
+					name = "隔离转报废";
+					this.toLocationCode = 'SCRAP';
+					this.toInventoryStatus = 'SCRAP';
+				} else if (this.businessTypeCode == "OkToHold") {
+					name = "合格转隔离";
+					this.toLocationCode = 'HOLD';
+					this.toInventoryStatus = 'HOLD';
+				} else if (this.businessTypeCode == "OktoScrap") {
+					name = "合格转报废";
+					this.toLocationCode = 'SCRAP';
+					this.toInventoryStatus = 'SCRAP';
+				} else if (this.businessTypeCode == "ScrapToHold") {
+					name = "报废转隔离";
+					this.toLocationCode = 'HOLD';
+					this.toInventoryStatus = 'HOLD';
+				}
+
+				uni.setNavigationBarTitle({
+					title: name + '详情'
+				})
+			},
+
+
+			//接收
+			receive(callback) {
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				if (this.id != null) {
+					takeInventoryMoveJob(this.id).then(res => {
+						uni.hideLoading();
+						callback();
+					}).catch(error => {
+						uni.hideLoading();
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getInventoryMoveJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status
+							that.subList = res.data.subList;
+							that.detailSource = getDataSource(that.subList)
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+			openDetail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.continueScan()
+				this.$forceUpdate();
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch
+						})
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showMessage("箱码【" + packingNumber + "】已经扫描")
+							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,是否继续转移?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty);
+													itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty);
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									} else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.handleQty = Number(result.balance.qty);
+									itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
+									itemDetail.balance = result.balance;
+									itemDetail.balance.balanceQty = Number(result.balance.qty);
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+					this.scanPopupGetFocus();
+				} catch (e) {
+					this.showErrorMessage(e.message);
+				}
+			},
+
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+
+				//允许部分提交
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this
+							.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				//查询管理模式
+				this.managementList = [];
+				var precisionStrategParams = this.setPrecisionStrategParams()
+				getPrecisionStrategyList(precisionStrategParams, res => {
+					if (res.success) {
+						this.managementList = res.list;
+
+						var params = this.setParams()
+						console.log("提交" + JSON.stringify(params))
+						inventoryMoveSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成库存转移记录<br>" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+
+				})
+
+			},
+
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									res.locationCode == detail.toLocationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							detail.toContainerNumber = '';
+							// detail.toLocationCode = this.toLocationCode;
+							detail.toInventoryStatus=this.toInventoryStatus;
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+
+
+			getLocationInfo(locationCode) {
+				getBasicLocationByCode(locationCode).then(res => {
+					if (res.data.list.length > 0) {
+						this.toLocationInfo = res.data.list[0]
+					}
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/inventoryMove/job/inventoryMoveJob.vue b/pages/inventoryMove/job/inventoryMoveJob.vue
new file mode 100644
index 0000000..f3f0873
--- /dev/null
+++ b/pages/inventoryMove/job/inventoryMoveJob.vue
@@ -0,0 +1,275 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-inventory-job-card :dataContent="item" @click='openJobDetail(item)'>
+						</com-inventory-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+			
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		cancleTakeInventoryMoveJob,
+		getInventoryMoveJobList,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+
+	import comInventoryJobCard from '@/pages/inventoryMove/coms/comInventoryJobCard.vue'
+	import jobListPopup from '@/pages/inventoryMove/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/inventoryMove/coms/jobInfoPopup.vue'
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comInventoryJobCard,
+			jobListPopup,
+			jobInfoPopup,
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+				
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getInventoryMoveJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("库存转移(" + this.totalCount + ")");
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					this.loadingType = "";
+					updateTitle("库存转移");
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './inventoryMoveDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.comReceiptJobList.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeInventoryMoveJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(res => {
+					this.showMessage(res)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getInventoryMoveJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+			
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/inventoryMove/job/moveJob.vue b/pages/inventoryMove/job/moveJob.vue
new file mode 100644
index 0000000..e7b7ec5
--- /dev/null
+++ b/pages/inventoryMove/job/moveJob.vue
@@ -0,0 +1,37 @@
+<template>
+	<view class="page-wraper">
+		<comMoveJob ref="comMoveJob" businessTypeCode='Move'> </comMoveJob>
+	</view>
+</template>
+
+<script>
+	import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
+	import {
+		goHome,
+		getCurrDate
+	} from '@/common/basic.js';
+	export default {
+		components: {
+			comMoveJob
+		},
+		data() {
+
+			return {
+
+			}
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				this.$refs.comMoveJob.toHome();
+			} else if (e.index == 1) {
+				this.$refs.comMoveJob.openFilter();
+			}
+		},
+
+		onLoad() {},
+		methods: {
+
+		}
+	}
+</script>
+
diff --git a/pages/inventoryMove/job/okToHoldMoveJob.vue b/pages/inventoryMove/job/okToHoldMoveJob.vue
new file mode 100644
index 0000000..5e2f8ec
--- /dev/null
+++ b/pages/inventoryMove/job/okToHoldMoveJob.vue
@@ -0,0 +1,36 @@
+<template>
+	<view class="page-wraper">
+		<comMoveJob ref="comMoveJob" businessTypeCode='OkToHold' > </comMoveJob>
+	</view>
+</template>
+
+<script>
+	import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
+	export default {
+		components: {
+			comMoveJob
+		},
+		data() {
+			return {
+
+			}
+		},
+		onPullDownRefresh() {
+			this.$refs.comMoveJob.refresh();
+		},
+		
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				this.$refs.comMoveJob.toHome();
+			} else if (e.index == 1) {
+				this.$refs.comMoveJob.openFilter();
+			}
+		},
+
+		onLoad() {},
+		methods: {
+
+		}
+	}
+</script>
+
diff --git a/pages/inventoryMove/job/okToScrapMoveJob.vue b/pages/inventoryMove/job/okToScrapMoveJob.vue
new file mode 100644
index 0000000..c78799e
--- /dev/null
+++ b/pages/inventoryMove/job/okToScrapMoveJob.vue
@@ -0,0 +1,39 @@
+<template>
+	<view class="page-wraper">
+		<comMoveJob ref="comMoveJob" businessTypeCode='OktoScrap'> </comMoveJob>
+	</view>
+</template>
+
+<script>
+	import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
+
+	export default {
+		components: {
+			comMoveJob
+		},
+		data() {
+
+			return {
+
+			}
+		},
+		onPullDownRefresh() {
+			this.$refs.comMoveJob.refresh();
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				this.$refs.comMoveJob.toHome();
+			} else if (e.index == 1) {
+				this.$refs.comMoveJob.openFilter();
+			}
+		},
+
+		onLoad() {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inventoryMove/job/scrapToHoldMoveJob.vue b/pages/inventoryMove/job/scrapToHoldMoveJob.vue
new file mode 100644
index 0000000..985e5a5
--- /dev/null
+++ b/pages/inventoryMove/job/scrapToHoldMoveJob.vue
@@ -0,0 +1,39 @@
+<template>
+	<view class="page-wraper">
+		<comMoveJob ref="comMoveJob" businessTypeCode='ScrapToHold'> </comMoveJob>
+	</view>
+</template>
+
+<script>
+	import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
+
+	export default {
+		components: {
+			comMoveJob
+		},
+		data() {
+
+			return {
+
+			}
+		},
+		onPullDownRefresh() {
+			this.$refs.comMoveJob.refresh();
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				this.$refs.comMoveJob.toHome();
+			} else if (e.index == 1) {
+				this.$refs.comMoveJob.openFilter();
+			}
+		},
+
+		onLoad() {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inventoryMove/record/holdToOkRecord.vue b/pages/inventoryMove/record/holdToOkRecord.vue
new file mode 100644
index 0000000..72d3dc7
--- /dev/null
+++ b/pages/inventoryMove/record/holdToOkRecord.vue
@@ -0,0 +1,25 @@
+<template>
+	<view class="page-wraper">
+		<comMoveRecord businessTypeCode='HoldToOk' > </comMoveRecord>
+	</view>
+</template>
+
+<script>
+		import comMoveRecord from '@/pages/inventoryMove/coms/comMoveRecord.vue'
+
+	export default {
+		components: {
+			comMoveRecord
+		},
+		data() {
+			return {
+
+			}
+		},
+		onLoad() {},
+		methods: {}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inventoryMove/record/holdToScrapRecord.vue b/pages/inventoryMove/record/holdToScrapRecord.vue
new file mode 100644
index 0000000..70175e8
--- /dev/null
+++ b/pages/inventoryMove/record/holdToScrapRecord.vue
@@ -0,0 +1,29 @@
+<template>
+	<view class="page-wraper">
+		<comMoveRecord  businessTypeCode='HoldToScrap'> </comMoveRecord>
+	</view>
+</template>
+
+<script>
+	import comMoveRecord from '@/pages/inventoryMove/coms/comMoveRecord.vue'
+
+	export default {
+		components: {
+			comMoveRecord
+		},
+		data() {
+
+			return {
+
+			}
+		},
+
+		onLoad() {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inventoryMove/record/moveFreeRecord.vue b/pages/inventoryMove/record/moveFreeRecord.vue
new file mode 100644
index 0000000..001898f
--- /dev/null
+++ b/pages/inventoryMove/record/moveFreeRecord.vue
@@ -0,0 +1,29 @@
+<template>
+	<view class="page-wraper">
+		<comMoveRecord :allowEditStatus="true"  businessTypeCode='Move'> </comMoveRecord>
+	</view>
+</template>
+
+<script>
+	import comMoveRecord from '@/pages/inventoryMove/coms/comMoveRecord.vue'
+
+	export default {
+		components: {
+			comMoveRecord
+		},
+		data() {
+
+			return {
+
+			}
+		},
+
+		onLoad() {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inventoryMove/record/okToHoldRecord.vue b/pages/inventoryMove/record/okToHoldRecord.vue
new file mode 100644
index 0000000..2fb8080
--- /dev/null
+++ b/pages/inventoryMove/record/okToHoldRecord.vue
@@ -0,0 +1,26 @@
+<template>
+	<view class="page-wraper">
+		<comMoveRecord businessTypeCode='OkToHold' > </comMoveRecord>
+	</view>
+</template>
+
+<script>
+	import comMoveRecord from '@/pages/inventoryMove/coms/comMoveRecord.vue'
+
+	export default {
+		components: {
+			comMoveRecord
+		},
+		data() {
+			return {
+
+			}
+		},
+		onLoad() {},
+		methods: {
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inventoryMove/record/okToScrapRecord.vue b/pages/inventoryMove/record/okToScrapRecord.vue
new file mode 100644
index 0000000..dfa24f3
--- /dev/null
+++ b/pages/inventoryMove/record/okToScrapRecord.vue
@@ -0,0 +1,26 @@
+<template>
+	<view class="page-wraper">
+		<comMoveRecord businessTypeCode='OkToScrap' > </comMoveRecord>
+	</view>
+</template>
+
+<script>
+	import comMoveRecord from '@/pages/inventoryMove/coms/comMoveRecord.vue'
+
+	export default {
+		components: {
+			comMoveRecord
+		},
+		data() {
+			return {
+
+			}
+		},
+		onLoad() {},
+		methods: {
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/inventoryMove/record/scrapToHoldRecord.vue b/pages/inventoryMove/record/scrapToHoldRecord.vue
new file mode 100644
index 0000000..f9b6e8a
--- /dev/null
+++ b/pages/inventoryMove/record/scrapToHoldRecord.vue
@@ -0,0 +1,29 @@
+<template>
+	<view class="page-wraper">
+		<comMoveRecord  businessTypeCode='ScrapToHold'> </comMoveRecord>
+	</view>
+</template>
+
+<script>
+	import comMoveRecord from '@/pages/inventoryMove/coms/comMoveRecord.vue'
+
+	export default {
+		components: {
+			comMoveRecord
+		},
+		data() {
+
+			return {
+
+			}
+		},
+
+		onLoad() {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/issue-按批次推荐/coms/comIssueDetailCard.vue b/pages/issue-按批次推荐/coms/comIssueDetailCard.vue
new file mode 100644
index 0000000..80dcf05
--- /dev/null
+++ b/pages/issue-按批次推荐/coms/comIssueDetailCard.vue
@@ -0,0 +1,214 @@
+<template>
+	<view>
+		<!-- 需求库位 -->
+		<requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode"
+			:isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation>
+		<u-line />
+		<view v-for="(item,index) in dataContent.Items">
+			<uni-collapse ref="collapse">
+				<uni-collapse-item :open="true">
+					<template v-slot:title>
+						<!-- 物品 -->
+						<item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
+					</template>
+					<u-line />
+					<view v-for="(loacation,index) in item.Locations">
+						<view>
+							<view class="uni-flex uni-row space-between">
+								<!-- 推荐库位 -->
+								<location :locationCode="loacation.fromLocationCode">
+								</location>
+							</view>
+							<view v-for="(batch,index) in loacation.Batchs">
+								<uni-collapse ref="subCollapse">
+									<uni-collapse-item :open="true">
+										<template v-slot:title>
+											<view class="uni-flex uni-row space-between">
+												<view>
+													<batch :batch="batch.batch" style='margin-left: 20px;'>
+													</batch>
+												</view>
+												<view>
+													<recommend-qty
+														v-if="batch.Records==null || batch.Records==undefined "
+														:dataContent="batch" :isShowStatus='false'
+														:isShowStdPack="false">
+													</recommend-qty>
+													<compare-qty v-else :dataContent="batch" :recommendQty="batch.qty"
+														:handleQty="batch.handleQty" :isShowStatus='false'
+														:isShowStdPack="false">
+													</compare-qty>
+												</view>
+											</view>
+										</template>
+
+										<view v-if='batch.Records!=null || batch.Records!=undefined '
+											v-for="(record,index) in batch.Records">
+											<uni-swipe-action ref="swipeAction">
+												<uni-swipe-action-item @click="swipeClick($event,batch)"
+													:right-options="scanOptions">
+													<!-- :right-options="loacation.scaned?scanOptions:detailOptions" -->
+													<view class="uni-flex uni-row space-between">
+														<view>
+															<pack :packingCode="record.packingNumber"
+																style='margin-left: 40px;'>
+															</pack>
+														</view>
+														<view>
+															<qty :dataContent="record" :isShowStdPack="false">
+															</qty>
+														</view>
+													</view>
+
+													<!-- <com-issue-recommend :detail="loacation"></com-issue-recommend> -->
+												</uni-swipe-action-item>
+											</uni-swipe-action>
+										</view>
+									</uni-collapse-item>
+								</uni-collapse>
+							</view>
+						</view>
+					</view>
+				</uni-collapse-item>
+			</uni-collapse>
+		</view>
+	</view>
+
+
+	<recommendQtyEdit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam"
+		:handleQty="editItem.record.qty" @confirm="confirm">
+	</recommendQtyEdit>
+	<job-detail-popup ref="receiptHint" :dataContent="showItem"></job-detail-popup>
+	<comMessage ref="message"></comMessage>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comIssueRecommend from '@/pages/issue/coms/comIssueRecommend.vue'
+
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+	import balanceQty from '@/mycomponents/qty/balanceQty.vue'
+	import qty from '@/mycomponents/qty/qty.vue'
+
+	import {
+		getDetailOption,
+		getEditRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			recommendQtyEdit,
+			jobDetailPopup,
+			requiredLocation,
+			comIssueRecommend,
+			pack,
+			location,
+			batch,
+			recommendQty,
+			compareQty,
+			balanceQty,
+			qty
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getEditRemoveOption();
+		},
+
+		methods: {
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.subCollapse.forEach(r => {
+						r.resize();
+					})
+				});
+
+				this.$nextTick(r => {
+					this.$refs.collapse.forEach(r => {
+						r.childrens.forEach(i => {
+							i.init();
+						})
+						r.resize();
+					})
+				});
+
+			},
+
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.receiptEdit.openEditPopup();
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.isScaned = false
+							item.record = {}
+							// item.record.qty = 0;
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.record.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/issue-按批次推荐/coms/comIssueJobCard.vue b/pages/issue-按批次推荐/coms/comIssueJobCard.vue
new file mode 100644
index 0000000..bd49c9d
--- /dev/null
+++ b/pages/issue-按批次推荐/coms/comIssueJobCard.vue
@@ -0,0 +1,56 @@
+<template>
+	<view>
+		<view class="task_card">
+			<job-top :dataContent="dataContent"></job-top>
+
+			<view class="task_item">
+				<view class="task_text">
+					需求物料 : {{dataContent.itemCode}}
+				</view>
+				<view class="task_text">
+					需求库位 : {{dataContent.toLocationCode}}
+				</view>
+			</view>
+
+			<u-line color="#909399" />
+
+			<job-bottom :dataContent="dataContent"></job-bottom>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat,
+	} from '@/common/basic.js';
+
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import jobBottom from '@/mycomponents/job/jobBottom.vue'
+	import jobProperty from '@/mycomponents/job/jobProperty.vue'
+
+	export default {
+		components: {
+			jobTop,
+			jobBottom,
+			jobProperty,
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/issue-按批次推荐/coms/comIssueRecommend.vue b/pages/issue-按批次推荐/coms/comIssueRecommend.vue
new file mode 100644
index 0000000..c9256fd
--- /dev/null
+++ b/pages/issue-按批次推荐/coms/comIssueRecommend.vue
@@ -0,0 +1,120 @@
+<template>
+	<!-- :class="detail.scaned?'scan_view':''" -->
+	<view  style="background-color: #ffffff;">
+		<view>
+			<view>
+				<view class="uni-flex uni-row space-between">
+					<location :locationCode="detail.fromLocationCode">
+					</location>
+				</view>
+				<view v-for="(batch,index) in detail.Batchs">
+					<uni-collapse ref="subCollapse">
+						<uni-collapse-item :open="true">
+							<template v-slot:title>
+								<view class="uni-flex uni-row space-between">
+									<view>
+										<batch :batch="batch.batch" style='margin-left: 20px;'></batch>
+									</view>
+									<view>
+										<recommend-qty v-if="batch.Records==null || batch.Records==undefined "
+											:dataContent="batch" :isShowStatus='false' :isShowStdPack="false">
+										</recommend-qty>
+										<compare-qty v-else :dataContent="batch" :recommendQty="batch.qty"
+											:handleQty="batch.handleQty" :isShowStatus='false' :isShowStdPack="false">
+										</compare-qty>
+									</view>
+								</view>
+							</template>
+							<u-line />
+							<view class="" v-for="(record,index) in batch.Records">
+								<uni-swipe-action ref="swipeAction">
+									<uni-swipe-action-item @click="swipeClick($event,batch)">
+										<!-- :right-options="loacation.scaned?scanOptions:detailOptions" -->
+										<view class="uni-flex uni-row space-between">
+											<view>
+												<pack :packingCode="record.packingNumber" style='margin-left: 40px;'>
+												</pack>
+											</view>
+											<view>
+												<qty :dataContent="record" :isShowStdPack="false"></qty>
+											</view>
+										</view>
+
+										<!-- <com-issue-recommend :detail="loacation"></com-issue-recommend> -->
+									</uni-swipe-action-item>
+								</uni-swipe-action>
+							</view>
+						</uni-collapse-item>
+					</uni-collapse>
+				</view>
+
+
+				<!-- 	<view v-for="(batch,index) in detail.Batchs">
+			 
+
+					<view v-if="batch.Records!=null || batch.Records!=undefined ">
+						<view v-for="(record,index) in batch.Records">
+							<view class="uni-flex uni-row space-between">
+								<view>
+									<pack :packingCode="record.packingNumber" style='margin-left: 40px;'></pack>
+								</view>
+								<view>
+									<qty :dataContent="record" :isShowStdPack="false"></qty>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view> -->
+
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+	import balanceQty from '@/mycomponents/qty/balanceQty.vue'
+	import qty from '@/mycomponents/qty/qty.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			recommendQty,
+			compareQty,
+			balanceQty,
+			qty
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			detail: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+
+		},
+		methods: {
+			resizeCollapse() {
+				let that=this;
+				that.$nextTick(r => {
+					that.$refs.subCollapse[0].resize();
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/issue-按批次推荐/coms/comScanIssueList.vue b/pages/issue-按批次推荐/coms/comScanIssueList.vue
new file mode 100644
index 0000000..1b815ca
--- /dev/null
+++ b/pages/issue-按批次推荐/coms/comScanIssueList.vue
@@ -0,0 +1,54 @@
+<template>
+		<!-- <page-meta root-font-size="18px"></page-meta> -->
+	<uni-popup ref="popupItems">
+		<scroll-view scroll-y="true" style="background-color: #000;height: 80vh;">
+		<view class="" style=" margin: 10rpx;background-color:#EBEEF0;" v-for="(item, index) in showList" :key="index" @click="openDetail(item)">
+			<jobCard :dataContent="item"
+			:disabled="true"
+			:propertyList="propertyList"
+			></jobCard>
+		</view>
+		</scroll-view>
+		</uni-popup>
+</template>
+
+<script>
+	import jobCard from '@/mycomponents/job/jobCard.vue';
+	export default {
+		emits:["selectedItem"],
+		components: {
+			jobCard
+		},
+		props: {
+			
+		},
+		data (){
+			return {
+				showList: [],
+				propertyList:[]
+			}
+		},
+		methods:{
+			openPopup(items) {
+				this.showList = items;
+				this.showList.forEach(res=>{
+					var temp = {
+						name:"发货单号",
+						value:res.asnNumber
+					}
+					this.propertyList.push(temp)
+				})
+				this.$refs['popupItems'].open("center");
+			},
+			
+			openDetail(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+		
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/issue-按批次推荐/coms/comScanIssuePack.vue b/pages/issue-按批次推荐/coms/comScanIssuePack.vue
new file mode 100644
index 0000000..206e4c5
--- /dev/null
+++ b/pages/issue-按批次推荐/coms/comScanIssuePack.vue
@@ -0,0 +1,336 @@
+<template>
+	<view>
+		<uni-popup ref="popup" @maskClick="closeScanPopup()">
+			<view class="">
+				<view class="popup_box">
+					<view class="pop_title">
+						扫描箱码
+						<text class="fr" @click="closeScanPopup()">关闭</text>
+					</view>
+					<view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center" style="width: 25%; ">
+							需求库位
+						</view>
+						<view class="" style="width: 75%;padding: 8rpx">
+							<uni-combox ref="toLocationCombox" :candidates="requestLocationList" placeholder="请选择需求库位"
+								v-model="requestLocationCode" @confirm="toLocationUpdate"></uni-combox>
+						</view>
+					</view>
+
+					<view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-top: 10rpx;
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center" style="width: 25%; ">
+							发料库位
+						</view>
+						<view class="uni-flex uni-row u-col-center" style="width: 75%; padding: 8rpx;">
+							<view class="">
+								<uni-combox :candidates="fromLocationList" v-model="fromLocationCode"
+									placeholder="请选择库位" @confirm="fromLocationUpdate"></uni-combox>
+							</view>
+							<!-- <view class="" v-if="locationCodeCountItem.recommendQty>0">
+								{{locationCodeCountItem.handleQty}}/{{locationCodeCountItem.recommendQty}}({{locationCodeCountItem.uom}})
+							</view> -->
+						</view>
+					</view>
+
+					<view class="pop_tab">
+						<view class="tab_info">
+							<win-com-scan ref="comscan" placeholder="箱标签" @getResult="onScan" :clearResult="true">
+							</win-com-scan>
+						</view>
+					</view>
+					<!-- <view class="uni-flex uni-row" style="background-color: white">
+						<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after"
+							@click="cancle()">取消</button>
+						<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after"
+							@click="confirm()">确认</button>
+					</view> -->
+				</view>
+			</view>
+		</uni-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+
+	export default {
+		name: 'winScanPack',
+		components: {
+			winComScan
+		},
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+
+		},
+		data() {
+			return {
+				dataContent: {},
+				jobContent: {},
+				expendIcon: 'arrow-down',
+				show: false,
+				scanList: [],       
+				requestLocationList: [],
+				requestLocation: null,
+				requestLocationCode: '',
+				fromLocationList: [],
+				fromLocationCode: '',
+				fromLocation: null,
+			}
+		},
+		created() {
+			 
+		},
+		watch: {},
+		mounted() {},
+		methods: {
+			openScanPopup(content, jobcontent) {
+				this.dataContent = content;
+				this.jobContent = jobcontent;
+				this.initData();
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+
+			closeScanPopup() {
+				this.$refs.popup.close();
+				this.$emit("closeScan")
+				//清除数据，恢复默认值
+				// Object.assign(this.$data, this.$options.data());
+			},
+
+			initData() {
+				let that = this;
+				that.requestLocationList = [];
+				that.fromLocationList = [];
+				if (that.dataContent != null) {
+					that.requestLocation = that.dataContent[0];
+					that.requestLocationCode = that.dataContent[0].toLocationCode;
+					that.dataContent.forEach(res => {
+						that.requestLocationList.push(res.toLocationCode)
+					})
+					that.fromLocationList = that.getFromLocationList();
+				}
+			},
+
+			getFromLocationList() {
+				let list = [];
+				let location = this.dataContent.find(r => r.toLocationCode == this.requestLocation.toLocationCode);
+				if (location != undefined) {
+					location.Items.forEach(item => {
+						item.Locations.forEach(f => {
+							list.push(f.fromLocationCode)
+						})
+						this.fromLocationCode = item.Locations[0].fromLocationCode;
+					})
+					return list;
+				} else {
+					this.$refs.comMessage.showErrorMessages('需求库位【' + this.toLocationCode + '】不存在', res => {
+						this.toLocationCode = '';
+					});
+				}
+			},
+
+			fromLocationUpdate(fromlocation) {
+				let location = this.fromLocationList.find(r => r == fromlocation)
+				if (location == undefined) {
+					this.fromLocationCode = ''
+					this.showErrorMessage('发料库位【' + fromlocation + '】不存在')
+				}
+			},
+
+			toLocationUpdate(tolocation) {
+				let toLocation = this.requestLocationList.find(r => r == tolocation);
+				if (toLocation == undefined) {
+					this.requestLocation = null;
+					this.requestLocationCode = '';
+					this.showErrorMessage('需求库位【' + tolocation + '】不存在')
+				} else {
+					this.getFromLocationList();
+				}
+			},
+
+			qtyChanged(value, item) {
+				if (value == 0) {
+					uni.showToast({
+						title: '数量必须大于0'
+					})
+					return;
+				}
+				item.qty = value;
+				this.calcCount();
+			},
+
+			onScan(result) {
+				let that = this;
+				if (that.requestLocation == null) {
+					that.showErrorMessage('请选择需求库位', res => {
+						that.$refs.toLocationCombox.onFocus();
+					});
+					return;
+				}
+				if (that.fromLocationCode == '') {
+					that.showErrorMessage('请选择发料库位', res => {
+						that.$refs.toLocationCombox.onFocus();
+					});
+					return;
+				}
+
+				let itemCode = result.label.itemCode;
+				let packingCode = result.label.packingNumber;
+				let lot = result.label.batch;
+
+				let item = that.requestLocation.Items.find(r => r.itemCode == itemCode);
+				if (item == undefined) {
+					that.showErrorMessage('未查找到物料【' + itemCode + '】的发料明细',
+						res => {
+							that.getfocus();
+						}
+					)
+					return;
+				} else {
+					let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode);
+					if (fromLocation != undefined) {
+						let batch = fromLocation.Batchs.find(r => r.batch == lot);
+						if (batch != undefined) {
+							if (batch.Records == undefined) {
+								batch.Records = [];
+							}
+
+							let record = batch.Records.find(r => r.packingNumber == packingCode);
+							if (record == undefined) {
+								let record = that.creatRecord(result.label);
+								batch.Records.push(record);
+								that.calcBatchHandleQty(batch);
+							} else {
+								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一个箱',
+									res => {
+										that.getfocus();
+									}
+								)
+							}
+						} else {
+							if (this.jobContent.AllowModifyBatch == null) {
+								this.showQuestionMessage('未查找到批次【' + lot + '】的发料明细,是否要继续发料?', res => {
+									if (res) {
+										let batch = that.createBatchInfo(result.data);
+										fromLocation.Batchs.unshift(batch);
+									}
+								})
+							} else {
+								that.showErrorMessage('未查找到批次【' + lot + '】的发料明细',
+									res => {
+										that.getfocus();
+									});
+							}
+						}
+					} else {
+						that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发料明细',
+							res => {
+								that.getfocus();
+							}
+						)
+					}
+				}
+			},
+
+			createBatchInfo(data) {
+				let batch = {
+					batch: data.lot,
+					qty: 0,
+					uom: data.uom,
+					handleQty: Number(data.qty),
+					Records: []
+				}
+				let record = this.creatRecord(data);
+				batch.Records.push(record);
+				return batch;
+			},
+
+			creatRecord(data) {
+				let record = {
+					packingNumber: data.packingNumber,
+					qty: Number(data.qty),
+					inventoryStatus: 'kcztOK'
+				}
+				return record;
+			},
+
+			calcBatchHandleQty(batch) {
+				let handleQty = 0;
+				batch.Records.forEach(res => {
+					handleQty += res.qty
+				})
+				batch.handleQty = handleQty;
+			},
+
+			calcCount() {
+				let handleQty = 0;
+				this.scanList.forEach(res => {
+					handleQty += res.qty
+				})
+				this.scanCount = handleQty;
+				this.locationCodeCountItem.handleQty = this.scanCount;
+			},
+
+			getfocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			losefocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+
+			showMessage(message, callback) {
+				this.$refs.comMessage.showMessage(message,callback);
+			},
+			showErrorMessage(message, callback) {
+				this.$refs.comMessage.showErrorMessage(message,callback);
+			},
+			showQuestionMessage(message, callback) {
+				this.$refs.comMessage.showQuestionMessage(message, callback);
+			},
+			confirm() {
+				this.closeScanPopup();
+				this.$emit("onConfirm", this.dataContent);
+			},
+			cancle() {
+				this.closeScanPopup()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	button {
+		border: none;
+	}
+
+	button::after {
+		border: none
+	}
+
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+		padding: 10rpx;
+	}
+</style>
diff --git a/pages/issue-按批次推荐/job/issueDetail.vue b/pages/issue-按批次推荐/job/issueDetail.vue
new file mode 100644
index 0000000..ea19866
--- /dev/null
+++ b/pages/issue-按批次推荐/job/issueDetail.vue
@@ -0,0 +1,693 @@
+<template>
+	<!-- <page-meta root-font-size="18px"></page-meta> -->
+	<view class="page-wraper">
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="">
+				<view v-for="(toLocation, index) in detailSource">
+					<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation"></com-issue-detail-card>
+				</view>
+			</scroll-view>
+		</view>
+
+		<div class="btn_bottom">
+			<view class="" style="display: flex;flex-direction: row;">
+				<view class="">
+					<button class="btn_commit" hover-class="btn_commit_after" :disabled="disabledConfirm"
+						@click="submit()">提交</button>
+					<button class="btn_commit" hover-class="btn_commit_after" @click="resizeCollapse()">刷新</button>
+				</view>
+			</view>
+		</div>
+		<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
+		<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScan'></com-scan-issue-pack>
+		<!-- <com-balance ref="balanceItems"></com-balance> -->
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		takeIssueJob,
+		cancelTakeIssueJob,
+		getIssueJobDetail,
+		getBalanceByUniquecode,
+		issueJobSubmit
+	} from '@/api/request.js';
+
+	import {
+		showConfirmMsg,
+		goHome,
+		getRemoveOption,
+		getISODateTime
+	} from '@/common/basic.js';
+
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comIssueRecommend from '@/pages/issue/coms/comIssueRecommend.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
+	import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
+
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+	import balanceQty from '@/mycomponents/qty/balanceQty.vue'
+	import qty from '@/mycomponents/qty/qty.vue'
+
+	export default {
+		name: 'issueDetail',
+		components: {
+			winScanButton,
+			comIssueDetailCard,
+			comScanIssuePack,
+			itemQty,
+			recommend,
+			recommendQtyEdit,
+			jobDetailPopup,
+			requiredLocation,
+			comIssueRecommend,
+			pack,
+			location,
+			batch,
+			recommendQty,
+			compareQty,
+			balanceQty,
+			qty
+		},
+		data() {
+			return {
+				itemList: [],
+				toLocation: null,
+				currentLabel: null,
+				reScanItem: null, //重复的箱码
+				isFromEdit: false,
+				locationDisabled: false,
+				disabledConfirm: true,
+				currentData: {},
+				id: '',
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: []
+			};
+		},
+
+		props: {
+
+		},
+
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "JOB_PENDING") {
+					this.receive((callback => {
+						this.received = true;
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (this.received) {
+				//取消承接任务	
+				cancelTakeIssueJob(this.id).then(res => {}).catch(error => {
+					this.showMessage(err);
+				})
+			}
+		},
+
+		watch: {
+			locationTypes(newVal) {
+				let value = newVal;
+			},
+		},
+		mounted: function() {
+
+		},
+
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeIssueJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getIssueJobDetail(that.id).then(res => {
+					if (res.data[0].subList.length > 0) {
+						that.jobContent = res.data[0];
+						that.subList = res.data[0].subList;
+						that.detailSource = that.getDataSource(that.subList)
+						that.resizeCollapse();
+						uni.hideLoading();
+					} else {
+						that.showMessage('列表数据为0');
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			getDataSource(subList) {
+				let list = [];
+				let that = this;
+				for (var i = 0; i < subList.length; i++) {
+					let detail = subList[i];
+					var location = list.find(r =>
+						r.toLocationCode == detail.toLocationCode)
+					if (location == undefined) {
+						location = {
+							toLocationCode: detail.toLocationCode,
+							Items: []
+						}
+						list.push(location);
+					}
+					that.createDetailInfo(location, detail);
+				}
+				return list;
+			},
+
+			//树形结构:需求库位 -> 物料Items -> 库位 Locations-> 批次Batchs -> 记录Records
+			createDetailInfo(location, detail) {
+				let that = this;
+				var item = location.Items.find(r =>
+					r.itemCode == detail.itemCode)
+				if (item == undefined) {
+					item = that.createItemInfo(detail);
+					location.Items.push(item)
+				} else {
+					item.qty += detail.qty
+					//在物料下查找库位
+					let location = item.Locations.find(r => r.fromLocationCode == detail.fromLocationCode);
+					if (location == undefined) {
+						location = that.createLocationInfo(detail);
+						item.Locations.push(location);
+					} else {
+						//在库位下查找批次
+						let batch = location.Batchs.find(r => r.batch == detail.Bacth);
+						if (batch == undefined) {
+							let batch = that.createBatchInfo(detail);
+							location.Batchs.push(batch);
+						}
+					}
+				}
+			},
+
+			createItemInfo(detail) {
+				let item = {
+					itemCode: detail.itemCode,
+					itemName: detail.itemName,
+					stdPackQty: detail.stdPackQty,
+					stdPackUnit: detail.stdPackUnit,
+					qty: detail.qty,
+					uom: detail.uom,
+					handleQty: 0,
+					Locations: []
+				}
+				let location = this.createLocationInfo(detail);
+				item.Locations.push(location);
+				return item;
+			},
+
+			createLocationInfo(detail) {
+				let location = {
+					fromLocationCode: detail.fromLocationCode,
+					qty: detail.qty,
+					uom: detail.uom,
+					handleQty: 0,
+					Batchs: []
+				}
+				let batch = this.createBatchInfo(detail);
+				location.Batchs.push(batch);
+				return location;
+			},
+
+			createBatchInfo(detail) {
+				let batch = {
+					batch: detail.batch,
+					qty: detail.qty,
+					uom: detail.uom,
+					handleQty: 0,
+					// Records: []
+				}
+				return batch;
+			},
+
+			createRecordInfo(detail) {
+				var record = {}
+				detail.scaned = true;
+				// let record = JSON.parse(JSON.stringify(detail));
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				Object.assign(record, detail)
+				record.toLocationCode = this.toLocationCode;
+				return record;
+			},
+
+
+			closeScan() {
+				this.resizeCollapse();
+			},
+
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.comIssueDetailCard.forEach(r => {
+						r.resizeCollapse();
+					})
+
+					// this.$refs.collapse.forEach(r => {
+					// 	r.resize();
+					// })
+
+					// this.$refs.subCollapse.forEach(r => {
+					// 	r.resize();
+					// })
+
+
+					// this.$refs.collapse.forEach(r => {
+					// 	r.resize();
+					// })
+
+					// this.$refs.subCollapse[0].resize();
+					// this.$refs.collapse[0].resize();
+
+
+
+				});
+			},
+
+
+			reload() {
+				let that = this;
+				this.$nextTick(r => {
+					that.$refs.collapse[0].resize();
+				});
+			},
+
+			swipeClick(e, item, index) {
+				let {
+					content
+				} = e;
+				if (content.text === '移除') {
+					uni.showModal({
+						title: '提示',
+						content: '是否移除选择的行?',
+						success: res => {
+							if (res.confirm) {
+								this.removeLabel(item, index)
+							}
+						}
+					});
+				}
+			},
+
+			removeLabel(item, index) {
+				let label = item.labelList[index];
+				item.scanQty = item.scanQty - label.qty;
+				item.labelList.splice(index, 1);
+				if (item.labelList.length == 0) {
+					let itemIndex = this.itemList.findIndex(r => {
+						return r.itemCode == item.itemCode
+					})
+					this.itemList.splice(itemIndex, 1)
+				}
+			},
+
+			getScanResult(result, locationCode) {
+				let that = this;
+
+				let location = that.dataSource.find(r => r.toLocationCode == locationCode);
+
+				if (locatio == undefined || locatio == null) {
+					this.showErrorMessage('需求库位不存在', callback => {
+
+					})
+				} else {
+					let item = location.Items.find(r => r.itemCode == result.label.itemCode);
+					if (item == undefined || item == null) {
+						this.showErrorMessage('未查找到物料【' + result.label.itemCode + '】的发料需求', callback => {
+
+						})
+					} else {
+						let fromLocation = item.Locations.find(r => r.fromLocationCode == locationCode);
+						let batch = fromLocation.Batchs.find(r => r.Bacth == result.label.batch)
+						if (batch == undefined || batch == null) {
+							if (jobContent.AllowModifyBach == 1) {
+								//增加批次
+								let bacth = this.createBatchInfo(result);
+								item.Batchs.push(bacth);
+							} else {
+								this.showErrorMessage('未查找到物料【' + result.label.itemCode + '】对应的批次【' + result.label.batch +
+									'】需求', callback => {
+
+									})
+							}
+
+						} else {
+							//在批次下增加记录
+						}
+					}
+				}
+			},
+
+			afterRescan(confirm) {
+				let that = this;
+				if (confirm) {
+					that.reScanItem.labelList.forEach((r, i) => {
+						if (r.packingCode == that.currentLabel.packingCode) {
+							that.reScanItem.labelList.splice(i, 1);
+							return;
+						}
+					});
+					that.getBalance();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+			getBalance() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				let that = this;
+				//按照物料号和箱码去查询库存
+				let params = {
+					pageSize: 100,
+					pageIndex: 1,
+					locationTypes: [2, 3],
+					itemCode: that.currentLabel.itemCode,
+					packingCode: that.currentLabel.packingCode,
+					lot: that.currentLabel.lot,
+				};
+				getBalancesExpectByFilter(params)
+					.then(res => {
+						try {
+							if (res.totalCount === 0) {
+								this.showScanMessage('箱码【' + that.currentLabel.packingCode + '】在【原料库】【半成品库】未查询到库存信息');
+							} else if (res.totalCount === 1) {
+								let balanceItem = res.items[0];
+								this.createItem(balanceItem);
+							} else {
+								this.$refs.balanceItems.openPopup(res.items);
+							}
+						} catch (e) {
+							this.showScanMessage(e.message);
+						}
+						this.scanPopupGetFocus();
+						uni.hideLoading();
+					})
+					.catch(err => {
+						this.showScanMessage(err.message);
+						this.scanPopupGetFocus();
+						uni.hideLoading();
+					});
+			},
+
+			getToLocation(code) {
+				if (code == '') {
+					this.showMessage('目标库位不能为空');
+					return;
+				}
+				uni.showLoading({
+					title: "扫描中",
+					mask: true
+				});
+				let that = this;
+				locations(code).then(res => {
+					if (res == null) {
+						that.showMessage('目标库位【' + code + '】不存在');
+						that.$refs.comToLocation.clearLocation();
+					} else {
+						if (res.type != 5) {
+							this.showMessage('目标库位必须是【线边库】')
+						} else {
+							this.toLocation = res;
+						}
+					}
+					uni.hideLoading();
+				}).catch(err => {
+					that.toLocationCode = ''
+					that.showMessage(err.message);
+					uni.hideLoading();
+				})
+			},
+
+			clearLocation() {
+				this.toLocation = null;
+			},
+
+			clearCustomerAddress() {
+				this.customerAddressArray = [];
+				this.toLocation = null;
+				this.customerAddress = null;
+				this.customerAddressCode = ''
+			},
+
+			submit() {
+				//3.如果是按批次先进先出发料提交时如果扫描的箱码不是先进的批次，则报错
+				//:请扫描XXX批次，改批次满足先进先出规则。否则可以直接提交
+				// var isOutIn = getApp().globalData.feed_configList.filter(
+				// 	res => {
+				// 		if (res.name == 'feed_isOutIn') {
+				// 			return res;
+				// 		}
+				// 	});
+
+				this.dataContent.itemCodeList.forEach(res => {
+					if (res.handleQty > res.recommendQty) {
+						this.$refs.modal.showConfirmMessageModal('实际数量大于需求数量,是否提交?', confirm => {
+							if (confirm) {
+								//提交
+								uni.showToast({
+									title: "提交"
+								})
+							}
+						})
+					} else {
+						uni.showToast({
+							title: "扫描的数量" + res.handleQty + "]小于推荐数量[" + res.recommendQty + "]"
+						})
+					}
+				})
+			},
+
+			updateCommitBtn() {
+				var isHandleQtyNoRecommedQty = getApp().globalData.feed_configList.filter(
+					res => {
+						if (res.name == 'feed_isHandleQtyNoRecommedQty') {
+							return res;
+						}
+					});
+				//实际发料数量是否允许与需求量不同
+				//允许
+				if (isHandleQtyNoRecommedQty[0].value) {
+					//实际发料数量与需求量允许不一致
+
+					//有扫描数量可以提交,按钮可点击
+					var handleQty = 0;
+					this.dataContent.itemCodeList.forEach(res => {
+						handleQty = res.handleQty + handleQty;
+					})
+
+					if (handleQty > 0) {
+						this.disabledConfirm = false;
+						//如果实际数量（扫描数量）大于需求数量，提示是否提交
+
+					} else {
+						this.disabledConfirm = true;
+					}
+
+
+
+				} else {
+					//实际发料数量与需求量不允许不一致，按钮不可用
+					//必须相等才可以用
+
+					this.dataContent.itemCodeList.forEach(res => {
+						if (res.handleQty == res.recommendQty) {
+							this.disabledConfirm = false;
+						} else {
+							this.disabledConfirm = true;
+						}
+					})
+
+					// if(handleQty==recommendQty){
+					// 	this.disabledConfirm =false;
+					// }else {
+					// 	this.disabledConfirm =true;
+					// }
+					//实际数量大于等于才可以提交，按钮可以点击
+
+
+				}
+			},
+
+
+			cancel() {
+				let that = this;
+				showConfirmMsg('是否要清空已扫描的物料和目标库位信息?', confirm => {
+					if (confirm) {
+						that.clearInfo();
+					}
+				})
+			},
+
+			clearInfo() {
+				this.dataContent.itemCodeList.forEach(res => {
+					if (res.recommendList != null) {
+						res.recommendList.forEach(res1 => {
+							if (res1.locationCodeList != null) {
+								res1.locationCodeList.forEach(res2 => {
+									if (res2.packingCodeList != null) {
+										res2.packingCodeList.forEach(res3 => {
+											res3.itemCode = "";
+											res3.qty = 0;
+										})
+									}
+								})
+							}
+
+						})
+					}
+
+				})
+			},
+
+			qtyChanged(value, item, label) {
+				if (value <= 0) {
+					// label.qty = 1;
+					// this.showMessage('发料数量不能小于或等于0')
+					// this.$forceUpdate();
+				}
+				this.calcScanCount(item);
+			},
+			openAddScanDetailPopup() {
+				this.isFromEdit = false;
+				this.locationDisabled = true;
+				this.openIssuePopup();
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			showCommitSuccess() {
+				this.$refs.comMessage.showCommitSuccess();
+			},
+
+			showRescanMessage(message) {
+				this.$refs.comMessage.showRescanMessage(message);
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			confirm(data) {
+				this.dataContent = data;
+			},
+			issueDetailEdit(data) {
+				this.isFromEdit = true;
+				// this.dataContent = data;
+				this.$forceUpdate();
+			},
+			confirmResult(result) {
+				this.dataContent = result;
+				this.$forceUpdate();
+			},
+			closeScanPopup() {
+				this.updateCommitBtn();
+			},
+			openScanDetailPopup() {
+				var datacontent = {}
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				// Object.assign(datacontent, this.detailSource);
+				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
+			},
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	.uni-numbox__value {
+		width: 40px;
+	}
+
+	button[disabled] {
+		background-color: #3C9CFF;
+		color: #fff;
+		opacity: 0.7;
+	}
+
+
+	// /deep/ .input-value {
+	// 	font-size: 16px;
+	// }
+
+	// /deep/ .uni-collapse-item__title-text {
+	// 	font-size: 16px;
+	// }
+
+	// /deep/ .uni-collapse-item--border {
+	// 	border-bottom-width: 0px;
+	// 	border-bottom-color: #ebeef5;
+	// }
+
+	// /deep/ .uni-collapse-item--border {
+	// 	border-bottom-width: 1px;
+	// 	border-bottom-color: #ebeef5;
+	// }
+</style>
diff --git a/pages/issue-按批次推荐/job/issueJob.vue b/pages/issue-按批次推荐/job/issueJob.vue
new file mode 100644
index 0000000..4993edb
--- /dev/null
+++ b/pages/issue-按批次推荐/job/issueJob.vue
@@ -0,0 +1,356 @@
+<template>
+	<view class="">
+		<jobFilter ref="filter" buttontType="issue" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @scanAsN="scanAsN" @scanAppro="scanAppro" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</jobFilter>
+		<com-empty-view v-if="issueList.length==0"></com-empty-view>
+
+		<uni-swipe-action ref="swipeAction">
+			<view v-for="(item, index) in issueList" :key="index">
+				<uni-swipe-action-item
+					:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+					@click="swipeClick($event,item)">
+					<com-issue-job-card :dataContent="item" @click='openJobDetail(item)'></com-issue-job-card>
+				</uni-swipe-action-item>
+			</view>
+		</uni-swipe-action>
+
+		<uni-load-more :status="loadingType" v-if="issueList.length>0" />
+		<winScanAsnNumber ref="scanAsnNumber" title="ASN" @getScanCode='getByAsnNumber'></winScanAsnNumber>
+		<winScanJobNumber ref="scanNumber" title="任务编号" @getScanCode='getByNumber'></winScanJobNumber>
+		<comMessage ref="comMessage"></comMessage>
+		<job-info-popup ref='jobInfoPopup'></job-info-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		getIssueJobList,
+		cancelTakeIssueJob,
+		getIssueByCode
+	} from '@/api/request.js';
+
+	import {
+		goHome,
+		getCurrDate
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import comIssueJobCard from '@/pages/issue/coms/comIssueJobCard.vue'
+	import winScanJobNumber from "@/mycomponents/scan/winScanJobNumber.vue"
+	import winScanAsnNumber from "@/mycomponents/scan/winScanAsnNumber.vue"
+	import jobCard from '@/mycomponents/job/jobCard.vue';
+	import jobInfoPopup from '@/mycomponents/job/jobInfoPopup.vue'
+
+	export default {
+		name: 'issue',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comIssueJobCard,
+			winScanJobNumber,
+			winScanAsnNumber,
+			jobCard,
+			jobInfoPopup
+		},
+		data() {
+			return {
+				issueList: [],
+				contentText: {
+					contentdown: '上拉加载更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				pageSize: this.$pageSize,
+				pageIndex: 1,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				status: "",
+				creationTimeStart: "",
+				creationTimeEnd: "",
+				detailOptions: [],
+				detailGiveupOptions: []
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			updateTitle() {
+				var title = ""
+				if (this.totalCount > 0) {
+					title = "发料任务(" + this.totalCount + ")";
+				} else {
+					title = "发料任务"
+				}
+				uni.setNavigationBarTitle({
+					title: title
+				})
+			},
+
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageIndex = 1;
+					this.issueList = [];
+				}
+
+				var params = {
+					status: this.status,
+					CreationTimeStart: this.CreationTimeStart,
+					CreationTimeEnd: this.CreationTimeEnd,
+					page: that.pageIndex,
+					size: that.pageSize,
+				}
+
+				getIssueJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					that.issueList = type === "refresh" ? list : this.issueList.concat(list);
+					that.pageIndex++;
+					this.updateTitle();
+
+				}).catch(error => {
+					this.loadingType = "";
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					that.showMessage(error)
+				})
+			},
+
+			getByAsnNumber(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getPurchasereceiptByAsnNumber(code).then(res => {
+					uni.hideLoading();
+					if (res.data.total == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.total == 1) {
+						this.$refs.scanAsnNumber.closeScanPopup();
+						that.openJobDetail(res.data.list[0]);
+					} else {
+						this.$refs.scanAsnNumber.closeScanPopup();
+						that.showItemList(res.data.list);
+					}
+
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			getByNumber(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getJobNewCountByNumber(code).then(res => {
+					uni.hideLoading();
+					if (res.data.total == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.total == 1) {
+						this.$refs.scanNumber.closeScanPopup();
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './issueDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.scanList.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								var id = dataContent.id
+								this.cancleJob(id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				let dataList = [{
+						title: "申请单号",
+						content: item.requestNumber
+					},
+					{
+						title: "车间代码",
+						content: item.workshopCode
+					},
+					{
+						title: "允许修改库位",
+						content: item.allowModifyLocation == 1 ? "是" : "否"
+					},
+					{
+						title: "允许修改数量",
+						content: item.allowModifyQty == 1 ? "是" : "否"
+					},
+					{
+						title: "允许大于推荐数量",
+						content: item.allowBiggerQty == 1 ? "是" : "否"
+					},
+					{
+						title: "允许小于推荐数量",
+						content: item.allowSmallerQty == 1 ? "是" : "否"
+					},
+					{
+						title: "允许修改库存状态",
+						content: item.allowModifyInventoryStatus == 1 ? "是" : "否"
+					},
+					{
+						title: "允许连续扫描",
+						content: item.allowContinuousScanning == 1 ? "是" : "否"
+					},
+					{
+						title: "允许部分完成",
+						content: item.allowPartialComplete == 1 ? "是" : "否"
+					},
+					{
+						title: "允许修改批次",
+						content: item.allowModifyBach == 1 ? "是" : "否"
+					}
+				]
+				this.$refs.jobInfoPopup.openPopup(item, dataList)
+			},
+
+			cancleJob(id) {
+				cancelTakeIssueJob(id).then(res => {
+					this.getList("refresh")
+				}).catch(res => {
+					this.$refs.comMessage.showErrorMessages(message, res => {
+						if (res) {
+
+						}
+					});
+				})
+			},
+
+			switchChangeToday(state) {
+				this.checkedToday = state;
+				if (this.checkedToday) {
+					this.creationTimeStart = getCurrDate();
+					this.creationTimeEnd = getCurrDate();
+				} else {
+					this.creationTimeStart = "";
+					this.creationTimeEnd = "";
+				}
+				this.getList('refresh');
+
+				uni.showToast({
+					title: "只看今天" + state,
+				})
+			},
+
+			switchChangeWait(state) {
+				this.checkedWaitTask = state;
+				if (this.checkedWaitTask) {
+					this.status = "1";
+				} else {
+					this.status = "";
+				}
+				this.getList('refresh');
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/issue/coms/comIssueDetailCard.vue b/pages/issue/coms/comIssueDetailCard.vue
new file mode 100644
index 0000000..9b3fd70
--- /dev/null
+++ b/pages/issue/coms/comIssueDetailCard.vue
@@ -0,0 +1,188 @@
+<template>
+	<view>
+		<!-- <requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode"
+			:isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation> -->
+
+		<view v-for="(item,index) in dataContent.Items">
+			<uni-collapse ref="collapse">
+				<uni-collapse-item :open="true">
+					<template v-slot:title>
+						<!-- 物品 -->
+						<uni-swipe-action ref="swipeAction">
+							<uni-swipe-action-item @click="itemCoceClick($event,item,index)"
+								:right-options="removeOptions">
+								<item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
+							</uni-swipe-action-item>
+						</uni-swipe-action>
+						<!-- 			<com-issue-request-info :workShopCode="dataContent.workShopCode" :dataContent="dataContent">
+						</com-issue-request-info> -->
+					</template>
+					<u-line />
+					<view v-for="(loacation,index) in item.Locations">
+						<view>
+							<view class="uni-flex uni-row space-between">
+								<!-- 推荐库位 -->
+								<location :locationCode="loacation.fromLocationCode">
+								</location>
+							</view>
+							<view v-for="(batch,index) in loacation.Batchs">
+								<recommend-balance style='margin-left: 0rpx;' :detail="batch" :isShowLocation="false"
+									:isShowPack="batch.packingNumber!=null && batch.packingNumber!=''">
+								</recommend-balance>
+								<view class="uni-flex uni-row " v-if='batch.Records.length>0'>
+									<view class="center " style=" width: 20px;background-color: #0CC2B6; color: #fff; margin-left: 40px;padding: 0px 2px;">
+										扫描
+									</view>
+									<view class="uni-flex uni-column scan_view" style="width: 100%;">
+										<view v-for="(record,index) in batch.Records">
+											<uni-swipe-action ref="swipeAction">
+												<uni-swipe-action-item @click="swipeClick($event,batch,record,index)"
+													:right-options="scanOptions">
+													<handle-balance :detail="record" :isShowLocation="false"
+														:isShowBatch="batch.packingNumber!=null">
+													</handle-balance>
+												</uni-swipe-action-item>
+											</uni-swipe-action>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</uni-collapse-item>
+			</uni-collapse>
+		</view>
+	</view>
+	<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+	<comMessage ref="message"></comMessage>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
+	import handleBalance from '@/mycomponents/balance/handleBalance.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
+	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+	import {
+		getDetailOption,
+		getEditRemoveOption,
+		getRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		emits: ['updateData',"removeItemCode"],
+		components: {
+			itemQty,
+			recommend,
+			recommendBalance,
+			handleBalance,
+			recommendQtyEdit,
+			requiredLocation,
+			balanceQtyEdit,
+			location,
+			detailInfoPopup,
+			comIssueRequestInfo
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				option: [],
+				showItem: {},
+				editItem: {},
+				batchItem: {},
+				detailOptions: [],
+				scanOptions: [],
+				removeOptions:[]
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getEditRemoveOption();
+			this.removeOptions = getRemoveOption()
+		},
+
+		methods: {
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.collapse.forEach(r => {
+						r.childrens.forEach(i => {
+							i.init();
+						})
+						r.resize();
+					})
+				});
+			},
+
+			swipeClick(e, batch, record, index) {
+				if (e.content.text == "编辑") {
+					this.edit(batch, record)
+				} else if (e.content.text == "移除") {
+					this.remove(batch, record, index)
+				}
+			},
+			
+			itemCoceClick(e,item,index){
+				if (e.content.text == "移除") {
+					this.dataContent.Items.splice(index, 1);
+					this.$emit('removeItemCode')
+				} 
+			},
+
+			edit(batch, item) {
+				let that = this;
+				that.editItem = item;
+				that.batchItem = batch;
+				item.balance.balanceQty = item.balance.qty;
+				that.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(batch, record, index) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							batch.Records.splice(index, 1);
+							this.resizeCollapse();
+							this.$emit('updateData', record)
+						}
+					});
+			},
+			confirm(val) {
+				this.editItem.qty = val;
+				this.$emit('updateData', this.editItem)
+				// let qty = 0;
+				// this.batchItem.Records.forEach(r => {
+				// 	qty += Number(r.qty);
+				// })
+				// this.batchItem.handleQty = qty;
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/issue/coms/comIssueJobCard.vue b/pages/issue/coms/comIssueJobCard.vue
new file mode 100644
index 0000000..9226463
--- /dev/null
+++ b/pages/issue/coms/comIssueJobCard.vue
@@ -0,0 +1,39 @@
+<template>
+ 	<job-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+			<view class="task_text">
+				申请单号  {{dataContent.requestNumber}}
+			</view>
+ 			<view class="task_text">
+ 				车间  {{dataContent.workShopCode}}
+ 			</view>
+ 		</view>
+ 	</job-com-main-card>
+ </template>
+
+ <script>
+ 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			jobComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/issue/coms/comIssueRecommend.vue b/pages/issue/coms/comIssueRecommend.vue
new file mode 100644
index 0000000..c9256fd
--- /dev/null
+++ b/pages/issue/coms/comIssueRecommend.vue
@@ -0,0 +1,120 @@
+<template>
+	<!-- :class="detail.scaned?'scan_view':''" -->
+	<view  style="background-color: #ffffff;">
+		<view>
+			<view>
+				<view class="uni-flex uni-row space-between">
+					<location :locationCode="detail.fromLocationCode">
+					</location>
+				</view>
+				<view v-for="(batch,index) in detail.Batchs">
+					<uni-collapse ref="subCollapse">
+						<uni-collapse-item :open="true">
+							<template v-slot:title>
+								<view class="uni-flex uni-row space-between">
+									<view>
+										<batch :batch="batch.batch" style='margin-left: 20px;'></batch>
+									</view>
+									<view>
+										<recommend-qty v-if="batch.Records==null || batch.Records==undefined "
+											:dataContent="batch" :isShowStatus='false' :isShowStdPack="false">
+										</recommend-qty>
+										<compare-qty v-else :dataContent="batch" :recommendQty="batch.qty"
+											:handleQty="batch.handleQty" :isShowStatus='false' :isShowStdPack="false">
+										</compare-qty>
+									</view>
+								</view>
+							</template>
+							<u-line />
+							<view class="" v-for="(record,index) in batch.Records">
+								<uni-swipe-action ref="swipeAction">
+									<uni-swipe-action-item @click="swipeClick($event,batch)">
+										<!-- :right-options="loacation.scaned?scanOptions:detailOptions" -->
+										<view class="uni-flex uni-row space-between">
+											<view>
+												<pack :packingCode="record.packingNumber" style='margin-left: 40px;'>
+												</pack>
+											</view>
+											<view>
+												<qty :dataContent="record" :isShowStdPack="false"></qty>
+											</view>
+										</view>
+
+										<!-- <com-issue-recommend :detail="loacation"></com-issue-recommend> -->
+									</uni-swipe-action-item>
+								</uni-swipe-action>
+							</view>
+						</uni-collapse-item>
+					</uni-collapse>
+				</view>
+
+
+				<!-- 	<view v-for="(batch,index) in detail.Batchs">
+			 
+
+					<view v-if="batch.Records!=null || batch.Records!=undefined ">
+						<view v-for="(record,index) in batch.Records">
+							<view class="uni-flex uni-row space-between">
+								<view>
+									<pack :packingCode="record.packingNumber" style='margin-left: 40px;'></pack>
+								</view>
+								<view>
+									<qty :dataContent="record" :isShowStdPack="false"></qty>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view> -->
+
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+	import balanceQty from '@/mycomponents/qty/balanceQty.vue'
+	import qty from '@/mycomponents/qty/qty.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			recommendQty,
+			compareQty,
+			balanceQty,
+			qty
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			detail: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+
+		},
+		methods: {
+			resizeCollapse() {
+				let that=this;
+				that.$nextTick(r => {
+					that.$refs.subCollapse[0].resize();
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/issue/coms/comIssueRequestCard.vue b/pages/issue/coms/comIssueRequestCard.vue
new file mode 100644
index 0000000..4bd6825
--- /dev/null
+++ b/pages/issue/coms/comIssueRequestCard.vue
@@ -0,0 +1,36 @@
+<template>
+ 	<request-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				车间代码 {{dataContent.workshopCode}}
+ 			</view>
+ 		</view>
+ 	</request-com-main-card>
+ </template>
+
+ <script>
+ 	import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			requestComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/issue/coms/comIssueRequestCreator.vue b/pages/issue/coms/comIssueRequestCreator.vue
new file mode 100644
index 0000000..07f13bd
--- /dev/null
+++ b/pages/issue/coms/comIssueRequestCreator.vue
@@ -0,0 +1,151 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<view class="uni-flex uni-column">
+		<!-- 	<com-issue-request-info :workShopCode="dataContent.workshopCode" :dataContent="dataContent">
+			</com-issue-request-info> -->
+			<work-station  :fromWarehouseCode="dataContent.fromWarehouseCode"  :workshopCode="dataContent.workshopCode" :productionLineCode="dataContent.productionLineCode"
+				:workStationCode="dataContent.workStationCode" :rawLocationCode="dataContent.toLocationCode"></work-station>
+				
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in dataContent.subList" :key="index">
+					<uni-swipe-action-item @click="swipeClick($event,item,index)" :right-options="options">
+						<item-qty :dataContent="item" :isShowStdPack="false">
+						</item-qty>
+						<u-line />
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+		</view>
+		<request-detail-info-popup ref="jobDetailPopup"></request-detail-info-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+	import requestDetailInfoPopup from '@/pages/issue/coms/requestDetailInfoPopup.vue'
+	import workStation from '@/mycomponents/workStation/workStation.vue'
+	
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getDetailRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		emits: ['openDetail'],
+		components: {
+			itemCompareQty,
+			recommend,
+			balanceQtyEdit,
+			itemQty,
+			comIssueRequestInfo,
+			requestDetailInfoPopup,
+			workStation
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			isSwipe: {
+				type: Boolean,
+				default: true
+			},
+		},
+		watch: {
+		},
+
+		data() {
+			return {
+				option: [],
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				detailOptions: [],
+				scanOptions: [],
+				options:[]
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getDetailRemoveOption();
+				// if (this.dataContent.allowModifyQty == 1) {
+				// 	this.scanOptions = getDetailEditRemoveOption();
+				// } else {
+				// 	this.scanOptions = getDetailRemoveOption();
+				// }
+			}
+			this.options =this.scanOptions
+			// if(!this.isSwipe){
+			// 	this.detailOptions=[]
+			// }
+		},
+
+		methods: {
+			swipeClick(e, item,index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item,index)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.qtyEdit.openEditPopup(item.balance, item.record.qty);
+			},
+
+			detail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+				// this.$emit('openDetail', item);
+				// // this.showItem = item;
+				// // this.$refs.jobDetailPopup.openPopup(item)
+			},
+			remove(item,index) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							this.dataContent.subList.splice(index, 1)
+							this.$forceUpdate()
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.record.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/issue/coms/comIssueRequestDetailCard.vue b/pages/issue/coms/comIssueRequestDetailCard.vue
new file mode 100644
index 0000000..60db0b1
--- /dev/null
+++ b/pages/issue/coms/comIssueRequestDetailCard.vue
@@ -0,0 +1,151 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<view class="uni-flex uni-column">
+		<!-- 	<com-issue-request-info :workShopCode="dataContent.workshopCode" :dataContent="requestItem">
+			</com-issue-request-info> -->
+			
+			
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in dataContent.subList" :key="index">
+					<uni-swipe-action-item @click="swipeClick($event,item)" :right-options="detailOptions">
+							<item-qty :dataContent="item" :isShowStdPack="false">
+							</item-qty>
+							<u-line />
+						
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+		</view>
+		<request-detail-info-popup ref="jobDetailPopup"></request-detail-info-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+	import requestDetailInfoPopup from '@/pages/issue/coms/requestDetailInfoPopup.vue'
+	import workStation from '@/mycomponents/workStation/workStation.vue'
+	
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getDetailRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		emits: ['openDetail'],
+		components: {
+			itemCompareQty,
+			recommend,
+			balanceQtyEdit,
+			itemQty,
+			comIssueRequestInfo,
+			requestDetailInfoPopup,
+			workStation
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+		},
+		watch: {
+			dataContent(newVal) {
+				this.requestItem = newVal.subList[0];
+			},
+		},
+
+		data() {
+			return {
+				option: [],
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				requestItem: {},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getDetailEditRemoveOption();
+				// if (this.dataContent.allowModifyQty == 1) {
+				// 	this.scanOptions = getDetailEditRemoveOption();
+				// } else {
+				// 	this.scanOptions = getDetailRemoveOption();
+				// }
+			}
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.qtyEdit.openEditPopup(item.balance, item.record.qty);
+			},
+
+			detail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+				// this.$emit('openDetail', item);
+				// // this.showItem = item;
+				// // this.$refs.jobDetailPopup.openPopup(item)
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.record = {}
+							item.balance = {}
+							item.inventoryStatus = item.RecommendInventoryStatus
+							// item.record.qty = 0;
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.record.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/issue/coms/comIssueRequestInfo.vue b/pages/issue/coms/comIssueRequestInfo.vue
new file mode 100644
index 0000000..b124595
--- /dev/null
+++ b/pages/issue/coms/comIssueRequestInfo.vue
@@ -0,0 +1,56 @@
+<template>
+	<view class="cen_card" style="padding-top: 10rpx;padding-bottom: 10rpx;">
+		<view class="cell_box uni-flex uni-row">
+			<view class="cell_info">
+				<view class="text_lightblue">车间</view>
+				<view>{{workShopCode}}</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">生产线</view>
+				<view>{{dataContent.productionLineCode}}</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">工位</view>
+				<view>{{ dataContent.workStationCode }}</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">原材料库</view>
+				<view>{{ dataContent.toLocationCode}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			workShopCode: {
+				type: String,
+				default: ''
+			},
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
+
+
+<style>
+</style>
diff --git a/pages/issue/coms/comIssueRequestPopup.vue b/pages/issue/coms/comIssueRequestPopup.vue
new file mode 100644
index 0000000..bbd6dd9
--- /dev/null
+++ b/pages/issue/coms/comIssueRequestPopup.vue
@@ -0,0 +1,406 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup" :maskClick="false">
+			<view class="uni-flex uni-column pop_customer">
+				<view class="" style="padding:10rpx">
+					<view class="uni-flex u-col-center uni-row space-between" style="padding: 10rpx 10rpx 20rpx 10rpx">
+						<view class="" style="font-size: 35rpx;">
+							{{title}}
+						</view>
+						<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
+							@click="closeRequestPopup()"></image>
+					</view>
+					<u-line />
+					<view class="uni-flex uni-column" style="background-color: white; ">
+						<view class="uni-flex uni-column  ">
+							<view class="uni-flex uni-row padding title u-col-center">
+								<text>从仓库代码：</text>
+								<view class="uni-flex u-col-center uni-row" @click="showWarseHouseSelect">
+									<view class="" style="margin-left: 20rpx;width: 100% ">
+										{{fromWarehouseCode}}
+									</view>
+									<u-select v-model="showWareHouse" mode="single-column" :list="wareHouseList"
+										@confirm="confirmWareHouse"></u-select>
+								</view>
+							</view>
+
+							<u-line />
+							<view class="uni-flex uni-row padding title u-col-center">
+								<text>位置：</text>
+								<view class="uni-flex u-col-center uni-row" @click="showSelect">
+									<view class="" style="margin-left: 20rpx;">
+										{{positionInfo}}
+									</view>
+									<u-select v-model="show" mode="mutil-column-auto" :list="positionList"
+										@confirm="confirmSelect"></u-select>
+								</view>
+							</view>
+							<u-line />
+
+							<view class="title padding" style="display: flex;">
+								<text style=" flex-shrink: 0;">物料：</text>
+								<view class="" style="width: 100% ;">
+									{{itemCode}}
+								</view>
+								<view class="">
+									<image src="/static/search.svg" mode=""
+										style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;" @click="itemCodeClick">
+									</image>
+								</view>
+							</view>
+
+							<u-line />
+							<view class="uni-flex uni-row  padding title u-col-center">
+								<text>数量： </text>
+								<view class="uni-flex uni-row uni-center"
+									style="display: flex; align-items: center;margin-left: 20rpx;justify-content: center;">
+
+									<input style="text-align: center;" class="qty_input" v-model="counQty" type="number"
+										@confirm="confirm()" :focus="numberFocus" @input="checkNum"
+										:maxlength="maxlength" />
+
+									<uom :uom="uom"></uom>
+									<view class="" v-if="stdPackInfo!=undefined"
+										style="display: flex;flex-direction: row;margin-left: 10rpx;">
+										(<stdPackQty :dataContent="stdPackInfo"></stdPackQty>)
+									</view>
+								</view>
+							</view>
+							<u-line />
+						</view>
+					</view>
+				</view>
+				<view class="uni-flex uni-row hide_border">
+					<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button>
+					<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button>
+				</view>
+			</view>
+		</uni-popup>
+		<win-scan-item ref="scanPopup" title='物料代码' @getScanResult='getItemScanResult'
+			:itemCodeTypeList="itemCodeTypeList">
+		</win-scan-item>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getBasicLocationByCode,
+		getBasicItemByCode,
+		getProductionlineItem,
+		getWorkShopLineStation,
+		getWarehouseCodeList
+	} from '@/api/request2.js';
+	import {
+		getLocationTypeName,
+		getListLocationTypeDesc,
+		checkDirectoryItemExist
+	} from '@/common/directory.js';
+	import uom from '@/mycomponents/qty/uom.vue'
+	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
+	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
+
+	export default {
+		components: {
+			uom,
+			balanceStatus,
+			winScanItem,
+			stdPackQty,
+		},
+		data() {
+			return {
+				workshopCode: "", //车间
+				workShopName: "",
+				productionLineCode: "", //生产线
+				productionLineName: "",
+				workStationCode: "", //工位
+				workStationName: "",
+				itemCode: '请扫描物料信息',
+				fromWarehouseCode: "请选择仓库代码",
+				itemName: "",
+				qty: 0,
+				rawLocationCode: "",
+				fgLocationCode: "",
+				itemCodeFocus: false,
+				requestInfo: null,
+				itemCodeList: [],
+				counQty: undefined,
+				editPosition: true,
+				numberFocus: false,
+				uom: "",
+				positionInfo: "请选择位置",
+				show: false,
+				isModifiedPosition: true,
+				positionList: [],
+				stdQty: 0, //标包
+				maxlength: 10,
+				stdPackInfo: undefined,
+				wareHouseList: [],
+				showWareHouse: false
+			}
+		},
+		props: {
+			title: {
+				type: String,
+				default: '需求信息'
+			},
+			itemCodeTypeList: {
+				type: Array,
+				default: []
+			},
+		},
+		methods: {
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //包含小数点
+				let reg = /^[0-9]+$/; //正整数
+				if (dot > -1) {
+					this.maxlength = dot + 7; //长度是小数点后两位
+					if (value.length > dot + 7) {
+
+					}
+				}
+				if (reg.test(value)) { //如果是正整数不包含小数点
+					this.maxlength = 10;
+				}
+				this.change(value)
+			},
+			openRequestPopup(editPosition) {
+				if (this.positionList.length == 0) {
+					getWorkShopLineStation().then(res => {
+						if (res.data != null && res.data.length > 0) {
+							this.positionList = res.data
+						} else {
+							this.showErrorMessage('未查找到位置信息');
+						}
+
+					}).catch(error => {
+						this.showErrorMessage(error);
+					})
+				}
+
+
+				this.editPosition = editPosition;
+				if (this.isModifiedPosition) {
+					this.isModifiedPosition = false
+				} else {
+					this.itemCode = "请扫描物料信息";
+					this.show = false
+					this.showWareHouse = false
+					this.uom = ""
+					this.qty = 0;
+					this.stdPackInfo = undefined;
+					this.counQty = undefined;
+					this.numberFocus = false
+					this.itemCodeGetFocus();
+				}
+
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			initData() {
+				this.positionList = [];
+				this.wareHouseList= [],
+				this.showWareHouse = false
+				this.editPosition =true;
+				this.itemCode = "请扫描物料信息";
+				this.rawLocationCode = ""
+				this.positionInfo = "请选择位置"
+				this.fromWarehouseCode = "请选择仓库代码"
+				this.workshopCode = "" //车间
+				this.workShopName = ""
+				this.productionLineCode = "" //生产线
+				this.productionLineName = ""
+				this.workStationCode = "" //工位
+				this.workStationName = ""
+				this.show = false
+				this.uom = ""
+				this.qty = 0;
+				this.stdPackInfo = undefined;
+				this.counQty = undefined;
+				this.numberFocus = false
+			},
+
+			closeRequestPopup() {
+				this.$refs.popup.close()
+			},
+			locationConfirm() {
+				//查询库位信息
+				this.checkLocatioCode();
+			},
+			itemCodeClick() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			itemCodeGetFocus() {
+				this.itemCodeFocus = true;
+			},
+			itemCodeLoseFocus() {
+				this.itemCodeFocus = false;
+			},
+
+			confirm() {
+				if (this.positionInfo == "请选择位置") {
+					this.showErrorMessage("请选择位置")
+					return
+				}
+
+				if (this.fromWarehouseCode == "请选择仓库代码") {
+					this.showErrorMessage("请选择仓库代码")
+					return
+				}
+
+
+				if (this.itemCode == "请扫描物料信息") {
+					this.showErrorMessage("请输入物料", "itemCode")
+					return
+				}
+				if (this.counQty == undefined) {
+					this.showErrorMessage("请输入数量")
+					return
+				}
+
+				if (this.qty == 0) {
+					this.showErrorMessage("数量必须大于0")
+					return
+				}
+
+				if (this.rawLocationCode == '') {
+					this.showErrorMessage(this.workStationName + "的原材料库位为空")
+					return
+				}
+				this.callback('add');
+			},
+
+			callback(action) {
+				let item = {
+					positionInfo: this.positionInfo,
+					workshopCode: this.workshopCode, //车间
+					workShopName: this.workShopName,
+					productionLineCode: this.productionLineCode, //生产线
+					productionLineName: this.productionLineName,
+					workStationCode: this.workStationCode, //工位
+					workStationName: this.workStationName,
+					rawLocationCode: this.rawLocationCode,
+					fgLocationCode: this.fgLocationCode,
+					fromWarehouseCode: this.fromWarehouseCode,
+					toWarehouseCode: this.fromWarehouseCode,
+					itemCode: this.itemCode,
+					itemName: this.itemName,
+					uom: this.uom,
+					qty: this.qty
+				};
+				this.closeRequestPopup();
+				this.$emit("confirm", action, item);
+			},
+
+			showErrorMessage(message, type) {
+				setTimeout(r => {
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (type == "itemCode") {
+							this.itemCodeGetFocus();
+						} else {
+							this.numberFocus = true;
+						}
+					})
+					if (type == "itemCode") {
+						this.itemCode = "请扫描物料信息"
+					}
+				})
+			},
+			change(value) {
+				this.qty = value;
+			},
+			cancel(e) {
+				this.closeRequestPopup();
+			},
+			showSelect() {
+				if (this.editPosition) {
+					this.show = true
+				}
+			},
+
+			showWarseHouseSelect() {
+				if (this.editPosition) {
+					this.wareHouseClick();
+				}
+			},
+
+			confirmSelect(e) {
+				this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
+				console.log("位置", this.positionInfo)
+				this.workshopCode = e[0].value
+				this.productionLineCode = e[1].value
+				this.workStationCode = e[2].value
+				this.workShopName = e[0].label
+				this.productionLineName = e[1].label
+				this.workStationName = e[2].label
+
+				let shop = this.positionList.find(shop => shop.value == this.workshopCode);
+				if (shop != undefined && shop.children != undefined) {
+					let prodLine = shop.children.find(line => line.value == this.productionLineCode);
+					if (prodLine != undefined && prodLine.children != undefined) {
+						let station = prodLine.children.find(r => r.value == this.workStationCode);
+						if (station.rawLocationCode == '' && station.rawLocationCode == null) {
+							this.showErrorMessage(this.workStationName + "的原材料库位为空,请重新选择")
+							return;
+						} else {
+							this.rawLocationCode = station.rawLocationCode;
+							this.fgLocationCode = station.fgLocationCode;
+						}
+					} else {
+						this.showErrorMessage("生产线-工位基础信息维护错误")
+					}
+				} else {
+					this.showErrorMessage("车间-生产线基础信息维护错误")
+				}
+			},
+
+			getItemScanResult(code, scanResult) {
+				this.itemCode = code;
+				this.itemName = scanResult.name
+				this.uom = scanResult.uom
+				this.stdPackInfo = scanResult.package;
+				this.numberFocus = true
+			},
+			wareHouseClick() {
+				uni.showLoading({
+					title: "查询中....",
+					mask: true
+				});
+				getWarehouseCodeList(1, 100).then(res => {
+					uni.hideLoading()
+					if (res.data != null && res.data.list.length > 0) {
+						res.data.list.forEach(item => {
+							item.value = item.code;
+							item.label = item.name;
+						})
+						this.wareHouseList = res.data.list
+						this.showWareHouse = true
+					} else {
+						this.showErrorMessage('未查找到仓库代码');
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error);
+				})
+			},
+
+
+			confirmWareHouse(e) {
+				this.fromWarehouseCode = e[0].value;
+			},
+
+
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.title {
+		font-size: 30rpx;
+	}
+</style>
diff --git a/pages/issue/coms/comScanIssueList.vue b/pages/issue/coms/comScanIssueList.vue
new file mode 100644
index 0000000..1b815ca
--- /dev/null
+++ b/pages/issue/coms/comScanIssueList.vue
@@ -0,0 +1,54 @@
+<template>
+		<!-- <page-meta root-font-size="18px"></page-meta> -->
+	<uni-popup ref="popupItems">
+		<scroll-view scroll-y="true" style="background-color: #000;height: 80vh;">
+		<view class="" style=" margin: 10rpx;background-color:#EBEEF0;" v-for="(item, index) in showList" :key="index" @click="openDetail(item)">
+			<jobCard :dataContent="item"
+			:disabled="true"
+			:propertyList="propertyList"
+			></jobCard>
+		</view>
+		</scroll-view>
+		</uni-popup>
+</template>
+
+<script>
+	import jobCard from '@/mycomponents/job/jobCard.vue';
+	export default {
+		emits:["selectedItem"],
+		components: {
+			jobCard
+		},
+		props: {
+			
+		},
+		data (){
+			return {
+				showList: [],
+				propertyList:[]
+			}
+		},
+		methods:{
+			openPopup(items) {
+				this.showList = items;
+				this.showList.forEach(res=>{
+					var temp = {
+						name:"发货单号",
+						value:res.asnNumber
+					}
+					this.propertyList.push(temp)
+				})
+				this.$refs['popupItems'].open("center");
+			},
+			
+			openDetail(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+		
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/issue/coms/comScanIssuePack.vue b/pages/issue/coms/comScanIssuePack.vue
new file mode 100644
index 0000000..0572aa5
--- /dev/null
+++ b/pages/issue/coms/comScanIssuePack.vue
@@ -0,0 +1,531 @@
+<template>
+	<view>
+		<uni-popup ref="popup" :maskClick='false'>
+			<view class="">
+				<view class="popup_box">
+					
+					<view class="pop_title uni-flex space-between">
+						<view class="" style="font-size: 35rpx;">
+							扫描箱码
+						</view>
+					
+						<view class="">
+							<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
+								@click="closeScanPopup()"></image>
+						</view>
+					</view>
+					<!-- 	<view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						padding:20rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center">
+							位置 :
+						</view>
+						<view class="" style="width: 75%;padding: 0rpx">
+							<view class="uni-flex u-col-center uni-row" @click="showSelect">
+								<view class="" style="margin-left: 15rpx;font-size: 30rpx;">
+									{{positionInfo}}
+								</view>
+								<u-select v-model="show" mode="mutil-column-auto" :list="positionList" :defaultValue="defaultValueList"
+									@confirm="confirmSelect"></u-select>
+							</view>
+						</view>
+					</view> -->
+					<!-- <u-line class='line_color'></u-line> -->
+
+					<view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						margin-top: 8rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center" style="width: 25%; ">
+							来源库位
+						</view>
+						<view class="" style="width: 75%; padding: 8rpx;">
+							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请选择库位"
+								@confirm="fromLocationUpdate"></uni-combox>
+						</view>
+					</view>
+
+					<view class="">
+						<view class="">
+							<win-com-scan ref="comscan" placeholder="箱标签" @getResult="onScan" :clearResult="true"
+								headerType="HPQ,HMQ" :isShowHistory="false">
+							</win-com-scan>
+
+							<view style="width: 100%;">
+								<view style="width: 100%;" v-if="issueRecord.length>0">
+									<view class="uni-flex uni-row space-between u-col-center">
+										<view class="" style="padding: 10rpx;">
+											历史记录
+										</view>
+										<view class="" style="padding-right: 10rpx;">
+											<u-icon :name="expendIcon" size="35rpx" @click="expands()"></u-icon>
+										</view>
+									</view>
+									<u-line class='line_color' style='padding-top: 10rpx;padding-bottom: 20rpx;'>
+									</u-line>
+									<scroll-view scroll-y="true" class="scroll-view"
+										v-if="expand&&issueRecord.length>0">
+										<view class="uni-flex u-col" v-for="(record,index) in issueRecord">
+											<view style="width: 100%;">
+												<uni-swipe-action ref="swipeAction">
+													<uni-swipe-action-item @click="swipeClick($event,record,index)"
+														:right-options="scanOptions">
+														<view style="padding: 0px 10px">
+															<balance :dataContent="record" :isShowFromLocation="false"
+																:isShowStdPack="false"></balance>
+														</view>
+													</uni-swipe-action-item>
+												</uni-swipe-action>
+												<u-line class='line_color'></u-line>
+											</view>
+										</view>
+									</scroll-view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+		<comMessage ref="comMessage"></comMessage>
+		<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	</view>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+	import {
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getBalanceByManagementPrecision
+	} from '@/common/balance.js';
+
+	export default {
+		name: 'winScanPack',
+		components: {
+			winComScan,
+			balance,
+			balanceQtyEdit,
+			balanceSelect
+		},
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+		},
+		data() {
+			return {
+				dataContent: {},
+				jobContent: {},
+				expendIcon: 'arrow-down',
+				show: false,
+				scanList: [],
+				toLocation: null,
+				toLocationCode: '',
+				fromLocationList: [],
+				fromLocationCode: '',
+				fromLocation: null,
+				issueRecord: [], //发料历史
+				expand: true,
+				scanOptions: {},
+				editItem: {},
+				positionInfo: "请选择位置",
+				positionList: [],
+				defaultValueList: [],
+				fromInventoryStatuses: "",
+				packageInfo: {},
+				label: {}
+			}
+		},
+		created() {
+
+		},
+		watch: {},
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+		},
+		methods: {
+			openScanPopup(content, jobcontent) {
+				this.issueRecord = [];
+				this.dataContent = content;
+				this.jobContent = jobcontent;
+				this.initData();
+				// this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
+				// 	"-" + this.jobContent.subList[0].workStationCode
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+
+			closeScanPopup() {
+				this.$refs.popup.close();
+				this.$emit("closeScan")
+				//清除数据，恢复默认值
+				// Object.assign(this.$data, this.$options.data());
+			},
+
+			initData() {
+				let that = this;
+				that.fromLocationList = [];
+				if (that.dataContent != null) {
+					that.fromInventoryStatuses = this.jobContent.outInventoryStatuses
+					that.toLocation = that.dataContent[0];
+					that.toLocationCode = that.dataContent[0].toLocationCode;
+					that.fromLocationList = that.getFromLocationList();
+				}
+			},
+
+			showBalanceSelect(items) {
+				this.$refs.balanceSelect.openPopup(items);
+			},
+
+			getFromLocationList() {
+				let list = [];
+				this.dataContent.forEach(location => {
+					location.Items.forEach(item => {
+						item.Locations.forEach(f => {
+							let item = list.find(l => l == f.fromLocationCode);
+							if (item == undefined) {
+								list.push(f.fromLocationCode)
+							}
+						})
+					})
+				});
+
+				this.fromLocationCode = list[0];
+				return list;
+			},
+
+			fromLocationUpdate(fromlocation) {
+				let location = this.fromLocationList.find(r => r == fromlocation)
+				if (location == undefined) {
+					this.fromLocationCode = ''
+					this.showErrorMessage('发料库位【' + fromlocation + '】不存在')
+				}
+			},
+
+
+			onScan(result) {
+				try {
+					let that = this;
+					if (that.fromLocationCode == '') {
+						that.showErrorMessage('请选择来源库位', res => {
+							that.$refs.toLocationCombox.onFocus();
+						});
+						return;
+					}
+
+					that.label = result.label;
+					that.packageInfo = result.package;
+					// let packageInfo = result.package;
+					let itemCode = result.label.itemCode;
+					let packingCode = result.label.packingNumber;
+					let lot = result.label.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+					if (item == undefined) {
+						that.showErrorMessage('未查找到物料【' + itemCode + '】的发料明细',
+							res => {
+								that.getfocus();
+							}
+						)
+						return;
+					} else {
+						//查找库存信息
+						uni.showLoading({
+							title: '加载中',
+							mask: true
+						})
+						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
+							balanceRes => {
+								if (balanceRes.success) {
+									if (balanceRes.data.list.length == 0) {
+										this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
+											res => {
+												this.packGetFocus();
+											})
+									} else if (balanceRes.data.list.length == 1) {
+										let balance = balanceRes.data.list[0];
+										this.afterGetBalance(result.label, balance, that.packageInfo);
+									} else {
+										this.showBalanceSelect(balanceRes.data.list);
+									}
+								} else {
+									this.showErrorMessage(balanceRes.message.message);
+								}
+								uni.hideLoading();
+							});
+					}
+				} catch (e) {
+					this.showErrorMessage(e.stack)
+					uni.hideLoading();
+				}
+			},
+
+			selectBalanceItem(balance) {
+				this.afterGetBalance(this.label, balance, this.packageInfo);
+			},
+
+			afterGetBalance(label, balance, packageInfo) {
+				let that = this;
+				try {
+					let itemCode = label.itemCode;
+					let packingCode = label.packingNumber;
+					let lot = label.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+					let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode);
+					if (fromLocation != undefined) {
+						let batch = fromLocation.Batchs.find(r => r.batch == lot);
+						if (batch != undefined) {
+							if (batch.Records == undefined) {
+								batch.Records = [];
+							}
+
+							let record = batch.Records.find(r => r.packingNumber == packingCode);
+							if (record == undefined) {
+								//如果有推荐箱码
+								if (batch.Recommends.length > 0) {
+									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
+									if (recommend != undefined) {
+										that.addRecord(batch, label, balance, packageInfo)
+									} else {
+										//允许修改箱码
+										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
+											that.addRecord(batch, label, balance, packageInfo);
+										} else {
+											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
+												res => {
+													that.getfocus();
+												}
+											)
+										}
+									}
+								} else {
+									that.addRecord(batch, label, balance, packageInfo)
+								}
+							} else {
+								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
+									res => {
+										that.getfocus();
+									}
+								)
+							}
+						} else {
+							if (this.jobContent.allowModifyBatch == "TRUE") {
+								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
+									'】的发料明细,是否要继续发料?', res => {
+										if (res) {
+											let batch = that.createBatchInfo(label, balance, packageInfo);
+											//新增加的批次赋值details
+											if (fromLocation.Batchs.length > 0) {
+												batch.detail = fromLocation.Batchs[0].detail;
+											}
+											fromLocation.Batchs.unshift(batch);
+										}
+									})
+							} else {
+								that.showErrorMessage('未查找到批次【' + lot + '】的发料明细',
+									res => {
+										that.getfocus();
+									});
+							}
+						}
+					} else {
+						that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发料明细',
+							res => {
+								that.getfocus();
+							}
+						)
+					}
+				} catch (e) {
+					that.showErrorMessage(e.stack,
+						res => {
+							that.getfocus();
+						}
+					)
+				}
+			},
+
+			createBatchInfo(data, balance, packageInfo) {
+				let batch = {
+					batch: data.batch,
+					qty: 0,
+					uom: data.uom,
+					handleQty: Number(data.qty),
+					Records: []
+				}
+				let record = this.creatRecord(data, balance, packageInfo);
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				return batch;
+			},
+
+			creatRecord(label, balance, packageInfo) {
+				balance.stdPackQty = packageInfo.stdPackQty
+				balance.stdPackUnit = packageInfo.stdPackUnit
+				let record = {
+					scaned: true,
+					itemCode: label.itemCode,
+					packingNumber: label.packingNumber,
+					batch: label.batch,
+					qty: Number(balance.qty),
+					// qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty),
+					uom: balance.uom,
+					inventoryStatus: balance.inventoryStatus,
+					balance: balance,
+					toLocationCode: this.toLocationCode,
+					supplierCode: label.supplierCode
+				}
+				return record;
+			},
+
+			calcBatchHandleQty(batch) {
+				let handleQty = 0;
+				batch.Records.forEach(res => {
+					handleQty = calc.add(handleQty,res.qty)
+				})
+				batch.handleQty = handleQty;
+
+			},
+
+			addRecord(batch, label, balance, packageInfo) {
+				let record = this.creatRecord(label, balance, packageInfo);
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				this.calcBatchHandleQty(batch);
+				this.getfocus();
+			},
+
+			getfocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			losefocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+
+			expands() {
+				this.expand = !this.expand;
+				this.expendIcon = this.expand == true ? "arrow-down" : "arrow-up"
+			},
+
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				// item.balance.balanceQty = item.balance.qty;
+				item.balance.balanceQty = item.balance.qty;
+				this.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(record, index) {
+				this.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							record.qty = 0;
+							this.issueRecord.splice(index, 1)
+
+							let item = this.toLocation.Items.find(r => r.itemCode == record.itemCode);
+							if (item != undefined) {
+								item.Locations.forEach(l => {
+									let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b
+										.batch == record.batch);
+									let rIndex = batch.Records.findIndex(r => r.packingNumber == record
+										.packingNumber && r
+										.batch == record.batch);
+									batch.Records.splice(rIndex, 1);
+								})
+							}
+							this.$emit('updateData', item);
+						}
+					});
+			},
+
+			packGetFocus() {
+				this.$refs.comscan.getfocus();
+			},
+			packLoseFocus() {
+				this.$refs.comscan.losefocus();
+			},
+			showMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showMessage(message, callback);
+				})
+			},
+			showErrorMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, callback);
+
+				})
+			},
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, callback);
+				})
+			},
+			confirm(val) {
+				this.editItem.qty = Number(val);
+				this.$emit('updateData', this.editItem)
+			},
+			cancle() {
+				this.closeScanPopup()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	button {
+		border: none;
+	}
+
+	button::after {
+		border: none
+	}
+
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+		padding: 10rpx;
+	}
+</style>
diff --git a/pages/issue/coms/detailInfoPopup.vue b/pages/issue/coms/detailInfoPopup.vue
new file mode 100644
index 0000000..8a7d67b
--- /dev/null
+++ b/pages/issue/coms/detailInfoPopup.vue
@@ -0,0 +1,57 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.PoNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.PoLine}} </text>
+						</view>
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/issue/coms/jobInfoPopup.vue b/pages/issue/coms/jobInfoPopup.vue
new file mode 100644
index 0000000..8971076
--- /dev/null
+++ b/pages/issue/coms/jobInfoPopup.vue
@@ -0,0 +1,55 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">车间代码 : </text>
+							<text class="text_wrap">{{dataContent.WorkshopCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">使用在途库 : </text>
+							<text class="text_wrap">{{dataContent.UseOnTheWayLocation}} </text>
+						</view>
+					</view>
+				</view>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				this.$refs.popup.open('bottom')
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/issue/coms/jobListPopup.vue b/pages/issue/coms/jobListPopup.vue
new file mode 100644
index 0000000..315991f
--- /dev/null
+++ b/pages/issue/coms/jobListPopup.vue
@@ -0,0 +1,46 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-issue-job-card :dataContent="item" @click='selectItem(item)'></com-issue-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	import comIssueJobCard from '@/pages/issue/coms/comIssueJobCard.vue'
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comIssueJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/issue/coms/requestDetailInfoPopup.vue b/pages/issue/coms/requestDetailInfoPopup.vue
new file mode 100644
index 0000000..377a384
--- /dev/null
+++ b/pages/issue/coms/requestDetailInfoPopup.vue
@@ -0,0 +1,85 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<requestDetailCommonInfo :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">生产线代码 : </text>
+							<text class="text_wrap">{{dataContent.productionLineCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">工位代码 : </text>
+							<text class="text_wrap">{{dataContent.workStationCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">库存状态 : </text>
+							<text class="text_wrap">{{dataContent.inventoryStatus}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">包装号 : </text>
+							<text class="text_wrap">{{dataContent.packingNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">器具号 : </text>
+							<text class="text_wrap">{{dataContent.containerNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">批次 : </text>
+							<text class="text_wrap">{{dataContent.batch}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到库位代码 : </text>
+							<text class="text_wrap">{{dataContent.toLocationCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从货主代码 : </text>
+							<text class="text_wrap">{{dataContent.fromOwnerCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到货主代码 : </text>
+							<text class="text_wrap">{{dataContent.toOwnerCode}} </text>
+						</view>
+					</view>
+				</view>
+			</requestDetailCommonInfo>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue'
+	export default {
+		components: {
+			requestDetailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/issue/coms/requestInfoPopup.vue b/pages/issue/coms/requestInfoPopup.vue
new file mode 100644
index 0000000..433374a
--- /dev/null
+++ b/pages/issue/coms/requestInfoPopup.vue
@@ -0,0 +1,77 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<request-common-info :dataContent="dataContent"  @onClose="closePopup">
+				<view class="">
+					<comListItem :dataList="dataList"></comListItem>
+				</view>
+				<u-line></u-line>
+			</request-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestCommonInfo from '@/mycomponents/request/requestCommonInfo.vue'
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+		components: {
+			requestCommonInfo,
+			comListItem
+		},
+		data() {
+			return {
+				dataContent:{},
+				dataList:[]
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				this.dataList=[{
+						title: '从仓库代码',
+						content: this.dataContent.fromWarehouseCode
+					}, {
+						title: '到仓库代码',
+						content: this.dataContent.toWarehouseCode
+					},{
+						title: '车间代码',
+						content: this.dataContent.workshopCode,
+					},{
+						title: '使用在途库',
+						content: this.dataContent.useOnTheWayLocation,
+						type:"boolean"
+					},{
+						title: '从库位类型范围',
+						content: this.dataContent.fromLocationTypes,
+						type:"locationType"
+					},{
+						title: '到库位类型范围',
+						content: this.dataContent.toLocationTypes,
+						type:"locationType"
+					},{
+						title: '从库区代码范围',
+						content: this.dataContent.fromAreaCodes,
+					},{
+						title: '到库区代码范围',
+						content: this.dataContent.toAreaCodes,
+					}];
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
new file mode 100644
index 0000000..12f9c78
--- /dev/null
+++ b/pages/issue/job/issueDetail.vue
@@ -0,0 +1,520 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+		</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view v-for="(toLocation, index) in detailSource">
+					<work-station :workshopCode="jobContent.workShopCode"
+						:productionLineCode="toLocation.productionLineCode"
+						:workStationCode="toLocation.workStationCode" :rawLocationCode="toLocation.toLocationCode">
+					</work-station>
+					<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
+					</com-issue-detail-card>
+				</view>
+			</scroll-view>
+		</view>
+		
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
+		<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
+		</com-scan-issue-pack>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		takeIssueJob,
+		cancleTakeIssueJob,
+		getIssueJobDetail,
+		issueJobSubmit
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle,
+		navigateBack,
+		getRemoveOption,
+		getCurrDateTime,
+		getDirectoryItemArray,
+		getPackingNumberAndBatch,
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource
+	} from '@/pages/issue/js/issue.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+	
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
+	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import workStation from '@/mycomponents/workStation/workStation.vue'
+
+	export default {
+		name: 'issueDetail',
+		components: {
+			jobDetailPopup,
+			winScanButton,
+			comIssueDetailCard,
+			comIssueRequestInfo,
+			comScanIssuePack,
+			jobTop,
+			workStation
+		},
+		data() {
+			return {
+				id: '',
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				jobStatus:""
+			};
+		},
+
+		props: {
+
+		},
+
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from === 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务	
+					cancleTakeIssueJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+			
+				return true;
+			}
+			
+		},
+
+		watch: {
+			locationTypes(newVal) {
+				let value = newVal;
+			},
+		},
+		mounted: function() {
+			// this.resizeCollapse();
+		},
+
+		methods: {
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.comIssueDetailCard.forEach(r => {
+						r.resizeCollapse();
+					})
+					// this.$refs.mainCollapse.forEach(r => {
+					// 	r.childrens.forEach(i => {
+					// 		i.init();
+					// 	})
+					// 	r.resize();
+					// })
+				});
+			},
+
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeIssueJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getIssueJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status
+							that.subList = res.data.subList;
+							that.detailSource = getDataSource(that.detailSource, that.subList)
+
+							setTimeout(r => {
+								that.resizeCollapse();
+							}, 100)
+
+							uni.hideLoading();
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			closeScan() {
+				this.resizeCollapse();
+			},
+
+			// submit() {
+			//3.如果是按批次先进先出发料提交时如果扫描的箱码不是先进的批次，则报错
+			//:请扫描XXX批次，改批次满足先进先出规则。否则可以直接提交
+			// var isOutIn = getApp().globalData.feed_configList.filter(
+			// 	res => {
+			// 		if (res.name == 'feed_isOutIn') {
+			// 			return res;
+			// 		}
+			// 	});
+
+
+			// this.dataContent.itemCodeList.forEach(res => {
+			// 	if (res.handleQty > res.recommendQty) {
+			// 		this.$refs.modal.showConfirmMessageModal('实际数量大于需求数量,是否提交?', confirm => {
+			// 			if (confirm) {
+			// 				//提交
+			// 				uni.showToast({
+			// 					title: "提交"
+			// 				})
+			// 			}
+			// 		})
+			// 	} else {
+			// 		uni.showToast({
+			// 			title: "扫描的数量" + res.handleQty + "]小于推荐数量[" + res.recommendQty + "]"
+			// 		})
+			// 	}
+			// })
+			// },
+
+			submit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				//目前任务只到一个库位
+				var itemCodes = []
+				let locationCode = this.detailSource[0].toLocationCode
+				this.detailSource.forEach(toLocation => {
+					toLocation.Items.forEach(item => {
+						itemCodes.push(item.itemCode)
+					})
+				})
+
+				//使用在途库，不查询管理模式
+				if (this.jobContent.useOnTheWayLocation == 'TRUE') {
+					this.submitJob();
+				} else {
+					//获取管理模式，封装参数
+					getManagementPrecisions(itemCodes, locationCode, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							this.submitJob();
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+					});
+				}
+			},
+
+			submitJob() {
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+
+				issueJobSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成发料记录<br>" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg+"]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			setParams() {
+				var subList = []
+				var createTime = getCurrDateTime();
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						item.Locations.forEach(fromLocation => {
+							fromLocation.Batchs.forEach(batch => {
+								let subItem = batch.detail;
+								if (subItem != undefined) {
+									subItem.recordList = [];
+									if (batch.Records.length > 0) {
+										batch.Records.forEach(r => {
+											let record = {};
+											record.handleQty = r.qty;
+
+											record.fromPackingNumber = r
+												.packingNumber;
+											record.fromBatch = r.batch;
+											record.fromContainerNumber = r
+												.ContainerNumber;
+
+											record.toContainerNumber = r
+												.ContainerNumber;
+											record.toInventoryStatus = r
+												.inventoryStatus;
+											record.toLocationCode = subItem
+												.toLocationCode;
+											record.supplierCode = r.supplierCode;
+
+											let single_price = r.balance
+												.singlePrice == null ? 0 : r
+												.balance
+												.singlePrice;
+
+											record.singlePrice = single_price;
+											record.amount = single_price * r.qty;
+
+											//使用在途库不改变管理模式
+											if (this.jobContent
+												.useOnTheWayLocation ==
+												'TRUE') {
+												record.toPackingNumber = r
+													.packingNumber;
+												record.toBatch = r.batch;
+											} else {
+												var info =
+													getPackingNumberAndBatch(
+														this.managementList, r
+														.itemCode,
+														r.packingNumber, r
+														.batch);
+												record.toPackingNumber = info
+													.packingNumber;
+												record.toBatch = info.batch;
+											}
+											subItem.recordList.push(record);
+										})
+										subList.push(subItem);
+									}
+								}
+							})
+						})
+					})
+				})
+
+				this.jobContent.subList = subList
+				this.jobContent.createTime = createTime;
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			cancel() {
+				let that = this;
+				this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => {
+					if (res) {
+						that.clearInfo();
+					}
+				});
+			},
+
+			clearInfo() {
+				this.dataContent.itemCodeList.forEach(res => {
+					if (res.recommendList != null) {
+						res.recommendList.forEach(res1 => {
+							if (res1.locationCodeList != null) {
+								res1.locationCodeList.forEach(res2 => {
+									if (res2.packingCodeList != null) {
+										res2.packingCodeList.forEach(res3 => {
+											res3.itemCode = "";
+											res3.qty = 0;
+										})
+									}
+								})
+							}
+
+						})
+					}
+
+				})
+			},
+
+			updateData(record) {
+				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
+				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
+				let itemHandleQty = 0;
+				if (item != undefined) {
+					item.Locations.forEach(l => {
+						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
+								.packingNumber == null || b.packingNumber == '') && b.batch ==
+							record.batch);
+						let handleQty = 0;
+						if (batch != undefined) {
+							batch.Records.forEach(res => {
+								handleQty = calc.add(handleQty,res.qty)
+							})
+							batch.handleQty = handleQty;
+							itemHandleQty = calc.add(itemHandleQty,handleQty)
+						}
+					})
+				}
+				this.resizeCollapse();
+				item.handleQty = itemHandleQty;
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			showCommitSuccess() {
+				this.$refs.comMessage.showCommitSuccess();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+
+			showRescanMessage(message) {
+				this.$refs.comMessage.showRescanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			confirm(data) {
+				this.dataContent = data;
+			},
+			confirmResult(result) {
+				this.dataContent = result;
+				this.$forceUpdate();
+			},
+			openScanDetailPopup() {
+				var datacontent = {}
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				// Object.assign(datacontent, this.detailSource);
+				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
+			},
+			closeScanPopup() {
+				this.updateCommitBtn();
+			},
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	.uni-numbox__value {
+		width: 40px;
+	}
+
+	button[disabled] {
+		background-color: #3C9CFF;
+		color: #fff;
+		opacity: 0.7;
+	}
+
+
+	// /deep/ .input-value {
+	// 	font-size: 16px;
+	// }
+
+	// /deep/ .uni-collapse-item__title-text {
+	// 	font-size: 16px;
+	// }
+
+	// /deep/ .uni-collapse-item--border {
+	// 	border-bottom-width: 0px;
+	// 	border-bottom-color: #ebeef5;
+	// }
+
+	// /deep/ .uni-collapse-item--border {
+	// 	border-bottom-width: 1px;
+	// 	border-bottom-color: #ebeef5;
+	// }
+</style>
diff --git a/pages/issue/job/issueJob.vue b/pages/issue/job/issueJob.vue
new file mode 100644
index 0000000..d287387
--- /dev/null
+++ b/pages/issue/job/issueJob.vue
@@ -0,0 +1,313 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		<view v-if="jobList.length>0">
+			<job-filter ref="filter" otherTitle="" @switchChangeToday="switchChangeToday"
+				@switchChangeWait="switchChangeWait" @onScanNumber="getByAsnNumber" :checkedToday="checkedToday"
+				:checkedWaitTask="checkedWaitTask">
+			</job-filter>
+
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-issue-job-card :dataContent="item" @click='openJobDetail(item)'></com-issue-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		cancleTakeIssueJob,
+		getIssueJobList,
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import comIssueJobCard from '@/pages/issue/coms/comIssueJobCard.vue'
+	import jobListPopup from '@/pages/issue/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/issue/coms/jobInfoPopup.vue'
+
+	export default {
+		name: 'issue',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comIssueJobCard,
+			jobListPopup,
+			jobInfoPopup
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getIssueJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("发料任务(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("发料任务");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			getByAsnNumber(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getPurchasereceiptByAsnNumber(code).then(res => {
+					uni.hideLoading();
+					if (res.data.total == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.total == 1) {
+						this.$refs.scanAsnNumber.closeScanPopup();
+						that.openJobDetail(res.data.list[0]);
+					} else {
+						this.$refs.scanAsnNumber.closeScanPopup();
+						that.showItemList(res.data.list);
+					}
+
+				}).catch(error => {
+					uni.hideLoading();
+					that.showErrorMessage(error);
+				})
+			},
+
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './issueDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.scanList.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeIssueJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getIssueJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/issue/job/issueReceiptJob.vue b/pages/issue/job/issueReceiptJob.vue
new file mode 100644
index 0000000..7fc91e6
--- /dev/null
+++ b/pages/issue/job/issueReceiptJob.vue
@@ -0,0 +1,303 @@
+<template>
+	<view class="">
+		<jobFilter ref="filter" buttontType="issue" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @scanAsN="scanAsN" @scanAppro="scanAppro" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</jobFilter>
+		<com-empty-view v-if="issueList.length==0"></com-empty-view>
+
+		<uni-swipe-action ref="swipeAction">
+			<view v-for="(item, index) in issueList" :key="index">
+				<uni-swipe-action-item
+					:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+					@click="swipeClick($event,item)">
+					<com-issue-job-card :dataContent="item" @click='openJobDetail(item)'></com-issue-job-card>
+				</uni-swipe-action-item>
+			</view>
+		</uni-swipe-action>
+
+		<uni-load-more :status="loadingType" v-if="issueList.length>0" />
+		<winScanAsnNumber ref="scanAsnNumber" title="ASN" @getScanCode='getByAsnNumber'></winScanAsnNumber>
+		<winScanJobNumber ref="scanNumber" title="任务编号" @getScanCode='getByNumber'></winScanJobNumber>
+		<comMessage ref="comMessage"></comMessage>
+		<job-info-popup ref='jobInfoPopup'></job-info-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		getIssueJobList,
+		cancelTakeIssueJob,
+		getIssueByCode
+	} from '@/api/request.js';
+
+	import {
+		goHome,
+		updateTitle,
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import comIssueJobCard from '@/pages/issue/coms/comIssueJobCard.vue'
+	import winScanJobNumber from "@/mycomponents/scan/winScanJobNumber.vue"
+	import winScanAsnNumber from "@/mycomponents/scan/winScanAsnNumber.vue"
+	import jobCard from '@/mycomponents/job/jobCard.vue';
+	import jobInfoPopup from '@/mycomponents/job/jobInfoPopup.vue'
+
+	export default {
+		name: 'issue',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comIssueJobCard,
+			winScanJobNumber,
+			winScanAsnNumber,
+			jobCard,
+			jobInfoPopup
+		},
+		data() {
+			return {
+				issueList: [],
+				contentText: {
+					contentdown: '上拉加载更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				pageSize: this.$pageSize,
+				pageIndex: 1,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				status: "",
+				creationTimeStart: "",
+				creationTimeEnd: "",
+				detailOptions: [],
+				detailGiveupOptions: []
+			};
+		},
+
+		onShow() {
+			this.getList();
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			
+			getList() {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				var params = {
+					status: this.status,
+					CreationTimeStart: this.CreationTimeStart,
+					CreationTimeEnd: this.CreationTimeEnd
+				}
+
+				getIssueJobList(params).then(res => {
+					uni.hideLoading();
+
+					var list = res.data
+					this.totalCount = res.data.length
+					this.loadingType = "loadmore";
+					that.issueList = list;
+					updateTitle("发料任务(" + this.totalCount + ")");
+
+				}).catch(error => {
+					updateTitle("发料任务");
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			getByAsnNumber(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getPurchasereceiptByAsnNumber(code).then(res => {
+					uni.hideLoading();
+					if (res.data.total == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.total == 1) {
+						this.$refs.scanAsnNumber.closeScanPopup();
+						that.openJobDetail(res.data.list[0]);
+					} else {
+						this.$refs.scanAsnNumber.closeScanPopup();
+						that.showItemList(res.data.list);
+					}
+
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			getByNumber(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getJobNewCountByNumber(code).then(res => {
+					uni.hideLoading();
+					if (res.data.total == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.total == 1) {
+						this.$refs.scanNumber.closeScanPopup();
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './issueDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.scanList.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								var id = dataContent.id
+								this.cancleJob(id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				let dataList = [{
+						title: "申请单号",
+						content: item.requestNumber
+					},
+					{
+						title: "车间代码",
+						content: item.workshopCode
+					},
+					{
+						title: "允许修改库位",
+						content: item.allowModifyLocation == 1 ? "是" : "否"
+					},
+					{
+						title: "允许修改数量",
+						content: item.allowModifyQty == 1 ? "是" : "否"
+					},
+					{
+						title: "允许大于推荐数量",
+						content: item.allowBiggerQty == 1 ? "是" : "否"
+					},
+					{
+						title: "允许小于推荐数量",
+						content: item.allowSmallerQty == 1 ? "是" : "否"
+					},
+					{
+						title: "允许修改库存状态",
+						content: item.allowModifyInventoryStatus == 1 ? "是" : "否"
+					},
+					{
+						title: "允许连续扫描",
+						content: item.allowContinuousScanning == 1 ? "是" : "否"
+					},
+					{
+						title: "允许部分完成",
+						content: item.allowPartialComplete == 1 ? "是" : "否"
+					},
+					{
+						title: "允许修改批次",
+						content: item.allowModifyBach == 1 ? "是" : "否"
+					}
+				]
+				this.$refs.jobInfoPopup.openPopup(item, dataList)
+			},
+
+			cancleJob(id) {
+				cancelTakeIssueJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(res => {
+					this.showMessage(res)
+				})
+			},
+
+			switchChangeToday(state) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/issue/js/issue.js b/pages/issue/js/issue.js
new file mode 100644
index 0000000..824eb60
--- /dev/null
+++ b/pages/issue/js/issue.js
@@ -0,0 +1,110 @@
+	import {
+		calc
+	} from '@/common/calc.js';
+export function getDataSource(list, subList) {
+	for (var i = 0; i < subList.length; i++) {
+		let detail = subList[i];
+		var location = list.find(r =>
+			r.toLocationCode == detail.toLocationCode)
+		if (location == undefined) {
+			location = {
+				toLocationCode: detail.toLocationCode,
+				productionLineCode: detail.productionLineCode,
+				workStationCode: detail.workStationCode,
+				Items: []
+			}
+			list.push(location);
+		}
+		createDetailInfo(location, detail);
+	}
+	return list;
+}
+
+//树形结构:需求库位 -> 物料Items -> 库位 Locations-> 批次Batchs -> 记录Records
+export function createDetailInfo(location, detail) {
+	var item = location.Items.find(r =>
+		r.itemCode == detail.itemCode)
+	if (item == undefined) {
+		item = createItemInfo(detail);
+		location.Items.push(item)
+	} else {
+		item.qty = calc.add(item.qty,detail.qty)
+		//在物料下查找库位
+		let location = item.Locations.find(r => r.fromLocationCode == detail.fromLocationCode);
+		if (location == undefined) {
+			location = createLocationInfo(detail);
+			item.Locations.push(location);
+		} else {
+			//在库位下查找批次
+			let batch = location.Batchs.find(r => r.batch == detail.batch);
+			if (batch == undefined) {
+				let batch = createBatchInfo(detail);
+				location.Batchs.push(batch);
+			} else {
+				if (detail.packingNumber != "" && detail.packingNumber != null) {
+					batch.Recommends.push(detail);
+				}
+			}
+		}
+	}
+}
+
+export function createItemInfo(detail) {
+	let item = {
+		itemCode: detail.itemCode,
+		itemName: detail.itemName,
+		productionLineCode: detail.productionLineCode,
+		workStationCode: detail.workStationCode,
+		stdPackQty: detail.stdPackQty,
+		stdPackUnit: detail.stdPackUnit,
+		qty: detail.qty,
+		uom: detail.uom,
+		handleQty: 0,
+		Locations: []
+	}
+	let location = createLocationInfo(detail);
+	item.Locations.push(location);
+	return item;
+}
+
+export function createLocationInfo(detail) {
+	let location = {
+		fromLocationCode: detail.fromLocationCode,
+		qty: detail.qty,
+		uom: detail.uom,
+		handleQty: 0,
+		Batchs: []
+	}
+	let batch = createBatchInfo(detail);
+	location.Batchs.push(batch);
+	return location;
+}
+
+export function createBatchInfo(detail) {
+	let batch = {
+		detail: detail,
+		batch: detail.batch,
+		packingNumber: detail.packingNumber,
+		qty: detail.qty,
+		uom: detail.uom,
+		handleQty: 0,
+		Recommends: [],
+		Records: [],
+	}
+
+	//推荐到了箱码和批次
+	if (detail.packingNumber != "" && detail.packingNumber != null) {
+		batch.Recommends.push(detail);
+	}
+	return batch;
+}
+
+export function createRecordInfo(detail) {
+	var record = {}
+	detail.scaned = true;
+	// let record = JSON.parse(JSON.stringify(detail));
+	//克隆对象，深度克隆，防止双向绑定同一个变量
+	Object.assign(record, detail)
+	record.toLocationCode = this.toLocationCode;
+	return record;
+}
diff --git a/pages/issue/record/issueRecord.vue b/pages/issue/record/issueRecord.vue
new file mode 100644
index 0000000..028f214
--- /dev/null
+++ b/pages/issue/record/issueRecord.vue
@@ -0,0 +1,434 @@
+<template>
+	<view class="page-wraper">
+		<view class="" v-if='detailSource.length==0'>
+			<com-blank-view @goScan='goScan(true)'></com-blank-view>
+		</view>
+		<view v-else class="page-wraper">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="">
+					<view v-for="(toLocation, index) in detailSource">
+						<view class="uni-row uni-flex">
+							<!-- 	<com-issue-request-info :workShopCode="workShopCode" :dataContent="toLocation">
+							</com-issue-request-info> -->
+							<work-station :workshopCode="workShopCode"
+								:productionLineCode="toLocation.productionLineCode"
+								:workStationCode="toLocation.workStationCode"
+								:rawLocationCode="toLocation.toLocationCode"></work-station>
+						</view>
+						<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation"
+							@updateData='updateData'
+							@removeItemCode ="removeItemCode"
+							>
+						</com-issue-detail-card>
+					</view>
+				</scroll-view>
+				<button class="btn_add" @click="goScan(false)">+去添加</button>
+			</view>
+			
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+					</view>
+				</view>
+			</view>
+
+		</view>
+		
+	</view>
+	<com-issue-request-popup ref="comIssueRequestPopup" @confirm='requestConfirm' :itemCodeTypeList="itemCodeTypeList"></com-issue-request-popup>
+	<win-scan-button v-if='detailSource.length>0' @goScan='openScanDetailPopup'></win-scan-button>
+	<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
+	</com-scan-issue-pack>
+	<comMessage ref="comMessage"></comMessage>
+	
+	
+</template>
+
+<script>
+	import {
+		issueRecordSubmit,
+		getBalanceByBatchOffShelf
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle,
+		getRemoveOption,
+		getISODateTime,
+		getCurrDateTime,
+		getPackingNumberAndBatch
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource
+	} from '@/pages/issue/js/issue.js';
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import comIssueRequestPopup from '@/pages/issue/coms/comIssueRequestPopup.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import comIssueRequestCreator from '@/pages/issue/coms/comIssueRequestCreator.vue'
+	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+	import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
+	import workStation from '@/mycomponents/workStation/workStation.vue'
+
+	export default {
+		name: '',
+		components: {
+			comBlankView,
+			comIssueRequestPopup,
+			jobDetailPopup,
+			comIssueRequestCreator,
+			comIssueRequestInfo,
+			comIssueDetailCard,
+			winScanButton,
+			comScanIssuePack,
+			workStation
+		},
+		data() {
+			return {
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				workShopCode: "",
+				fromInventoryStatuses: "",
+				toInventoryStatuses: "",
+				requestList: [],
+				dataContent: {},
+				managementList: [],
+				itemCodeTypeList: []
+			}
+		},
+		mounted() {
+
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		onLoad(option) {
+			var typeCode = "Issue"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.itemCodeTypeList = res.itemCodeTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.fromInventoryStatuses = res.fromInventoryStatuses
+					this.toInventoryStatuses = res.toInventoryStatuses
+					this.goScan(true)
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+
+		},
+		methods: {
+			closeScan() {
+				this.resizeCollapse();
+			},
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.comIssueDetailCard.forEach(r => {
+						r.resizeCollapse();
+					})
+				});
+			},
+			goScan(editPosition) {
+				
+				this.$refs.comIssueRequestPopup.openRequestPopup(editPosition);
+			},
+
+			//确定需求信息
+			requestConfirm(action, item) {
+				if (item.itemCode == '' || item.itemCode == null) return;
+
+				let that = this;
+				let request = that.requestList.find(r => r.itemCode == item.itemCode);
+				if (request == undefined) {
+					that.requestList.push(item);
+					this.getRecommendInfo(item);
+
+				} else {
+					this.$refs.comMessage.showQuestionMessage('已经存在物料[' + item.itemCode + ']的需求信息,是否要修改?', res => {
+						if (res) {
+							request.qty = item.qty;
+							that.detailSource.forEach(detail => {
+								let index = detail.Items.findIndex(r => {
+									r.itemCode == item.itemCode
+								})
+								detail.Items.splice(index, 1);
+							})
+							this.getRecommendInfo(item);
+						}
+					});
+				}
+			},
+
+			getRecommendInfo(item) {
+				let that = this;
+				uni.showLoading({
+					title: '加载中...',
+					mask: true
+				})
+				getBalanceByBatchOffShelf(item.itemCode, item.qty).then(res => {
+					if (res.data == null) {
+						that.showMessage('未获取到推荐信息');
+					} else {
+						if (res.data.length > 0) {
+							that.workShopCode = item.workshopCode;
+							res.data.forEach(r => {
+								r.toLocationCode = item.rawLocationCode;
+								r.productionLineCode = item.productionLineCode;
+								r.workStationCode = item.workStationCode;
+								// r.itemCode = item.itemCode;
+								r.itemName = item.itemName
+								r.uom = item.uom;
+								that.subList.push(r);
+							})
+							that.detailSource = getDataSource(that.detailSource, that.subList)
+							//要修改一下数量
+							that.detailSource.forEach(detail => {
+								detail.Items.forEach(i => {
+									let request = that.requestList.find(r => r
+										.itemCode == i
+										.itemCode);
+									i.qty = request.qty;
+								})
+							})
+							that.resizeCollapse();
+						} else {
+							that.showMessage('列表数据为0');
+						}
+						uni.hideLoading();
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					that.showErrorMessage(error)
+				})
+			},
+
+
+			caclcQty() {
+				var totalQty = 0;
+				this.detailSource.subList.forEach(res => {
+					totalQty = calc.add(totalQty, res.qty);
+				})
+				this.detailSource.totalQty = totalQty;
+			},
+
+			openScanDetailPopup() {
+				var datacontent = {}
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				// Object.assign(datacontent, this.detailSource);
+				var dataContent = {
+					allowModifyPackingNumber: "FALSE",
+					outInventoryStatuses: this.fromInventoryStatuses
+				}
+				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, dataContent);
+			},
+
+			closeScanPopup() {
+				this.updateCommitBtn();
+			},
+
+			updateData(record) {
+				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
+				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
+				let itemHandleQty = 0;
+				if (item != undefined) {
+					item.Locations.forEach(l => {
+						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
+								.packingNumber == null || b.packingNumber == '') && b.batch ==
+							record.batch);
+						let handleQty = 0;
+						if (batch != undefined) {
+							batch.Records.forEach(res => {
+								handleQty = calc.add(handleQty, res.qty);
+							})
+							batch.handleQty = handleQty;
+							itemHandleQty = calc.add(itemHandleQty, handleQty)
+						}
+					})
+				}
+				this.resizeCollapse();
+				// item.handleQty=itemHandleQty;
+				// this.closeScan();
+			},
+			removeItemCode(){
+				var isClear =this.detailSource[0].Items.length==0
+				if(isClear){
+					this.clearData();
+					this.$refs.comIssueRequestPopup.initData()
+				}
+			
+			},
+
+			setParams() {
+				var subList = []
+				var createTime = getCurrDateTime();
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						item.Locations.forEach(fromLocation => {
+							fromLocation.Batchs.forEach(batch => {
+								let subItem = batch.detail;
+								subItem.recordList = [];
+								if (batch.Records.length > 0) {
+									batch.Records.forEach(r => {
+										let record = {};
+										record.handleQty = r.qty;
+
+										record.fromPackingNumber = r
+											.packingNumber;
+										record.fromBatch = r.batch;
+										record.fromContainerNumber = r
+											.ContainerNumber;
+
+										record.toContainerNumber = r
+											.ContainerNumber;
+										record.toInventoryStatus = r
+											.inventoryStatus;
+										record.toLocationCode = subItem
+											.toLocationCode;
+										record.fromLocationCode = fromLocation
+											.fromLocationCode
+										record.supplierCode = r.supplierCode;
+										
+										let single_price = r.singlePrice == null ?
+											0 : r.singlePrice;
+
+										record.singlePrice = single_price;
+										record.amount = single_price * r.qty;
+
+
+										//使用在途库不改变管理模式
+										var info = getPackingNumberAndBatch(
+											this.managementList, r
+											.itemCode,
+											r.packingNumber, r
+											.batch);
+										record.toPackingNumber = info
+											.packingNumber;
+										record.toBatch = info.batch;
+										subItem.recordList.push(record);
+									})
+									subList.push(subItem);
+								}
+							})
+						})
+					})
+				})
+
+				this.dataContent.subList = subList
+				this.dataContent.createTime = createTime;
+				this.dataContent.creator = creator;
+				return this.dataContent;
+			},
+			submit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				//目前任务只到一个库位
+				var itemCodes = []
+				let locationCode = this.detailSource[0].toLocationCode
+				this.detailSource.forEach(toLocation => {
+					toLocation.Items.forEach(item => {
+						itemCodes.push(item.itemCode)
+					})
+				})
+
+				//获取管理模式，封装参数
+				getManagementPrecisions(itemCodes, locationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						this.submitJob();
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+
+			},
+
+			submitJob() {
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+				issueRecordSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成发料记录<br>" + res.data)
+					} else {
+						this.showErrorMessage("提交失败:【" + res.msg+"】")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+					this.$refs.comIssueRequestPopup.initData()
+
+				})
+			},
+			clearData() {
+				this.subList= [], //接口返回的任务subList
+				this.detailSource=[], //绑定在页面上的数据源
+				this.detailOptions=[],
+				this.scanOptions= [],
+				this.workShopCode="",
+				this.requestList= [],
+				this.dataContent= {},
+				this.managementList= []
+				
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showQuestionMessage(message) {
+
+			},
+
+			// this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => {
+			// 	if (res) {
+			// 		that.clearInfo();
+			// 	}
+			// });
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/issue/request/issueRequest.vue b/pages/issue/request/issueRequest.vue
new file mode 100644
index 0000000..5f3d8e4
--- /dev/null
+++ b/pages/issue/request/issueRequest.vue
@@ -0,0 +1,396 @@
+<template>
+	<view>
+		<com-empty-view v-if="requestList.length==0"></com-empty-view>
+		<request-filter ref="filter" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
+			:checkedWaitTask="checkedWaitTask">
+		</request-filter>
+		<view v-if="requestList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in requestList" :key="index">
+					<uni-swipe-action-item :right-options="item.options" @click="swipeClick($event,item)">
+						<com-issue-request-card :dataContent="item" @click='openRequestDetail(item)'>
+						</com-issue-request-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+			<uni-load-more :status="loadingType" />
+			<request-info-popup ref='requestInfoPopup'></request-info-popup>
+		</view>
+		<requestButton @goScan='openScanDetailPopup'></requestButton>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import requestFilter from '@/mycomponents/request/requestFilter.vue'
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comIssueRequestCard from '@/pages/issue/coms/comIssueRequestCard.vue'
+	import requestInfoPopup from '@/pages/issue/coms/requestInfoPopup.vue'
+	import requestButton from '@/mycomponents/button/requestButton.vue'
+
+	import {
+		goHome,
+		updateTitle,
+		clearTirmAndWrap
+	} from '@/common/basic.js';
+
+	import {
+		getIssueRequestList,
+		issueRequestClose,
+		issueRequestSubmitApproveRefused,
+		issueRequestSubmitApproveAgree,
+		issueRequestSubmitApprove,
+		issueRequestHandle,
+		issueRequestAddAgain
+	} from '@/api/request2.js';
+	import {
+		getDetailOption,
+		getDetailAndApproveOption,
+		getDetailAndApprovePassAndApproveNoOption,
+		getDetailAndHandleOption,
+		getDetailAndAddAndCloseOption,
+		getAddAgainOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			requestFilter,
+			requiredLocation,
+			comIssueRequestCard,
+			requestInfoPopup,
+			requestButton,
+		},
+		data() {
+			return {
+				requestList: [],
+				pageNo: 1,
+				pageSize: 10,
+				status: "1,2,3,4,5,6",
+				totalCount: 0,
+				checkedWaitTask: false,
+				detailOptions: [],
+				detailAndApproveOptions: [],
+				detailAndApprovePassAndApproveNoOption: [],
+				detailAndHandleOption: [],
+				detailAndAddAndCloseOption: [],
+				addAgainOption:[],
+				showOptions: [],
+				fromType: "requestType",
+				loadingType: "nomore",
+
+			};
+		},
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailAndApproveOptions = getDetailAndApproveOption()
+			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption();
+			this.detailAndHandleOption = getDetailAndHandleOption()
+			this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
+
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+		onShow() {
+			this.getList('refresh');
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			openRequestDetail(item) {
+				uni.navigateTo({
+					url: './issueRequestDetail?id=' + item.id
+				});
+			},
+
+			openRequestInfoPopup(item) {
+				this.$refs.requestInfoPopup.openPopup(item)
+			},
+
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.requestList = [];
+				}
+				var filters = []
+					filters.push({
+						column: "status",
+						action: "in",
+						value: this.status
+					})
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getIssueRequestList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					list.forEach(res => {
+						var options = this.updateOptions(res.status);
+						res.options = options;
+					})
+					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
+
+					this.pageNo++;
+					updateTitle("发料申请(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					this.loadingType = "";
+					that.showMessage(error.errMsg)
+				})
+			},
+
+			updateOptions(status) {
+				if (status == "1") {
+					this.showOptions = this.detailAndApproveOptions;
+				} else if (status == "2") {
+					this.showOptions = this.detailAndApprovePassAndApproveNoOption;
+				} else if (status == "3") {
+					this.showOptions = this.detailAndHandleOption;
+				} else if (status == "4") {
+					this.showOptions = this.detailAndAddAndCloseOption;
+				} else if(status == "5"){
+					this.showOptions = this.addAgainOption;
+				}else {
+					this.showOptions = this.detailOptions;
+				}
+				return this.showOptions
+			},
+
+			openScanDetailPopup() {
+				uni.navigateTo({
+					url: './issueRequestCreate'
+				});
+			},
+
+			swipeClick(e, dataContent) {
+				var text = clearTirmAndWrap(e.content.text)
+				if (text == "详情") {
+					this.openRequestInfoPopup(dataContent);
+				} else if (text == "处理") {
+					this.showQuestionMessage("确定要处理当前申请吗?", res => {
+						this.issueRequestHandle(dataContent.id)
+					})
+				} else if (text == "提交审批") {
+					this.showQuestionMessage("确定要审批当前申请吗?", res => {
+						this.issueRequestSubmitApprove(dataContent.id)
+					})
+				} else if (text.includes("审批通过")) {
+					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
+						this.issueRequestSubmitApproveAgree(dataContent.id)
+					})
+				} else if (text == "审批驳回") {
+					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
+						this.issueRequestSubmitApproveRefused(dataContent.id)
+					})
+				} else if (text == "关闭") {
+					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
+						this.issueRequestClose(dataContent.id)
+					})
+				}else if(text == "重新添加"){
+					this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{
+						this.issueRequestAddAgain(dataContent.id)
+					})
+				}
+			},
+
+			showQuestionMessage(hint, callBack) {
+				this.$refs.comMessage.showQuestionMessage(hint,
+					res => {
+						if (res) {
+							callBack()
+						}
+					});
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getIssueRequestList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openRequestDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			issueRequestSubmitApprove(id) {
+				issueRequestSubmitApprove(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请提交审批成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请提交审批失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+
+			},
+
+			issueRequestClose(id) {
+				issueRequestClose(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请关闭成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请关闭失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			issueRequestSubmitApproveAgree(id) {
+				issueRequestSubmitApproveAgree(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批通过成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批通过失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			issueRequestSubmitApproveRefused(id) {
+				issueRequestSubmitApproveRefused(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批驳回成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批驳回失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			issueRequestHandle(id) {
+				issueRequestHandle(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请处理成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请处理失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+		},
+		issueRequestAddAgain(id) {
+			issueRequestAddAgain(id).then(res => {
+				if (res.data) {
+					uni.showToast({
+						title: "申请重新添加成功"
+					})
+					this.getList("refresh")
+				} else {
+					this.showMessage("申请重新添加失败")
+				}
+		
+			}).catch(error => {
+				this.showMessage(error)
+			})
+		},
+		
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/issue/request/issueRequestCreate.vue b/pages/issue/request/issueRequestCreate.vue
new file mode 100644
index 0000000..328b78b
--- /dev/null
+++ b/pages/issue/request/issueRequestCreate.vue
@@ -0,0 +1,216 @@
+<template>
+	<view class="page-wraper">
+		<view class="" v-if='detailSource.subList.length==0'>
+			<com-blank-view @goScan='goScan(true)'></com-blank-view>
+		</view>
+		<view v-else class="page-wraper">
+			<view class="page-main">
+				<comIssueRequestCreator ref="issueRequest" :dataContent="detailSource" :isSwipe="false">
+				</comIssueRequestCreator>
+				<button class="btn_add" @click="goScan(false)">+去添加</button>
+			</view>
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+					</view>
+				</view>
+			</view>
+
+			<com-scan-issue-pack ref="comScanIssuePack">
+			</com-scan-issue-pack>
+			<comMessage ref="comMessage"></comMessage>
+		</view>
+	</view>
+	<com-issue-request-popup ref="comIssueRequestPopup" @confirm='requestConfirm' :itemCodeTypeList="itemCodeTypeList" ></com-issue-request-popup>
+</template>
+
+<script>
+	import {
+		issueRequestSubmit,
+	} from '@/api/request2.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+	
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+
+	import {
+		goHome,
+		updateTitle,
+		getRemoveOption,
+		navigateBack,
+		getCurrDateOneMonthsTimes
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource
+	} from '@/pages/issue/js/issue.js';
+
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import comIssueRequestPopup from '@/pages/issue/coms/comIssueRequestPopup.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
+	import comIssueRequestCreator from '@/pages/issue/coms/comIssueRequestCreator.vue'
+
+	export default {
+		name: 'issueRequestSubmit',
+		components: {
+			comBlankView,
+			comIssueRequestPopup,
+			jobDetailPopup,
+			comScanIssuePack,
+			comIssueRequestCreator
+		},
+		data() {
+			return {
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: {
+					subList: []
+				}, //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				requestList: [], //需求信息
+				itemCodeTypeList:[],
+				useOnTheWay:"FALSE"
+
+			}
+		},
+		mounted() {
+		},
+		onLoad(option) {
+			var typeCode = "Issue"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.itemCodeTypeList = res.itemCodeTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.useOnTheWay = res.useOnTheWay;
+					this.fromInventoryStatuses = res.fromInventoryStatuses
+					this.toInventoryStatuses = res.toInventoryStatuses
+					this.goScan(true)
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+
+		},
+		methods: {
+			goScan(editPosition) {
+				this.$refs.comIssueRequestPopup.openRequestPopup(editPosition);
+			},
+
+			//确定需求信息
+			requestConfirm(action, item) {
+
+				if (this.detailSource.subList.length == 0) {
+					this.detailSource = {
+						workshopCode: item.workshopCode,
+						workShopName: item.workShopName,
+						productionLineCode: item.productionLineCode,
+						productionLineName: item.productionLineName,
+						workStationCode: item.workStationCode,
+						workStationName: item.workStationName, //工位
+						toLocationCode: item.rawLocationCode,
+						fromWarehouseCode:item.fromWarehouseCode,
+						useOnTheWay:this.useOnTheWay,
+						totalQty: 0,
+						subList: []
+					}
+
+					var subItem = {
+						productionLineCode: item.productionLineCode,
+						workStationCode: item.workStationCode,
+						itemCode: item.itemCode,
+						itemName: item.itemName,
+						toWarehouseCode:item.toWarehouseCode,
+						fromWarehouseCode:item.fromWarehouseCode,
+						qty: item.qty,
+						uom: item.uom
+					}
+					this.detailSource.subList.push(subItem)
+				} else {
+					var result = this.detailSource.subList.filter(res => {
+						if (res.itemCode == item.itemCode) {
+							return res
+						}
+					})
+
+					//没有添加数据
+					if (result.length == 0) {
+						var subItem = {
+							productionLineCode: item.productionLineCode,
+							workStationCode: item.workStationCode,
+							itemCode: item.itemCode,
+							itemName: item.itemName,
+							toWarehouseCode:item.toWarehouseCode,
+							fromWarehouseCode:item.fromWarehouseCode,
+							qty: item.qty,
+							uom: item.uom
+						}
+
+						this.detailSource.subList.push(subItem)
+
+					} else {
+						//有了更新数据
+						result[0].qty = calc.add(result[0].qty,item.qty)
+					}
+				}
+				this.caclcQty();
+
+			},
+
+			caclcQty() {
+				var totalQty = 0;
+				this.detailSource.subList.forEach(res => {
+					totalQty = calc.add(totalQty,res.qty)
+				})
+				this.detailSource.totalQty = totalQty;
+			},
+
+
+			setParams() {
+				this.detailSource.dueTime = getCurrDateOneMonthsTimes();
+				return this.detailSource
+			},
+			submit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+				issueRequestSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成发料申请" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/issue/request/issueRequestDetail.vue b/pages/issue/request/issueRequestDetail.vue
new file mode 100644
index 0000000..2713ae7
--- /dev/null
+++ b/pages/issue/request/issueRequestDetail.vue
@@ -0,0 +1,135 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<request-top :dataContent="requestContent"></request-top>
+			</view>
+			<view class="header_item">
+				<work-station :workshopCode="requestContent.workshopCode"
+					:productionLineCode="titleInfo.productionLineCode" :workStationCode="titleInfo.workStationCode"
+					:rawLocationCode="titleInfo.toLocationCode"></work-station>
+			</view>
+
+		</view>
+		<u-line color="#D8D8D8" />
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list">
+					<view class="">
+						<comIssueRequestDetailCard :dataContent="requestContent">
+						</comIssueRequestDetailCard>
+					</view>
+				</view>
+			</scroll-view>
+			<!-- <div class="btn_bottom" >
+				<view class="" style="display: flex;flex-direction: row;">
+					<view class="">
+						<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+					</view>
+				</view>
+			</div> -->
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getIssueRequestDetail,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource,
+	} from '@/common/detail.js';
+
+	import comIssueRequestDetailCard from "@/pages/issue/coms/comIssueRequestDetailCard.vue"
+	import requestTop from "@/mycomponents/request/requestTop.vue"
+	import workStation from '@/mycomponents/workStation/workStation.vue'
+
+	export default {
+		components: {
+			comIssueRequestDetailCard,
+			requestTop,
+			workStation
+		},
+		data() {
+			return {
+				id: '',
+				requestContent: {}, //任务内容
+				subList: [], //接口返回的任务
+				type: 'query', //来源新增add,  query查询
+				titleInfo: {}
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			this.getDetail();
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getIssueRequestDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.requestContent = res.data;
+
+							that.requestContent.subList = res.data.subList;
+							that.titleInfo = that.requestContent.subList[0]
+							that.subList = res.data.subList;
+							// that.subList.forEach(res => {
+							// 	res.fromLocationCode = res.toLocationCode
+							// })
+							// that.detailSource = getDataSource(that.subList);
+							// updateTitle(this.requestContent.number);
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/login/index.vue b/pages/login/index.vue
new file mode 100644
index 0000000..535579d
--- /dev/null
+++ b/pages/login/index.vue
@@ -0,0 +1,401 @@
+<template>
+	<view class="content">
+		<!-- <image mode="widthFix" class="loginimg" src="../../static/login.png"></image> -->
+		<view class="loginimg-box">
+			<image mode="widthFix" class="loginimg" src="../../static/icons_ui/login_bg.png"></image>
+			<view class="login_title">
+				<text>您好，欢迎使用</text><br>
+				WMS仓库管理系统
+			</view>
+		</view>
+		
+		<view class="bgf login_wrap">
+			<view class="loginbox">
+				<form>
+					<view class="mytab">
+						<!-- <view class="mytabline" :class="tapstyle == 1?'active':''" @click="tapchenge(1)">扫码登录</view> -->
+						<view class="mytabline" :class="tapstyle == 2?'active_in':''" @click="tapchenge(2)">密码登录</view>
+					</view>
+
+					<!-- <view class="mybox" v-if="tapstyle == 1">
+						<view class="conone">
+							<uni-easyinput prefixIcon="scan" class="uni-input" type="password" v-model="smloginmsg"
+								name="nickname" placeholder="扫码登录"></uni-easyinput>
+						</view>
+					</view> -->
+					<view class="mybox" v-if="tapstyle == 2">
+						<view class="conone">
+							<view class="title uni-flex">
+								<image class="icon_normal" src="@/static/icons_ui/icon_tenant.svg"></image>
+								租户
+							</view>
+							<view>
+								<input class="uni-input" placeholder="请输入租户名" v-model="tenantName" disabled="true" />
+							</view>
+						</view>
+						<view class="conone">
+							<view class="title uni-flex">
+								<image class="icon_normal" src="@/static/icons_ui/icon_login_user.svg"></image>
+								用户名
+							</view>
+							<view>
+								<input class="uni-input" style="padding:0px 25rpx" placeholder="请输入用户名" v-model="username" />
+							</view>
+						</view>
+						<view class="conone">
+							<view class="title uni-flex">
+								<image class="icon_normal" src="../../static/icons_ui/icon_login_password.svg"></image>
+								密码
+							</view>
+							<view class="uni-input-wrapper" >
+								<input class="uni-input" style="padding:0px 25rpx" placeholder="请输入密码" :password="showPassword"
+									v-model="password" />
+								<text class="uni-icon" :class="[!showPassword ? 'uni-eye-active' : '']"
+									@click="changePassword">&#xe568;</text>
+							</view>
+							<!-- 	<view class="uni-input-wrapper">
+							  <input class="uni-input"  type="password" name="password"
+							  :password="showPassword"
+							  	placeholder="请输入密码" v-model="password"></input>
+							    <text class="uni-icon" :class="[!showPassword ? 'uni-eye-active' : '']" @click="changePassword">&#xe568;</text>
+							</view> -->
+
+						</view>
+
+					</view>
+					<view style="display: flex;flex-direction: row;">
+						<!-- <view class="uni-input">
+							<input class="" placeholder="请输入验证码"
+							v-model="code"
+								style="background-color: lightgray;padding-top: 40rpx;padding-bottom: 40rpx;margin-right: 20rpx;" />
+						</view> -->
+						<view class="uni-input-wrapper">
+							<input class="" style="height: 80rpx; background-color: #F7F9FF;margin-right: 20rpx;padding: 0px 20rpx;"
+								placeholder="请输入验证码" type="number" v-model="code" />
+						</view>
+						<view class="display: flex; align-items: center; text-center">
+							<view class="" @click="getCode">
+								<image :src="imageSrc" style="width: 260rpx;height: 80rpx;"></image>
+							</view>
+							<view style="font-size: 35rpx;color: #476DF5;" @click="getCode"> 获取验证码?</view>
+						</view>
+
+					</view>
+					<view class="loginbtnbox">
+						<button @click="handelerlogin()" class="loginbtn">登录</button>
+					</view>
+				</form>
+			</view>
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getCaptchaImage
+	} from '@/api/request2.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex'
+import { useCountStore } from '@/store'
+
+	// 获取自定义的store
+	const store = useCountStore()
+	export default {
+		components: {},
+		data() {
+			return {
+				smloginmsg: "",
+				tenantName: "闻荫源码",
+				username: "",
+				password: "",
+				tapstyle: 2,
+				loading: false,
+				showPassword: true,
+				imageSrc: "",
+				code: "",
+				uuid: ""
+			}
+		},
+		// computed: mapState(['forcedLogin', 'hasLogin']),
+		mounted() {
+
+			uni.clearStorageSync()
+			uni.clearStorage(); //清除缓存
+			if (process.env.NODE_ENV === 'development') {
+				this.username = "admin"
+				this.password = "123456";
+			}
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: "#476DF5 !important"
+			})
+			
+			// #ifdef APP-PLUS
+			uni.setNavigationBarColor({
+				frontColor: "#ffffff",
+				backgroundColor: "#476DF5"
+			})
+			// #endif
+			
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				uni.navigateTo({
+					url: "/pages/config/config"
+				})
+			}
+
+		},
+		onLoad() {
+			getCaptchaImage().then(res => {
+				if (res) {
+					var code = res.data.img;
+					let base64 = 'data:image/jpeg;base64,' + code
+					// console.log("图标", base64)
+					this.imageSrc = base64.replace(/[\r\n]/g, "")
+					this.uuid = res.data.uuid
+				}
+			}).catch(error => {
+				this.showErrorMessage(error);
+			})
+		},
+		methods: {
+			// ...mapMutations(['login']),
+			handelerlogin() {
+				if (this.username === '') {
+					uni.showToast({
+						title: '用户名不能为空',
+						icon: 'none',
+						mask: true
+					})
+				} else if (this.password === '') {
+					uni.showToast({
+						title: '密码不能为空',
+						icon: 'none',
+						mask: true
+					})
+				} else if (this.code === '') {
+					uni.showToast({
+						title: '验证码不能为空',
+						icon: 'none',
+						mask: true
+					})
+				} else {
+					// console.log("用户名：", this.username, "密码：", this.password, this.tapstyle, this.smloginmsg)
+					let logininfo = {
+						username: "",
+						password: "",
+						code: "",
+						uuid: "",
+					}
+					if (this.tapstyle == 2) //密码登录
+					{
+						logininfo.username = this.username;
+						logininfo.password = this.password
+						logininfo.code = this.code;
+						logininfo.uuid = this.uuid;
+					} else if (this.tapstyle == 1) {
+						// let arr = Base64.decode(this.smloginmsg).split(':')
+						// logininfo.username = arr[0];
+						// logininfo.password = arr[1]
+					}
+					let params = JSON.stringify(logininfo);
+					console.log('params', params);
+					this.newLogin(logininfo)
+
+				}
+			},
+
+			async newLogin(logininfo) {
+				uni.showLoading({
+					title: "正在登录",
+					mask: true
+				})
+				await store.Login(logininfo)
+				// await this.$store.dispatch('Login', logininfo);
+				// await this.$store.dispatch('GetTenantIdInfo', this.tenantName)
+				uni.hideLoading()
+				uni.setStorageSync('hasLogin', true)
+				uni.navigateTo({
+					url: '/pages/index/index'
+				});
+			},
+
+
+			tapchenge(e) {
+				this.tapstyle = e
+			},
+			onchange(e) {
+				const value = e.detail.value
+			},
+			changePassword: function() {
+				this.showPassword = !this.showPassword;
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			getCode() {
+				getCaptchaImage().then(res => {
+					if (res) {
+						var code = res.data.img;
+						let base64 = 'data:image/jpeg;base64,' + code
+						this.imageSrc = base64.replace(/[\r\n]/g, "")
+						this.uuid = res.data.uuid
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	.content {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		background-color: #FFFFFF;
+	}
+
+	.cs {
+		margin-bottom: 20upx;
+	}
+
+	.mytab {
+		display: flex;
+	}
+
+	.mytabline {
+		flex: 1;
+		text-align: center;
+		padding: 20rpx 0;
+		color: #666;
+		position: relative;
+		font-size: 0.875rem;
+	}
+
+	.active_in {
+		color: #101010;
+		font-weight: bold;
+	}
+
+	.active_in::after {
+		content: "";
+		position: absolute;
+		bottom: 0;
+		left: 50%;
+		transform: translateX(-50%);
+		height: 8rpx;
+		background-color: #007AFF;
+		width: 40rpx;
+		border-radius: 8rpx;
+	}
+
+	.loginbox {
+		box-sizing: border-box;
+		padding: 30rpx;
+
+	}
+
+	.loginimg {
+		width: 100%;
+	}
+
+	.logo {
+		height: 200rpx;
+		width: 200rpx;
+		margin-left: auto;
+		margin-right: auto;
+		margin-bottom: 50rpx;
+	}
+
+	.conone {
+		margin: 30rpx 0;
+		align-items: center;
+	}
+
+	.conone .uni-input-wrapper {
+		position: relative;
+	}
+
+	.conone .uni-input {
+		background-color: #F7F9FF;
+		height: 90rpx;
+		line-height: 90rpx;
+		padding: 0 0 0 20rpx;
+	}
+
+	.conone .title {
+		font-size: .875rem;
+		align-items: center;
+		margin-bottom: 20rpx;
+		letter-spacing: 1rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.conone .title image {
+		margin-right: 6rpx;
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.uni-easyinput .is-input-border {
+		border-color: transparent !important;
+	}
+
+	.loginbtnbox {
+		margin-top: 40rpx;
+	}
+
+	.loginbtn {
+		color: #fff;
+		font-size: 0.875rem;
+		height: 100rpx;
+		line-height: 100rpx;
+		background: #5d66de;
+		border-radius: 8rpx;
+		border: none;
+		outline: none;
+	}
+
+	.conone .uni-icon {
+		float: right;
+		position: absolute;
+		right: 20rpx;
+		color: #ccc;
+		font-size: 1.25rem;
+	}
+
+	.conone .uni-eye-active {
+		color: #5a7cf3;
+	}
+	.loginimg-box{
+		position: relative;
+		width: 100%;
+		.login_title{
+			position: absolute;
+			top: 50%;
+			left: 80rpx;
+			color: white;
+			font-size: 36rpx;
+			font-weight: bold;
+			transform: translateY(-50%);
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/message/details.vue b/pages/message/details.vue
new file mode 100644
index 0000000..915b210
--- /dev/null
+++ b/pages/message/details.vue
@@ -0,0 +1,96 @@
+<template>
+	<view class="contant" style="background-color: #fff;">
+	
+		<view class="title">{{detail.templateNickname}}</view>
+		<view class="article">消息类型 : {{detail.templateCode}}</view>
+		<view class="article">消息内容 : {{detail.templateContent}}</view>
+		<view class="article">读取状态 : {{detail.readStatus==true?"已读":"未读"}}</view>
+		<view class="righttext">创建时间 : {{formatDate(detail.createTime)}}</view>
+	</view>
+
+</template>
+
+<script>
+	import {
+		goHome
+	} from '@/common/basic.js';
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+	export default {
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}else if(e.index === 1){
+				window.location.reload();
+			}
+		},
+		data() {
+			return {
+				detail: {}
+			}
+		},
+		// created() {
+		// 	this.getmessages()
+		// },
+
+		onLoad: function(param) {
+			this.detail = JSON.parse(decodeURIComponent(param.detail));
+		},
+
+		methods: {
+			formatDate(date) {
+				return dateFormat(date)
+			},
+		}
+	}
+</script>
+
+<style>
+	.contant {
+		padding: 20upx;
+	}
+
+	.authorbox {
+		display: flex;
+		justify-content: space-between;
+		color: #808080;
+		align-items: center;
+		border-bottom: 1rpx solid #eeeeee;
+		font-size: 30upx;
+		padding-bottom: 30upx;
+
+	}
+
+	.author {
+		display: flex;
+		justify-content: space-between;
+		color: #808080;
+		align-items: center;
+	}
+
+	.picture {
+		width: 80upx;
+		height: 80upx;
+		border-radius: 50upx;
+		margin-right: 25upx;
+	}
+
+	.title {
+		font-size: 40upx;
+		padding: 30upx 0 20upx 0;
+	}
+
+	.article {
+		font-size: 35upx;
+		color: #555555;
+		padding: 20upx 0 20upx 0;
+	}
+
+	.righttext {
+		text-align: right;
+		font-size: 35upx;
+		color: #555555;
+		padding: 30upx 0 20upx 0;
+	}
+</style>
diff --git a/pages/message/index.vue b/pages/message/index.vue
new file mode 100644
index 0000000..fba36d3
--- /dev/null
+++ b/pages/message/index.vue
@@ -0,0 +1,323 @@
+<template>
+
+	<view class="">
+		<!-- 头部 -->
+		
+		<scroll-view class="top-menu-view" scroll-x="true" :scroll-left="scrollLeft">
+			<block v-for="(menuTab,index) in menuTabs" :key="index">
+				<view class="menu-topic-view" v-bind:id="'tabNum'+index" @click="swichMenu(index)" clickable>
+					<view :class="[currentTab==index ? 'menu-topic-act' : 'menu-topic']">
+						<view class="menu-topic-txt">{{menuTab.name}}
+							<text v-if="menuTab.name == '全部'"
+								:class="[unreadCount>0?'tipred':'' ]">{{Math.abs(unreadCount)>99?'99+':unreadCount==0?'':unreadCount}}</text>
+						</view>
+						<view class="menu-topic-bottom">
+							<view class="menu-topic-bottom-color"></view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</scroll-view>
+		<view class="flex flex-column" style="display: flex;flex-direction: column; width: 100%;margin-bottom: 120rpx;">
+			<view class="">
+				<!-- :badge-text="item.readStatus == false?'dot':''" -->
+				<uni-list class="list msg_list">
+					<uni-list :border="true" v-for="(item, index) in allMessageList " :key="item.id">
+						<uni-list-chat :title="item.templateNickname" avatar="/static/images/message.svg" clickable
+							:note="item.templateContent" :time="formatDate(item.createTime)" badge-positon="left"
+							@click="jumpdetails(item)" :class="item.readStatus == false?'':'hasread'" is="">
+						</uni-list-chat>
+						<u-line color="#909399" />
+					</uni-list>
+				</uni-list>
+			</view>
+			<uni-load-more :status="loadingType" v-if="allMessageList.length>0" />
+		</view>
+		<com-message ref="comMessage"></com-message>
+
+	</view>
+
+</template>
+
+<script>
+	import {
+		getMessageList,
+		getMessageUnreadCount,
+		setMessageUpdateRead
+	} from '@/api/request2.js';
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+
+	export default {
+		name: '',
+		components: {
+
+		},
+
+		data() {
+			return {
+				messageList: [],
+				pageNo: 1,
+				pageSize: 10,
+				allMessageList: [],
+				loadingType: "nomore",
+				unreadCount: 0,
+				indicatorDots: true,
+				autoplay: true,
+				interval: 2000,
+				duration: 500,
+				scrollLeft: 0,
+				isClickChange: false,
+				currentTab: 0,
+				// Tab分类标题
+				menuTabs: [{
+						name: '全部'
+					},
+					// {
+					// 	name: '系统'
+					// }, {
+					// 	name: '通知'
+					// }, {
+					// 	name: '私信'
+					// },
+				],
+			};
+		},
+
+
+		onShow() {
+			this.getMessageList("refresh")
+			this.getMessageUnreadCount();
+		},
+		onPullDownRefresh() {
+			this.getMessageList('refresh');
+			this.getMessageUnreadCount();
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getMessageList("more");
+		},
+		methods: {
+			getMessageList(type) {
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				if (type == "refresh") {
+					this.pageNo = 1
+					this.pageSize = 10
+					this.allMessageList = []
+				}
+
+				getMessageList(this.pageNo, this.pageSize).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					var list = res.data.list;
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.allMessageList = type === "refresh" ? list : this.allMessageList.concat(list);
+					this.pageNo++;
+
+				}).catch(error => {
+					uni.hideLoading();
+					this.showMessage(error);
+				})
+			},
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			formatDate(date) {
+				return dateFormat(date)
+			},
+			getMessageUnreadCount() {
+				getMessageUnreadCount().then(res => {
+					this.unreadCount = res.data
+				})
+			},
+			jumpdetails(detail) {
+				if (!detail.readStatus) {
+					setMessageUpdateRead(detail.id).then((res) => {
+						detail.readStatus = true
+						uni.navigateTo({
+							url: './details?detail=' + encodeURIComponent(JSON.stringify(detail))
+						});
+					})
+				} else {
+					uni.navigateTo({
+						url: './details?detail=' + encodeURIComponent(JSON.stringify(detail))
+					});
+				}
+			},
+
+		}
+
+
+	}
+</script>
+
+<style>
+	.body-view {
+		height: 100%;
+		width: 100%;
+		display: flex;
+		flex: 1;
+		flex-direction: column;
+		overflow: hidden;
+		align-items: flex-start;
+		justify-content: center;
+	}
+
+	.body-view .right-arrow {
+		position: absolute;
+		top: 22upx;
+		right: 0upx;
+		padding-left: 60upx;
+		padding-right: 20upx;
+		line-height: 42upx;
+		background: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 1) 60%);
+	}
+
+	.body-view .right-arrow .iconfont {
+		font-size: 24upx;
+		font-family: iconfont;
+		color: #909399;
+	}
+
+	.top-menu-view {
+		display: flex;
+		white-space: nowrap;
+		width: 100%;
+		background-color: #FFFFFF;
+		height: 86upx;
+		/* border-top: 1px solid #d8dbe6;
+		border-bottom: 1px solid #d8dbe6; */
+	}
+
+	.top-menu-view .menu-topic-view {
+		display: inline-block;
+		white-space: nowrap;
+		height: 86upx;
+		position: relative;
+	}
+
+	.top-menu-view .menu-topic-view .menu-topic {
+		margin-left: 30upx;
+		margin-right: 10upx;
+		position: relative;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-list--border:after {
+		height: 0;
+	}
+
+	.top-menu-view .menu-topic-view .menu-topic:first-child {
+		margin-left: 30upx;
+	}
+
+	.top-menu-view .menu-topic-view:last-child .menu-topic {
+		margin-right: 80upx;
+	}
+
+	.top-menu-view .menu-topic-view .menu-topic .menu-topic-txt {
+		font-size: 30upx;
+		color: #303133;
+	}
+
+	.top-menu-view .menu-topic-view .menu-topic .menu-topic-bottom {
+		position: absolute;
+		bottom: 0;
+		width: 100%;
+	}
+
+	.top-menu-view .menu-topic-view .menu-topic .menu-topic-bottom .menu-topic-bottom-color {
+		width: 40upx;
+		height: 4upx;
+	}
+
+	.top-menu-view .menu-topic-view .menu-topic-act {
+		margin-left: 30upx;
+		margin-right: 10upx;
+		position: relative;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.top-menu-view .menu-topic-view:last-child .menu-topic-act {
+		margin-right: 80upx;
+	}
+
+	.top-menu-view .menu-topic-view .menu-topic-act .menu-topic-txt {
+		font-size: 1rem;
+		color: #3d7eff;
+		font-weight: 600;
+	}
+
+	.top-menu-view .menu-topic-view .menu-topic-act .menu-topic-bottom {
+		position: absolute;
+		bottom: 0;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+	}
+
+	.top-menu-view .menu-topic-view .menu-topic-act .menu-topic-bottom .menu-topic-bottom-color {
+		width: 40upx;
+		height: 6upx;
+		background: #3d7eff;
+	}
+
+	.swiper-box-list {
+		flex: 1;
+		width: 100%;
+		height: auto;
+		height: 900upx;
+		background-color: #FFFFFF;
+	}
+
+	.swiper-topic-list {
+		height: 100%;
+		width: 100%;
+	}
+
+	.list {
+		width: 100%;
+	}
+
+	.tipred {
+		position: absolute;
+		top: 0;
+		right: -40rpx;
+		background-color: red;
+		color: #FFFFFF;
+		/* font-size: .7rem; */
+		display: inline-block;
+		width: 36rpx;
+		height: 36rpx;
+		margin-bottom: 10upx;
+		text-align: center;
+		line-height: 36rpx;
+		border-radius: 50%;
+		overflow: hidden;
+		margin-left: 10upx;
+		font-size: 20upx;
+	}
+</style>
diff --git a/pages/package/coms/comOverRecord.vue b/pages/package/coms/comOverRecord.vue
new file mode 100644
index 0000000..8e780fd
--- /dev/null
+++ b/pages/package/coms/comOverRecord.vue
@@ -0,0 +1,170 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<record-com-detail-card :dataContent="dataContent" @removeItem="removeItem(index,dataContent)" :isShowItemQty='false'>
+		</record-com-detail-card>
+
+		<view class="" v-for="(detail,index) in dataContent.subList">
+			<view v-if="detail.Records!=undefined" style='margin-left: 20px;' v-for="(record,index) in detail.Records">
+				<uni-swipe-action ref="">
+					<uni-swipe-action-item @click="swipeClick($event,detail,record,index)"
+						:right-options="record.scaned?scanOptions:detailOptions">
+						<view class="uni-flex uni-row scan_view margin-top: 5px;">
+							<view
+								style=" width: 20px;display: flex;justify-content: center;align-items: center; color: #32C1E8;">
+								{{index+1}}.
+							</view>
+							<view style="width: 300px;">
+								<!-- <recommend :dataContent="record" :packageContent="record.package" :isShowStatus="false"
+									:isShowLocation="false"></recommend> -->
+								<balance :dataContent="record" :packageContent="record.package" :isShowStatus="false"
+									:isShowFromLocation="false"></balance>
+							</view>
+						</view>
+					</uni-swipe-action-item>
+				</uni-swipe-action>
+			</view>
+		</view>
+		<recommend-qty-edit ref="recommendQtyEdit" :dataContent="editItem" :handleQty='editItem.qty' @confirm="confirm">
+		</recommend-qty-edit>
+		<package-detail-popup ref='packageDetailPopup'></package-detail-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import purchaseLabel from '@/mycomponents/balance/purchaseLabel.vue'
+	import record from '@/mycomponents/record/record.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import packageBalance from '@/mycomponents/package/packageBalance.vue'
+	import packageHandle from '@/mycomponents/package/packageHandle.vue'
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import packageDetailPopup from '@/mycomponents/package/packageDetailPopup.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getClearOption
+	} from '@/common/array.js';
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			purchaseLabel,
+			balance,
+			recommendQtyEdit,
+			record,
+			packageBalance,
+			packageHandle,
+			recordComDetailCard,
+			packageDetailPopup
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			fromInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			toInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			// dataContent: {
+			// 	handler(newName, oldName) {
+			// 		if (this.dataContent.originalList.length > 0) {
+			// 			if (this.$refs.collapse1 != undefined) {
+			// 				this.$nextTick(res => {
+			// 					this.$refs.collapse1.resize()
+			// 				})
+			// 			}
+			// 		}
+			// 	},
+			// 	immediate: true,
+			// 	deep: true
+			// }
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {},
+				detailOptions: [],
+				scanOptions: [],
+				removeOptions: [],
+				dataList: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+			this.removeOptions = getClearOption();
+		},
+
+		methods: {
+			removeItem(e, dataContent) {
+				if (e.content.text == "清空") {
+					this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
+						res => {
+							if (res) {
+								this.$emit('removeItem')
+								// this.$emit('removeItem', this.dataContent)
+							}
+						});
+				}
+			},
+			swipeClick(e, detail, record, index) {
+				if (e.content.text == "详情") {
+					this.detail(record)
+				} else if (e.content.text == "编辑") {
+					this.edit(record)
+				} else if (e.content.text == "移除") {
+					this.remove(detail, index)
+				}
+			},
+
+			edit(item) {
+				this.editItem = item;
+				this.$refs.recommendQtyEdit.openRecordEditPopup(this.editItem.LabelQty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.packageDetailPopup.openPopup(item)
+			},
+			remove(detail, index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							detail.Records.splice(index, 1)
+							this.$emit('removePack')
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/package/coms/comPackageRecord.vue b/pages/package/coms/comPackageRecord.vue
new file mode 100644
index 0000000..fe24a43
--- /dev/null
+++ b/pages/package/coms/comPackageRecord.vue
@@ -0,0 +1,171 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<record-com-detail-card :dataContent="dataContent" @removeItem="removeItem(index,dataContent)"
+			:isShowItemQty='false'>
+		</record-com-detail-card>
+
+		<view class="" v-for="(detail,index) in dataContent.subList">
+			<view v-if="detail.Records!=undefined" style='margin-left: 20px;' v-for="(record,index) in detail.Records">
+				<uni-swipe-action ref="">
+					<uni-swipe-action-item @click="swipeClick($event,detail,record,index)"
+						:right-options="record.scaned?scanOptions:detailOptions">
+						<view class="uni-flex uni-row scan_view margin-top: 5px;">
+							<view
+								style=" width: 20px;display: flex;justify-content: center;align-items: center; color: #32C1E8;">
+								{{index+1}}.
+							</view>
+							<view style="width: 300px;">
+								<!-- <recommend :dataContent="record" :packageContent="record.package" :isShowStatus="false"
+									:isShowLocation="false"></recommend> -->
+								<balance :dataContent="record" :packageContent="record.package" :isShowStatus="false"
+									:isShowFromLocation="false"></balance>
+							</view>
+						</view>
+					</uni-swipe-action-item>
+				</uni-swipe-action>
+			</view>
+		</view>
+		<recommend-qty-edit ref="recommendQtyEdit" :dataContent="editItem" :handleQty='editItem.qty' @confirm="confirm">
+		</recommend-qty-edit>
+		<package-detail-popup ref='packageDetailPopup'></package-detail-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import purchaseLabel from '@/mycomponents/balance/purchaseLabel.vue'
+	import record from '@/mycomponents/record/record.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import packageBalance from '@/mycomponents/package/packageBalance.vue'
+	import packageHandle from '@/mycomponents/package/packageHandle.vue'
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import packageDetailPopup from '@/mycomponents/package/packageDetailPopup.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getClearOption
+	} from '@/common/array.js';
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			purchaseLabel,
+			balance,
+			recommendQtyEdit,
+			record,
+			packageBalance,
+			packageHandle,
+			recordComDetailCard,
+			packageDetailPopup
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			fromInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			toInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			// dataContent: {
+			// 	handler(newName, oldName) {
+			// 		if (this.dataContent.originalList.length > 0) {
+			// 			if (this.$refs.collapse1 != undefined) {
+			// 				this.$nextTick(res => {
+			// 					this.$refs.collapse1.resize()
+			// 				})
+			// 			}
+			// 		}
+			// 	},
+			// 	immediate: true,
+			// 	deep: true
+			// }
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {},
+				detailOptions: [],
+				scanOptions: [],
+				removeOptions: [],
+				dataList: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+			this.removeOptions = getClearOption();
+		},
+
+		methods: {
+			removeItem(e, dataContent) {
+				if (e.content.text == "清空") {
+					this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
+						res => {
+							if (res) {
+								this.$emit('removeItem')
+								// this.$emit('removeItem', this.dataContent)
+							}
+						});
+				}
+			},
+			swipeClick(e, detail, record, index) {
+				if (e.content.text == "详情") {
+					this.detail(detail.package)
+				} else if (e.content.text == "编辑") {
+					this.edit(record)
+				} else if (e.content.text == "移除") {
+					this.remove(detail, index)
+				}
+			},
+
+			edit(item) {
+				this.editItem = item;
+				this.$refs.recommendQtyEdit.openRecordEditPopup(this.editItem.LabelQty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.packageDetailPopup.openPopup(item)
+			},
+			remove(detail, index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							detail.Records.splice(index, 1)
+							this.$emit('removePack')
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/package/record/mergePackageRecord.vue b/pages/package/record/mergePackageRecord.vue
new file mode 100644
index 0000000..938983c
--- /dev/null
+++ b/pages/package/record/mergePackageRecord.vue
@@ -0,0 +1,393 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" 
+								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<packageTarget title="目标箱码" :isShowEdit="true" :packingNumber="toPackingNumber"
+							@getScanResult='getToPackingNumber'></packageTarget>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false">
+		</win-scan-pack-and-location>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		mergePackageRecordSubmit
+	} from '@/api/request2.js';
+	import {
+		goHome
+	} from '@/common/basic.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
+	import packageTarget from '@/mycomponents/package/packageTarget.vue'
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recommendBalance,
+			packageTarget,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				fromLocationCode: "",
+				isShowLocation: false,
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				toPackingNumber: "",
+				toBatch:"",
+				currentItemCode: "",
+				dataContent: {}
+			};
+		},
+		onLoad(option) {
+			var typeCode = "MergePackage"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+
+		methods: {
+			scanPopupPack() {
+				this.$refs.scanPopupPack.openScanPopup();
+			},
+
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					if (this.currentItemCode != "" && this.currentItemCode != balance.itemCode) {
+						this.showErrorMessage("合包当前物料号[" + this.currentItemCode + "与扫描物料号[" + balance.itemCode +
+							"]不一致,请扫描相同物料号")
+						return;
+					}
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					itemp.subList.push(newDetail);
+					this.currentItemCode = balance.itemCode;
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.$forceUpdate();
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+
+			},
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			commit() {
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+
+					var params = this.setParams();
+					console.log("提交" + JSON.stringify(params))
+					mergePackageRecordSubmit(params).then(res => {
+						uni.hideLoading()
+						if (res.data) {
+							this.showCommitSuccessMessage("提交成功<br>生成合包记录<br>" + res.data)
+						} else {
+							this.showErrorMessage("提交失败[" + res.msg + "]")
+						}
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error)
+					})
+				} else {
+					this.showErrorMessage("没有要扫描的数据")
+				}
+
+			},
+
+			setParams() {
+
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.itemCode = detail.itemCode;
+							detail.itemName = detail.package.itemName;
+							detail.itemDesc1 = detail.package.itemDesc1;
+							detail.itemDesc2 = detail.package.itemDesc2;
+
+							detail.fromInventoryStatus = detail.inventoryStatus;
+							detail.toInventoryStatus = detail.inventoryStatus;
+							detail.fromQty = detail.handleQty
+							detail.fromPackingNumber = detail.packingNumber;
+							detail.toPackingNumber = this.toPackingNumber;
+
+							detail.fromBatch = detail.batch;
+							detail.toBatch = detail.batch;
+
+							detail.fromLocationCode = detail.locationCode;
+							// detail.toLocationCode = detail.toLocationCode;
+
+							subList.push(detail)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				return this.dataContent;
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.detailSource = []
+					this.fromLocationCode = '';
+					this.toPackingNumber =""
+					this.toBatch =""
+					this.currentItemCode =""
+					this.dataContent ={}
+
+				})
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+			getToPackingNumber(result) {
+				if(this.currentItemCode!=result.label.itemCode){
+					this.showErrorMessage("合包当前物料号[" + this.currentItemCode + "与目标物料号[" + result.label.itemCode +
+						"]不一致,请扫描相同物料号")
+						return;
+				}
+				this.toPackingNumber = result.label.packingNumber;
+				this.toBatch =result.label.batch
+
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/package/record/overPackageRecord.vue b/pages/package/record/overPackageRecord.vue
new file mode 100644
index 0000000..475ed2e
--- /dev/null
+++ b/pages/package/record/overPackageRecord.vue
@@ -0,0 +1,366 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" 
+								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false">
+		</win-scan-pack-and-location>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		overPackageRecordSubmit
+	} from '@/api/request2.js';
+	import {
+		goHome
+	} from '@/common/basic.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
+	import packageTarget from '@/mycomponents/package/packageTarget.vue'
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recommendBalance,
+			packageTarget,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				fromLocationCode: "",
+				isShowLocation: false,
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				dataContent: {}
+			};
+		},
+		onLoad(option) {
+			var typeCode = "OverPackage"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+
+		methods: {
+			scanPopupPack() {
+				this.$refs.scanPopupPack.openScanPopup();
+			},
+
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.$forceUpdate();
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+
+			},
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			commit() {
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+
+					var params = this.setParams();
+					console.log("提交" + JSON.stringify(params))
+					overPackageRecordSubmit(params).then(res => {
+						uni.hideLoading()
+						if (res.data) {
+							this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>" + res.data)
+						} else {
+							this.showErrorMessage("提交失败[" + res.msg + "]")
+						}
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error)
+					})
+				} else {
+					this.showErrorMessage("没有要扫描的数据")
+				}
+
+			},
+
+			setParams() {
+
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var subItem = {};
+							Object.assign(subItem, detail)
+							subItem.itemCode = detail.itemCode;
+							subItem.itemName = detail.package.itemName;
+							subItem.itemDesc1 = detail.package.itemDesc1;
+							subItem.itemDesc2 = detail.package.itemDesc2;
+
+							subItem.fromInventoryStatus = detail.inventoryStatus;
+							subItem.fromQty = detail.handleQty
+							subItem.fromPackingNumber = detail.packingNumber;
+							subItem.fromBatch = detail.batch;
+							subItem.fromLocationCode = detail.locationCode;
+							subItem.package =""
+							subList.push(subItem)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				return this.dataContent;
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.detailSource = []
+					this.fromLocationCode = '';
+					this.dataContent ={}
+
+				})
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/package/record/splitPackageRecord.vue b/pages/package/record/splitPackageRecord.vue
new file mode 100644
index 0000000..166691a
--- /dev/null
+++ b/pages/package/record/splitPackageRecord.vue
@@ -0,0 +1,385 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<com-package-record :dataContent="item" @removeItem="removeItem(index,item)"
+								@updateData="updateData" @removePack='updateData'>
+							</com-package-record>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+
+			<win-scan-button @goScan='showScanPopupPack'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false">
+		</win-scan-pack-and-location>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+		<win-scan-pack title="拆分标签" ref="scanPopupPack" @getResult='getScanPackResult'></win-scan-pack>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		goHome,
+	} from '@/common/basic.js';
+	import {
+		splitPackageRecordSubmit
+	} from '@/api/request2.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
+	import comPackageRecord from '@/pages/package/coms/comPackageRecord.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recommendBalance,
+			recordComDetailCard,
+			comPackageRecord
+		},
+		data() {
+			return {
+				id: '',
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				fromLocationCode: "",
+				toLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				dataContent: {},
+				currentItemCode: "",
+				toPackingNumber: ""
+			};
+		},
+		onLoad(option) {
+			var typeCode = "SplitPackage"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {
+			// this.showFromLocationPopup();
+		},
+		methods: {
+			showScanPopupPack() {
+				this.$refs.scanPopupPack.openScanPopup();
+			},
+
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					newDetail.scaned = false;
+					newDetail.Records = [];
+					newDetail.handleQty = 0
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+				}
+				this.$refs.scanPopup.closeScanPopup();
+				this.showScanPopupPack();
+			},
+
+			getScanPackResult(result) {
+				var packingNumber = result.label.packingNumber;
+				var batch = result.label.batch;
+				var qty = result.label.qty;
+				var itemCode = result.label.itemCode;
+				var uom = result.package.uom;
+				var item = this.detailSource.find(r => r.itemCode == itemCode);
+				if (item == undefined) {
+					this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+				} else {
+					var temp = {
+						scaned: true,
+						packingNumber: packingNumber,
+						batch: batch,
+						qty: Number(qty),
+						LabelQty: Number(qty),
+						stdPackUnit: result.package.stdPackUnit,
+						stdPackQty: result.package.stdPackQty,
+						uom: uom
+					}
+
+					var sumQty = 0;
+					item.subList[0].Records.forEach(function(item1, index) {
+						sumQty = calc.add(sumQty,item1.qty)
+					});
+					if (calc.add(qty,sumQty)> item.subList[0].qty) {
+						this.showErrorMessage("扫描数量总和【" + (Number(qty) + sumQty) + "】(当前输入数量【" + qty + "】+已添加数量【" +
+							sumQty +
+							"】)已超过拆包箱码的数量【" + Number(item.subList[0].qty) + "】!");
+						return;
+					}
+					item.subList[0].Records.push(temp);
+					this.$forceUpdate();
+				}
+				this.calcHandleQty();
+			},
+
+			calcHandleQty() {
+				for (let detail of this.detailSource[0].subList) {
+					let hQty = 0;
+					if (detail.Records.length > 0) {
+
+						detail.Records.forEach(r => {
+							hQty = calc.add(hQty,r.qty)
+						})
+					}
+					detail.handleQty = hQty;
+				}
+				this.$forceUpdate();
+			},
+
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+
+
+			updateData() {
+				this.calcHandleQty();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+
+			},
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			commit() {
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+
+					var params = this.setParams();
+					console.log("提交" + JSON.stringify(params))
+					splitPackageRecordSubmit(params).then(res => {
+						uni.hideLoading()
+						if (res.data) {
+							this.showCommitSuccessMessage("提交成功<br>生成拆包记录<br>" + res.data)
+						} else {
+							this.showErrorMessage("提交失败[" + res.msg + "]")
+						}
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error)
+					})
+				} else {
+					this.showErrorMessage("没有要提交的数据")
+				}
+
+			},
+
+			setParams() {
+
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						detail.Records.forEach(record => {
+							if (record.scaned) {
+								var subItem = {};
+								Object.assign(subItem, detail)
+								subItem.itemCode = subItem.itemCode;
+								subItem.itemName = detail.package.itemName;
+								subItem.itemDesc1 = detail.package.itemDesc1;
+								subItem.itemDesc2 = detail.package.itemDesc2;
+
+								subItem.fromInventoryStatus = subItem.inventoryStatus;
+								subItem.toInventoryStatus = subItem.inventoryStatus;
+
+								subItem.fromQty = subItem.qty
+								subItem.toQty = record.qty
+
+								subItem.fromPackingNumber = subItem.packingNumber;
+								subItem.toPackingNumber = record.packingNumber;
+
+								subItem.fromBatch = subItem.batch;
+								subItem.toBatch = record.batch;
+								subItem.fromLocationCode = subItem.fromLocationCode;
+								subItem.package = ""
+								subItem.Records = ""
+								subList.push(subItem)
+							}
+
+						})
+					})
+				})
+
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				return this.dataContent;
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				if (this.fromLocationCode == code) {
+					uni.showToast({
+						title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+						duration: 2000
+					})
+					return
+				}
+				this.toLocationCode = code;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.detailSource = []
+					this.fromLocationCode = '';
+					this.currentItemCode = ""
+					this.dataContent = {}
+
+				})
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/productDismantle/coms/comProductDetailCard.vue b/pages/productDismantle/coms/comProductDetailCard.vue
new file mode 100644
index 0000000..4c56737
--- /dev/null
+++ b/pages/productDismantle/coms/comProductDetailCard.vue
@@ -0,0 +1,121 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend :detail="item" ></recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<balance-qty-edit ref="qtyEdit" :dataContent="editItem" :settingParam="settingParam"
+			:handleQty="editItem.record.qty" @confirm="confirm"></balance-qty-edit>
+		<job-detail-popup ref="receiptHint" :dataContent="showItem"></job-detail-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			recommendQtyEdit,
+			balanceQtyEdit,
+			jobDetailPopup,
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.qtyEdit.openEditPopup(item.balance, item.record.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.record = {}
+							item.balance = {}
+							item.inventoryStatus = item.RecommendInventoryStatus
+							// item.record.qty = 0;
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.record.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productDismantle/coms/comProductJobCard.vue b/pages/productDismantle/coms/comProductJobCard.vue
new file mode 100644
index 0000000..ede69fb
--- /dev/null
+++ b/pages/productDismantle/coms/comProductJobCard.vue
@@ -0,0 +1,50 @@
+<template>
+ 	<job-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				<view class="">
+ 					申请单号 : {{dataContent.requestNumber}}
+ 				</view>
+ 			</view>
+
+ 			<view class="task_text">
+ 				<view class="">
+ 					物料号 : {{dataContent.itemCode}}
+ 				</view>
+ 			</view>
+
+ 			<view class="task_text">
+ 				<view class="">
+ 					目标库位 : {{dataContent.toLocationCode}}
+ 				</view>
+ 			</view>
+ 		</view>
+ 	</job-com-main-card>
+ </template>
+
+ <script>
+ 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			jobComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/productDismantle/coms/comProductRecord.vue b/pages/productDismantle/coms/comProductRecord.vue
new file mode 100644
index 0000000..ed20ed5
--- /dev/null
+++ b/pages/productDismantle/coms/comProductRecord.vue
@@ -0,0 +1,196 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="removeItem($event,dataContent)" :right-options="removeOptions">
+							<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"
+								:isShowBalance="true"></item-qty>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item,index)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<!-- 	<balance :dataContent="item" :isShowStdPack="false" :isShowPack="true"
+								:isShowLocation="true"></balance> -->
+							<purchase-label :dataContent="item" :packageContent="item.package" :isShowStdPack="false">
+							</purchase-label>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<u-line color="#D8D8D8"></u-line>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<balanceQtyEdit ref="balanceQtyEdit" @confirm="confirm"></balanceQtyEdit>
+		<job-detail-popup ref="winHint" :dataContent="showItem"></job-detail-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import purchaseLabel from '@/mycomponents/balance/purchaseLabel.vue'
+	import record from '@/mycomponents/record/record.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getClearOption
+	} from '@/common/array.js';
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			jobDetailPopup,
+			purchaseLabel,
+			balanceQtyEdit,
+			record,
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			fromInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			toInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {},
+				detailOptions: [],
+				scanOptions: [],
+				removeOptions: [],
+				dataList: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+			this.removeOptions = getClearOption();
+		},
+
+		methods: {
+			removeItem(e, dataContent) {
+				if (e.content.text == "清空") {
+					this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
+						res => {
+							if (res) {
+								this.$emit('removeItem')
+								// this.$emit('removeItem', this.dataContent)
+							}
+						});
+				}
+			},
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+
+			edit(item) {
+				this.editItem = item;
+				this.$refs.balanceQtyEdit.openEditPopup(this.editItem, this.editItem.qty);
+			},
+
+			remove(item, index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							this.dataContent.subList.splice(index, 1)
+							this.$emit('updateData')
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.qty = qty;
+				this.$emit('updateData')
+			},
+			detail(item) {
+				this.showItem = item;
+				this.dataList = [{
+						title: "箱码",
+						content: item.packingNumber
+					},
+					{
+						title: "批次",
+						content: item.batch
+					},
+					{
+						title: "库位",
+						content: item.locationCode
+					},
+					{
+						title: "数量",
+						content: item.qty
+					},
+					{
+						title: "单位",
+						content: item.uom
+					}
+				]
+				this.$refs.winHint.openScanPopup()
+			},
+			remove(item, index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							this.dataContent.subList.splice(index, 1)
+							this.$emit('removePack')
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productDismantle/coms/comScanProductList.vue b/pages/productDismantle/coms/comScanProductList.vue
new file mode 100644
index 0000000..1b815ca
--- /dev/null
+++ b/pages/productDismantle/coms/comScanProductList.vue
@@ -0,0 +1,54 @@
+<template>
+		<!-- <page-meta root-font-size="18px"></page-meta> -->
+	<uni-popup ref="popupItems">
+		<scroll-view scroll-y="true" style="background-color: #000;height: 80vh;">
+		<view class="" style=" margin: 10rpx;background-color:#EBEEF0;" v-for="(item, index) in showList" :key="index" @click="openDetail(item)">
+			<jobCard :dataContent="item"
+			:disabled="true"
+			:propertyList="propertyList"
+			></jobCard>
+		</view>
+		</scroll-view>
+		</uni-popup>
+</template>
+
+<script>
+	import jobCard from '@/mycomponents/job/jobCard.vue';
+	export default {
+		emits:["selectedItem"],
+		components: {
+			jobCard
+		},
+		props: {
+			
+		},
+		data (){
+			return {
+				showList: [],
+				propertyList:[]
+			}
+		},
+		methods:{
+			openPopup(items) {
+				this.showList = items;
+				this.showList.forEach(res=>{
+					var temp = {
+						name:"发货单号",
+						value:res.asnNumber
+					}
+					this.propertyList.push(temp)
+				})
+				this.$refs['popupItems'].open("center");
+			},
+			
+			openDetail(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+		
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/productDismantle/coms/detailInfoPopup.vue b/pages/productDismantle/coms/detailInfoPopup.vue
new file mode 100644
index 0000000..4b64c50
--- /dev/null
+++ b/pages/productDismantle/coms/detailInfoPopup.vue
@@ -0,0 +1,57 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<!-- <view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">生产线代码 : </text>
+							<text class="text_wrap">{{dataContent.ProductionLineCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">工位代码 : </text>
+							<text class="text_wrap">{{dataContent.WorkStationCode}} </text>
+						</view>
+					</view> -->
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productDismantle/coms/jobInfoPopup.vue b/pages/productDismantle/coms/jobInfoPopup.vue
new file mode 100644
index 0000000..9188858
--- /dev/null
+++ b/pages/productDismantle/coms/jobInfoPopup.vue
@@ -0,0 +1,53 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">车间代码 : </text>
+							<text class="text_wrap">{{dataContent.workshopCode}} </text>
+						</view>
+					</view>
+				</view>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productDismantle/coms/jobListPopup.vue b/pages/productDismantle/coms/jobListPopup.vue
new file mode 100644
index 0000000..7d0c8b9
--- /dev/null
+++ b/pages/productDismantle/coms/jobListPopup.vue
@@ -0,0 +1,47 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-product-job-card :dataContent="item" @click='selectItem(item)'></com-product-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	import comProductJobCard from '@/pages/productPutaway/coms/comProductJobCard.vue'
+	
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comProductJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productDismantle/coms/requestDetailInfoPopup.vue b/pages/productDismantle/coms/requestDetailInfoPopup.vue
new file mode 100644
index 0000000..13ec899
--- /dev/null
+++ b/pages/productDismantle/coms/requestDetailInfoPopup.vue
@@ -0,0 +1,85 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<requestDetailCommonInfo :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">包装号 : </text>
+							<text class="text_wrap">{{dataContent.packingNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">器具号 : </text>
+							<text class="text_wrap">{{dataContent.containerNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">批次 : </text>
+							<text class="text_wrap">{{dataContent.batch}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从库位代码 : </text>
+							<text class="text_wrap">{{dataContent.fromLocationCode	}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">库存状态 : </text>
+							<text class="text_wrap">{{dataContent.inventoryStatus}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.poNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.poLine}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从货主代码 : </text>
+							<text class="text_wrap">{{dataContent.fromOwnerCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到货主代码 : </text>
+							<text class="text_wrap">{{dataContent.toOwnerCode}} </text>
+						</view>
+					</view>
+				</view>
+			</requestDetailCommonInfo>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue'
+	export default {
+		components: {
+			requestDetailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productDismantle/coms/requestInfoPopup.vue b/pages/productDismantle/coms/requestInfoPopup.vue
new file mode 100644
index 0000000..3a39a00
--- /dev/null
+++ b/pages/productDismantle/coms/requestInfoPopup.vue
@@ -0,0 +1,97 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<request-common-info :dataContent="dataContent"  @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">供应商代码 : </text>
+							<text class="text_wrap">{{dataContent.supplierCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从仓库代码 : </text>
+							<text class="text_wrap">{{dataContent.fromWarehouseCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到仓库代码 : </text>
+							<text class="text_wrap">{{dataContent.toWarehouseCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从库位类型范围 : </text>
+							<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.fromLocationTypes))}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到库位类型范围 : </text>
+							<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.toLocationTypes))}} </text>
+						</view>
+						
+						<view class="item">
+							<text class="item_title">从库区代码范围 : </text>
+							<text class="text_wrap">{{dataContent.fromAreaCodes}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到库区代码范围 : </text>
+							<text class="text_wrap">{{dataContent.toAreaCodes}} </text>
+						</view>
+						
+					</view>
+				</view>
+				<u-line></u-line>
+			</request-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat,
+		
+	} from '@/common/basic.js';
+	
+	import {
+		getDirectoryItemArray,
+		getInventoryStatusDesc,
+		getLocationTypeNameList
+	} from '@/common/directory.js';
+	import requestCommonInfo from '@/mycomponents/request/requestCommonInfo.vue'
+	export default {
+		components: {
+			requestCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				},
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			getDirectoryItemArray(value){
+				return getDirectoryItemArray(value)
+			},
+			
+			getLocationTypeNameList(value){
+				return getLocationTypeNameList(value)
+			}
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productDismantle/job/productDismantleDetail.vue b/pages/productDismantle/job/productDismantleDetail.vue
new file mode 100644
index 0000000..760e1e3
--- /dev/null
+++ b/pages/productDismantle/job/productDismantleDetail.vue
@@ -0,0 +1,550 @@
+<template>
+	<view class="page-wraper">
+	<view class="page-header">
+		<view class="header_job_top">
+			<job-top :dataContent="jobContent"></job-top>
+		</view>
+		<view class="header_item">
+			申请单号 : {{jobContent.requestNumber}}
+		</view>
+		<u-line color="#D8D8D8"></u-line>
+	</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
+							@remove="updateData" @updateData="updateData" @openDetail="openDetail">
+						</com-detail-card>
+					</view>
+					<u-line />
+				</view>
+			</scroll-view>
+		</view>
+
+
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='getToLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import {
+		getProductDismantleJobDetail,
+		getBasicLocationByCode,
+		takeProductDismantleJob,
+		cancleTakeProductDismantleJob,
+		productDismantleJobSubmit
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		getCurrDateTime,
+		navigateBack,
+		getPackingNumberAndBatch,
+	} from '@/common/basic.js';
+	
+	import {
+		getInventoryStatusName
+	} from '@/common/directory.js';
+	
+	import {
+		getLocationTypeArray
+	} from '@/common/array.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty
+	} from '@/common/detail.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import detailInfoPopup from '@/pages/productDismantle/coms/detailInfoPopup.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	
+	export default {
+		components: {
+			winScanButton,
+			winScanPackAndLocation,
+			requiredLocation,
+			comDetailCard,
+			detailInfoPopup,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				received: false,
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				managementList: [],
+				fromLocationCode: "",
+				toLocationCode: "",
+				toLocationInfo: {},
+				tolocationTypeList: [],
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				// if (option.status == "JOB_PENDING") {
+				// 	this.receive((callback => {
+				// 		this.received = true;
+				// 		this.getDetail();
+				// 	}));
+				// } else {
+				// 	this.getDetail();
+
+				// }
+				this.getDetail();
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.received) {
+					//取消承接任务	
+					cancleTakeProductDismantleJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+		},
+
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeProductDismantleJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getProductDismantleJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.subList = res.data.subList;
+							that.fromLocationCode = that.subList[0].fromLocationCode
+							that.toLocationCode = that.subList[0].toLocationCode
+							that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
+							that.detailSource = getDataSource(that.subList)
+							that.getLocationInfo(that.toLocationCode);
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			getLocationInfo(locationCode) {
+				if (locationCode != '') {
+					getBasicLocationByCode(locationCode).then(res => {
+						if (res.data.list.length > 0) {
+							this.toLocationInfo = res.data.list[0]
+						}
+					})
+				}
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource);
+				this.continueScan()
+				this.$forceUpdate();
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			openDetail(item) {
+				this.$refs.detailInfoPopup.openPopup(item)
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.balance.packingNumber;
+					var batch = result.balance.batch;
+					var qty = result.balance.qty;
+					var itemCode = result.balance.itemCode;
+					var locationCode = result.balance.locationCode;
+					var inventoryStatus = result.balance.inventoryStatus;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch &&
+								r.fromLocationCode == locationCode
+						})
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
+								"]不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
+									"]已经扫描")
+							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续拆解?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.label.qty);
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+									
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.handleQty = Number(result.label.qty);
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+				} catch (e) {
+					this.showMessage(e.message)
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+			commit() {
+				//校验库位、
+				if (!this.checkLocation()) {
+					return
+				}
+
+				console.log("校验通过")
+
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this
+							.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+
+			async submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams()
+						console.log("提交参数", JSON.stringify(params));
+						// productDismantleJobSubmit(this.id, params).then(res => {
+						// 	if (res.data) {
+						// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data.Number, )
+						// 	} else {
+						// 		this.showErrorMessage("提交失败[" + res.msg + "]")
+						// 	}
+						// 	uni.hideLoading()
+						// }).catch(error => {
+						// 	uni.hideLoading()
+						// 	this.showErrorMessage(error)
+						// })
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "") {
+					this.$refs.comMessage.showMessage('请扫描收货库位', res => {
+						if (res) {
+							this.$refs.requiredLocation.showLocation();
+						}
+					});
+					return isPass = false;
+				}
+				//空库位校验
+				var isHaveNullLocation = false;
+				var nullLocationList = [];
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.toLocationCode == null || detail.toLocationCode == "") {
+							nullLocationList.push(detail)
+						}
+					})
+				})
+
+
+
+				if (nullLocationList.length > 0) {
+					//弹出提示，是否把其他的库位都变成默认库位
+					this.$refs.comMessage.showQuestionMessage("是否把其他的库位都变成默认库位", res => {
+						nullLocationList.forEach(res => {
+							res.toLocationCode = this.toLocationCode
+						})
+					})
+					isPass = false;
+				}
+				return isPass;
+			},
+
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			getToLocationCode(location, code) {
+				if (this.fromLocationCode == code) {
+					this.$refs.comMessage.showMessage('来源库位[' + this.fromLocationCode + '] 不能与目标库位[' + code + '] 一致 ',
+						res => {
+							this.$refs.comScanLocation.showLocation();
+						});
+				} else {
+					this.toLocationInfo = location;
+					this.toLocationCode = code;
+				}
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/productDismantle/job/productDismantleJob.vue b/pages/productDismantle/job/productDismantleJob.vue
new file mode 100644
index 0000000..e566a89
--- /dev/null
+++ b/pages/productDismantle/job/productDismantleJob.vue
@@ -0,0 +1,287 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-product-job-card :dataContent="item" @click='openJobDetail(item)'>
+						</com-product-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		cancleTakeProductDismantleJob,
+		getProductDismantleJobList,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle,
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+
+	import comProductJobCard from '@/pages/productDismantle/coms/comProductJobCard.vue'
+	import jobListPopup from '@/pages/productDismantle/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/productDismantle/coms/jobInfoPopup.vue'
+
+	export default {
+		name: 'Putaway',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comProductJobCard,
+			jobListPopup,
+			jobInfoPopup
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+				
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getProductDismantleJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("制品拆解任务(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './productDismantleDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.scanList.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeProductDismantleJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getProductDismantleJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/productDismantle/record/productDismantleRecord.vue b/pages/productDismantle/record/productDismantleRecord.vue
new file mode 100644
index 0000000..b352c64
--- /dev/null
+++ b/pages/productDismantle/record/productDismantleRecord.vue
@@ -0,0 +1,375 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
+								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
+				:locationTypeList="tolocationTypeList"></requiredLocation>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		productDismantleRecordSubmit
+	} from '@/api/request2.js';
+	import {
+		goHome,
+	} from '@/common/basic.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comProductionRecord from '@/pages/productionReceipt/coms/comProductionRecord.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			comProductionRecord,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				received: false,
+				isShowPackingCode: true,
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				detailList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				toLocationInfo: {},
+				businessTypeInfo: {},
+				fromLocationInfo: {},
+				fromLocationCode: "",
+				toLocationInfo: {},
+				toLocationCode: "",
+				isShowLocation: false,
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				allowModifyLocation: false,
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {}
+			};
+		},
+		onLoad(option) {
+			var typeCode = "ProductPutaway"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			calcHandleQty() {
+				calcHandleQty(this.detailSource);
+				this.$forceUpdate();
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+
+			},
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.toLocationCode = code
+				this.toLocationCode = location;
+
+			},
+
+			commit() {
+				if (this.toLocationCode == "") {
+					this.showMessage("请先选择目标库位")
+					return;
+				}
+				//允许部分提交
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var params = this.setParams();
+				console.log("提交" + JSON.stringify(params))
+				// productDismantleRecordSubmit(params).then(res => {
+				// 	uni.hideLoading()
+				// 	if (res.data) {
+				// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data, )
+				// 	} else {
+				// 		this.showErrorMessage("提交失败[" + res.msg + "]")
+				// 	}
+				// }).catch(error => {
+				// 	uni.hideLoading()
+				// 	this.showErrorMessage(error)
+				// })
+
+			},
+
+			setParams() {
+				var subList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							// var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+							// 	detail.packingNumber, detail.batch);
+							// 	detail.toPackingNumber =info.packingNumber;
+							// 	detail.toBatch =info.batch;
+							subList.push(detail)
+						}
+					})
+				})
+				return subList;
+
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationInfo = location;
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				if (this.fromLocationCode == code) {
+					uni.showToast({
+						title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+						duration: 2000
+					})
+					return
+				}
+				this.ToLocationCodeInfo = location;
+				this.toLocationCode = code;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.fromLocationCode = '';
+
+				})
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/productPutaway/coms/comProductDetailCard.vue b/pages/productPutaway/coms/comProductDetailCard.vue
new file mode 100644
index 0000000..4c56737
--- /dev/null
+++ b/pages/productPutaway/coms/comProductDetailCard.vue
@@ -0,0 +1,121 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend :detail="item" ></recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<balance-qty-edit ref="qtyEdit" :dataContent="editItem" :settingParam="settingParam"
+			:handleQty="editItem.record.qty" @confirm="confirm"></balance-qty-edit>
+		<job-detail-popup ref="receiptHint" :dataContent="showItem"></job-detail-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			recommendQtyEdit,
+			balanceQtyEdit,
+			jobDetailPopup,
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.qtyEdit.openEditPopup(item.balance, item.record.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.record = {}
+							item.balance = {}
+							item.inventoryStatus = item.RecommendInventoryStatus
+							// item.record.qty = 0;
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.record.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productPutaway/coms/comProductJobCard.vue b/pages/productPutaway/coms/comProductJobCard.vue
new file mode 100644
index 0000000..9e7eb95
--- /dev/null
+++ b/pages/productPutaway/coms/comProductJobCard.vue
@@ -0,0 +1,44 @@
+<template>
+ 	<job-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				<view class="">
+ 					申请单号 : {{dataContent.requestNumber}}
+ 				</view>
+ 			</view>
+
+ 			<view class="task_text">
+ 				<view class="">
+ 					供应商代码 : {{dataContent.supplierCode}}
+ 				</view>
+ 			</view>
+ 		</view>
+ 	</job-com-main-card>
+ </template>
+
+ <script>
+ 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			jobComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/productPutaway/coms/comPutawayRequestCard.vue b/pages/productPutaway/coms/comPutawayRequestCard.vue
new file mode 100644
index 0000000..ca0ba13
--- /dev/null
+++ b/pages/productPutaway/coms/comPutawayRequestCard.vue
@@ -0,0 +1,36 @@
+<template>
+ 	<request-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<!-- <view class="task_text">
+ 				供应商代码 : {{dataContent.supplierCode}}
+ 			</view> -->
+ 		</view>
+ 	</request-com-main-card>
+ </template>
+
+ <script>
+ 	import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			requestComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/productPutaway/coms/comScanProductList.vue b/pages/productPutaway/coms/comScanProductList.vue
new file mode 100644
index 0000000..1b815ca
--- /dev/null
+++ b/pages/productPutaway/coms/comScanProductList.vue
@@ -0,0 +1,54 @@
+<template>
+		<!-- <page-meta root-font-size="18px"></page-meta> -->
+	<uni-popup ref="popupItems">
+		<scroll-view scroll-y="true" style="background-color: #000;height: 80vh;">
+		<view class="" style=" margin: 10rpx;background-color:#EBEEF0;" v-for="(item, index) in showList" :key="index" @click="openDetail(item)">
+			<jobCard :dataContent="item"
+			:disabled="true"
+			:propertyList="propertyList"
+			></jobCard>
+		</view>
+		</scroll-view>
+		</uni-popup>
+</template>
+
+<script>
+	import jobCard from '@/mycomponents/job/jobCard.vue';
+	export default {
+		emits:["selectedItem"],
+		components: {
+			jobCard
+		},
+		props: {
+			
+		},
+		data (){
+			return {
+				showList: [],
+				propertyList:[]
+			}
+		},
+		methods:{
+			openPopup(items) {
+				this.showList = items;
+				this.showList.forEach(res=>{
+					var temp = {
+						name:"发货单号",
+						value:res.asnNumber
+					}
+					this.propertyList.push(temp)
+				})
+				this.$refs['popupItems'].open("center");
+			},
+			
+			openDetail(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+		
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/productPutaway/coms/detailInfoPopup.vue b/pages/productPutaway/coms/detailInfoPopup.vue
new file mode 100644
index 0000000..4b64c50
--- /dev/null
+++ b/pages/productPutaway/coms/detailInfoPopup.vue
@@ -0,0 +1,57 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<!-- <view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">生产线代码 : </text>
+							<text class="text_wrap">{{dataContent.ProductionLineCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">工位代码 : </text>
+							<text class="text_wrap">{{dataContent.WorkStationCode}} </text>
+						</view>
+					</view> -->
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productPutaway/coms/jobInfoPopup.vue b/pages/productPutaway/coms/jobInfoPopup.vue
new file mode 100644
index 0000000..9188858
--- /dev/null
+++ b/pages/productPutaway/coms/jobInfoPopup.vue
@@ -0,0 +1,53 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">车间代码 : </text>
+							<text class="text_wrap">{{dataContent.workshopCode}} </text>
+						</view>
+					</view>
+				</view>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productPutaway/coms/jobListPopup.vue b/pages/productPutaway/coms/jobListPopup.vue
new file mode 100644
index 0000000..7d0c8b9
--- /dev/null
+++ b/pages/productPutaway/coms/jobListPopup.vue
@@ -0,0 +1,47 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-product-job-card :dataContent="item" @click='selectItem(item)'></com-product-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	import comProductJobCard from '@/pages/productPutaway/coms/comProductJobCard.vue'
+	
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comProductJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productPutaway/coms/requestDetailInfoPopup.vue b/pages/productPutaway/coms/requestDetailInfoPopup.vue
new file mode 100644
index 0000000..a5bf0df
--- /dev/null
+++ b/pages/productPutaway/coms/requestDetailInfoPopup.vue
@@ -0,0 +1,73 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<requestDetailCommonInfo :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">包装号 : </text>
+							<text class="text_wrap">{{dataContent.packingNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">器具号 : </text>
+							<text class="text_wrap">{{dataContent.containerNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从库位代码 : </text>
+							<text class="text_wrap">{{dataContent.fromLocationCode	}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">库存状态 : </text>
+							<text class="text_wrap">{{dataContent.inventoryStatus}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从货主代码 : </text>
+							<text class="text_wrap">{{dataContent.fromOwnerCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到货主代码 : </text>
+							<text class="text_wrap">{{dataContent.toOwnerCode}} </text>
+						</view>
+					</view>
+				</view>
+			</requestDetailCommonInfo>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue'
+	export default {
+		components: {
+			requestDetailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productPutaway/coms/requestInfoPopup.vue b/pages/productPutaway/coms/requestInfoPopup.vue
new file mode 100644
index 0000000..eea5cfd
--- /dev/null
+++ b/pages/productPutaway/coms/requestInfoPopup.vue
@@ -0,0 +1,73 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<request-common-info :dataContent="dataContent"  @onClose="closePopup">
+				<view class="">
+					<comListItem :dataList="dataList"></comListItem>
+				</view>
+				<u-line></u-line>
+			</request-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestCommonInfo from '@/mycomponents/request/requestCommonInfo.vue'
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+		components: {
+			requestCommonInfo,
+			comListItem
+		},
+		data() {
+			return {
+				dataContent: {},
+				dataList:[]
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				this.dataList=[{
+						title: '供应商代码',
+						content: this.dataContent.supplierCode
+					}, {
+						title: '从仓库代码',
+						content: this.dataContent.fromWarehouseCode
+					},{
+						title: '到仓库代码',
+						content: this.dataContent.toWarehouseCode,
+					},{
+						title: '从库位类型范围',
+						content: this.dataContent.fromLocationTypes,
+						type:"locationType"
+					},{
+						title: '到库位类型范围',
+						content: this.dataContent.toLocationTypes,
+						type:"locationType"
+					},{
+						title: '从库区代码范围',
+						content: this.dataContent.fromAreaCodes,
+					},{
+						title: '到库区代码范围',
+						content: this.dataContent.toAreaCodes,
+					}];
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productPutaway/job/productPutawayDetail.vue b/pages/productPutaway/job/productPutawayDetail.vue
new file mode 100644
index 0000000..5482228
--- /dev/null
+++ b/pages/productPutaway/job/productPutawayDetail.vue
@@ -0,0 +1,501 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+			<u-line color="#D8D8D8" />
+		</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
+							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
+							:locationTypeList='tolocationTypeList'>
+						</com-detail-card>
+					</view>
+					<u-line />
+				</view>
+			</scroll-view>
+		</view>
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 1"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getManagementPrecisions,
+	} from '@/common/balance.js';
+
+	import {
+		getBasicLocationByCode,
+		getProductPutawayJobDetail,
+		takeProductPutawayJob,
+		cancleTakeProductPutawayJob,
+		productPutawayJobSubmit
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		getCurrDateTime,
+		navigateBack,
+		getPackingNumberAndBatch,
+	} from '@/common/basic.js';
+
+	import {
+		getInventoryStatusName,
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+	import {
+		getLocationTypeArray
+	} from '@/common/array.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import detailInfoPopup from '@/pages/productPutaway/coms/detailInfoPopup.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPackAndLocation,
+			requiredLocation,
+			comDetailCard,
+			detailInfoPopup,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				managementList: [],
+				fromLocationCode: "",
+				toLocationCode: "",
+				toLocationInfo: {},
+				tolocationTypeList: [],
+				jobStatus:""
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务	
+					cancleTakeProductPutawayJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+		},
+
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeProductPutawayJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getProductPutawayJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.subList = res.data.subList;
+							that.jobStatus = res.data.status
+							that.fromLocationCode = that.subList[0].fromLocationCode
+							that.toLocationCode = that.subList[0].toLocationCode
+							that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
+							that.detailSource = getDataSource(that.subList)
+							that.getLocationInfo(that.toLocationCode);
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			getLocationInfo(locationCode) {
+				if (locationCode != '') {
+					getBasicLocationByCode(locationCode).then(res => {
+						if (res.data.list.length > 0) {
+							this.toLocationInfo = res.data.list[0]
+						}
+					})
+				}
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource);
+				this.continueScan()
+				this.$forceUpdate();
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			openDetail(item) {
+				this.$refs.detailInfoPopup.openPopup(item)
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.balance.packingNumber;
+					var batch = result.balance.batch;
+					var qty = result.balance.qty;
+					var itemCode = result.balance.itemCode;
+					var locationCode = result.balance.locationCode;
+					var inventoryStatus = result.balance.inventoryStatus;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch &&
+								r.fromLocationCode == result.fromLocationCode
+						})
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+								.fromLocationCode + "】不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+									.fromLocationCode + "】已经扫描")
+							} else {
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+										this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续上架?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty)
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty)
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									} else {
+
+									}
+
+
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.handleQty = Number(result.balance.qty)
+									itemDetail.balance = result.balance;
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+									itemDetail.balance.balanceQty = Number(result.balance.qty)
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+				} catch (e) {
+					this.showMessage(e.message)
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//校验库位、
+				if (!this.checkLocation()) {
+					return
+				}
+
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this
+							.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.showMessageHint('请扫描收货库位', callback => {
+						this.$refs.comScanLocation.showLocation();
+					})
+
+					return isPass = false;
+				}
+				return isPass;
+			},
+
+			showMessageHint(hint, callback) {
+				this.$refs.comMessage.showErrorMessage(hint, res => {
+					if (res) {
+						callback()
+					}
+				});
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams();
+						console.log("提交" + JSON.stringify(params))
+						productPutawayJobSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成制品上架记录<br>" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							detail.toContainerNumber = '';
+							detail.toLocationCode = this.toLocationCode;
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1);
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/pages/productPutaway/job/productPutawayJob.vue b/pages/productPutaway/job/productPutawayJob.vue
new file mode 100644
index 0000000..628284f
--- /dev/null
+++ b/pages/productPutaway/job/productPutawayJob.vue
@@ -0,0 +1,287 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-product-job-card :dataContent="item" @click='openJobDetail(item)'>
+						</com-product-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		cancleTakeProductPutawayJob,
+		getProductPutawayJobList
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle,
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import comProductJobCard from '@/pages/productPutaway/coms/comProductJobCard.vue'
+	import jobListPopup from '@/pages/productPutaway/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/productPutaway/coms/jobInfoPopup.vue'
+
+	export default {
+		name: 'Putaway',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comProductJobCard,
+			jobListPopup,
+			jobInfoPopup
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+				
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getProductPutawayJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("制品上架任务(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("制品上架任务");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './productPutawayDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.scanList.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeProductPutawayJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getProductPutawayJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/productPutaway/record/productPutawayRecord.vue b/pages/productPutaway/record/productPutawayRecord.vue
new file mode 100644
index 0000000..c994dbb
--- /dev/null
+++ b/pages/productPutaway/record/productPutawayRecord.vue
@@ -0,0 +1,450 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
+								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
+							:locationTypeList="tolocationTypeList"></requiredLocation>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		productPutawayRecordSubmit
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		getPackingNumberAndBatchByList,
+		deepCopyData
+	} from '@/common/basic.js';
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comProductionRecord from '@/pages/productionReceipt/coms/comProductionRecord.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			comProductionRecord,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				dataContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				fromLocationCode: "",
+				toLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				managementList: []
+			};
+		},
+		onLoad(option) {
+			var typeCode = "ProductPutaway"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			calcHandleQty() {
+				calcHandleQty(this.detailSource);
+				this.$forceUpdate();
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+
+			},
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+
+			},
+
+			commit() {
+				if (this.toLocationCode == "") {
+					this.showMessage("请先选择目标库位")
+					return;
+				}
+
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					this.managementList = [];
+					var precisionStrategParams = this.setPrecisionStrategParams()
+
+					getPrecisionStrategyList(precisionStrategParams, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							var params = this.setParams()
+							console.log("提交" + JSON.stringify(params))
+							productPutawayRecordSubmit(params).then(res => {
+								uni.hideLoading()
+								if (res.data) {
+									this.showCommitSuccessMessage("提交成功<br>生成制品上架记录<br>" + res.data)
+								} else {
+									this.showErrorMessage("提交失败[" + res.msg + "]")
+								}
+							}).catch(error => {
+								uni.hideLoading()
+								this.showErrorMessage(error)
+							})
+
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+
+					})
+
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+
+			},
+
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.toLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setParams() {
+
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var submitItem = deepCopyData(detail)
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+
+							submitItem.inventoryStatus = detail.inventoryStatus;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.toPackingNumber = info.packingNumber;
+
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+
+							submitItem.fromBatch = info.batch;
+							submitItem.toBatch = info.batch;
+
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+							
+							submitItem.qty = detail.handleQty;
+							submitItem.package ="";
+							subList.push(submitItem)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				return this.dataContent;
+			},
+
+
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				this.toLocationCode = code;
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						detail.toLocationCode = this.toLocationCode
+					})
+				})
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
+			},
+			clearData(){
+				this.fromLocationCode = '';
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/productPutaway/request/putawayRequest.vue b/pages/productPutaway/request/putawayRequest.vue
new file mode 100644
index 0000000..a551af6
--- /dev/null
+++ b/pages/productPutaway/request/putawayRequest.vue
@@ -0,0 +1,399 @@
+<template>
+	<view>
+		<com-empty-view v-if="requestList.length==0"></com-empty-view>
+		<request-filter ref="filter" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
+			:checkedWaitTask="checkedWaitTask">
+		</request-filter>
+		<view v-if="requestList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in requestList" :key="index">
+					<uni-swipe-action-item :right-options="item.options" @click="swipeClick($event,item)">
+						<com-putaway-request-card :dataContent="item" @click='openRequestDetail(item)'>
+						</com-putaway-request-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+			<uni-load-more :status="loadingType" v-if="requestList.length>0" />
+
+			<request-info-popup ref='requestInfoPopup'></request-info-popup>
+		</view>
+		<requestButton @goScan='openScanDetailPopup'></requestButton>
+
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import requestFilter from '@/mycomponents/request/requestFilter.vue'
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import comPutawayRequestCard from '@/pages/productPutaway/coms/comPutawayRequestCard.vue'
+	import requestInfoPopup from '@/pages/productPutaway/coms/requestInfoPopup.vue'
+	import requestButton from '@/mycomponents/button/requestButton.vue'
+
+	import {
+		goHome,
+		updateTitle,
+		clearTirmAndWrap
+	} from '@/common/basic.js';
+
+	import {
+		getProductPutawayRequestList,
+		productPutawayRequestClose,
+		productPutawayRequestApprove,
+		productPutawayRequestApproveAgree,
+		productPutawayRequestApproveRefused,
+		productPutawayRequestHandle,
+		productPutawayRequestAddAgain
+	} from '@/api/request2.js';
+	import {
+		getDetailOption,
+		getDetailAndApproveOption,
+		getDetailAndApprovePassAndApproveNoOption,
+		getDetailAndHandleOption,
+		getDetailAndAddAndCloseOption,
+		getAddAgainOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			requestFilter,
+			comPutawayRequestCard,
+			requestInfoPopup,
+			requestButton
+		},
+		data() {
+			return {
+				requestList: [],
+				pageNo: 1,
+				pageSize: 10,
+				status: "1,2,3,4,5,6",
+				totalCount: 0,
+				checkedWaitTask: false,
+				detailOptions: [],
+				detailAndApproveOptions: [],
+				detailAndApprovePassAndApproveNoOption: [],
+				detailAndHandleOption: [],
+				detailAndAddAndCloseOption: [],
+				addAgainOption: [],
+				showOptions: [],
+				loadingType: "nomore",
+
+			};
+		},
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.addAgainOption = getAddAgainOption();
+			this.detailAndApproveOptions = getDetailAndApproveOption()
+			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
+			this.detailAndHandleOption = getDetailAndHandleOption()
+			this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
+
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+		onShow() {
+			this.getList('refresh');
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+
+		mounted() {
+
+		},
+		methods: {
+			requestConfirm(action, item) {},
+
+			getToLocationCode() {
+
+			},
+			openRequestDetail(item) {
+				uni.navigateTo({
+					url: './putawayRequestDetail?id=' + item.id
+				});
+			},
+
+
+			openRequestInfoPopup(item) {
+				this.$refs.requestInfoPopup.openPopup(item)
+			},
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.requestList = [];
+				}
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getProductPutawayRequestList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					list.forEach(res => {
+						var options = this.updateOptions(res.status);
+						res.options = options;
+					})
+					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
+
+					this.pageNo++;
+					updateTitle("制品上架申请(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("制品上架申请");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			updateOptions(status) {
+				if (status == "1") {
+					this.showOptions = this.detailAndApproveOptions;
+				} else if (status == "2") {
+					this.showOptions = this.detailAndApprovePassAndApproveNoOption;
+				} else if (status == "3") {
+					this.showOptions = this.detailAndHandleOption;
+				} else if (status == "4") {
+					this.showOptions = this.detailAndAddAndCloseOption;
+				} else if (status == "5") {
+					this.showOptions = this.addAgainOption;
+				} else {
+					this.showOptions = this.detailOptions;
+				}
+				return this.showOptions
+			},
+
+			openScanDetailPopup() {
+				uni.navigateTo({
+					url: "./putawayRequestCreate"
+				})
+			},
+
+
+			swipeClick(e, dataContent) {
+				var text = clearTirmAndWrap(e.content.text)
+				if (text == "详情") {
+					this.openRequestInfoPopup(dataContent);
+				} else if (text == "处理") {
+					this.showQuestionMessage("确定要处理当前申请吗?", res => {
+						this.productPutawayRequestHandle(dataContent.id)
+					})
+				} else if (text == "提交审批") {
+					this.showQuestionMessage("确定要审批当前申请吗?", res => {
+						this.productPutawayRequestApprove(dataContent.id)
+					})
+				} else if (text == "审批通过") {
+					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
+						this.productPutawayRequestApproveAgree(dataContent.id)
+					})
+				} else if (text == "审批驳回") {
+					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
+						this.productPutawayRequestApproveRefused(dataContent.id)
+					})
+				} else if (text == "关闭") {
+					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
+						this.productPutawayRequestClose(dataContent.id)
+					})
+				} else if (text == "重新添加") {
+					this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
+						this.productPutawayRequestAddAgain(dataContent.id)
+					})
+				}
+			},
+			showQuestionMessage(hint, callBack) {
+				this.$refs.comMessage.showQuestionMessage(hint,
+					res => {
+						if (res) {
+							callBack()
+						}
+					});
+			},
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getProductPutawayRequestList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openRequestDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			productPutawayRequestApprove(id) {
+				productPutawayRequestApprove(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请提交审批成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请提交审批失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+
+			},
+
+			productPutawayRequestClose(id) {
+				productPutawayRequestClose(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请关闭成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请关闭失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			productPutawayRequestApproveAgree(id) {
+				productPutawayRequestApproveAgree(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批通过成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批通过失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			productPutawayRequestApproveRefused(id) {
+				productPutawayRequestApproveRefused(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批驳回成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批驳回失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			productPutawayRequestHandle(id) {
+				productPutawayRequestHandle(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请处理成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请处理失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			productPutawayRequestAddAgain(id) {
+				productPutawayRequestAddAgain(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请重新添加成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请重新添加失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productPutaway/request/putawayRequestCreate.vue b/pages/productPutaway/request/putawayRequestCreate.vue
new file mode 100644
index 0000000..5a835e6
--- /dev/null
+++ b/pages/productPutaway/request/putawayRequestCreate.vue
@@ -0,0 +1,428 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-header">
+				<view class="header_item">
+					来源库位 : {{fromLocationCode}}
+				</view>
+				<u-line />
+			</view>
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
+								:isShowFromLocation="false" :isShowToLocation='false'
+								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<!-- <requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
+							@getLocation='getToLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation> -->
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation='false'>
+		</win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getFromLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+	</view>
+</template>
+
+<script>
+	import {
+		productPutawayRequestSubmit,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle,
+		deepCopyData,
+		getCurrDateTime,
+		getPackingNumberAndBatchByList
+	} from '@/common/basic.js';
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import {
+		getManagementPrecisions,
+		getPrecisionStrategyList,
+		getPrecisionStrategyParams
+	} from '@/common/balance.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				dataContent: {}, //内容
+				detailSource: [], //绑定在页面上的数据源
+				fromLocationInfo: {},
+				fromLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				showToLoaction: true,
+				recommendLocationList: [], //推荐库位列表
+				fromWarehouseCode: '', //来源仓库
+				supplierCode: '' //供应商代码
+			};
+		},
+		onLoad(option) {
+			this.clear();
+			var typeCode = "ProductPutaway"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				
+				if(label.batch==""){
+					this.showErrorMessage("扫描标签批次为空")
+					return;
+				}
+				
+				if(label.packingNumber==""){
+					this.showErrorMessage("扫描标签箱码为空")
+					return;
+				}
+				
+				if (this.supplierCode == '') {
+					this.supplierCode = result.package.supplierCode
+				} else {
+					if (this.supplierCode != result.package.supplierCode) {
+						this.showErrorMessage('请扫描同一供应商【' + this.supplierCode + '】的物品')
+						return;
+					}
+				}
+
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (this.fromWarehouseCode == '') {
+					this.fromWarehouseCode = balance.warehouseCode;
+				}
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					newDetail.poNumber = pack.poNumber;
+					newDetail.poLine = pack.poLine;
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						newDetail.poNumber = pack.poNumber;
+						newDetail.poLine = pack.poLine;
+						// newDetail.toLocationCode = toLocation.code;
+						// newDetail.toWarehouseCode = toLocation.warehouseCode;
+						item.subList.push(newDetail);
+						// this.getRecommendLocation(balance, pack, toLocation => {
+						// 	let newDetail = createDetailInfo(balance, pack);
+						// 	newDetail.toLocationCode = toLocation.code;
+						// 	newDetail.toWarehouseCode = toLocation.warehouseCode;
+						// 	item.subList.push(newDetail);
+						// });
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.$forceUpdate();
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			// scanLocationCode(location, code) {
+			// 	this.toLocationCode = code
+			// 	this.toLocationCode = location;
+
+			// },
+
+			commit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var params = this.setRequestParams()
+				console.log("提交参数", JSON.stringify(params));
+
+				productPutawayRequestSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成制品上架申请<br>" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+			setRequestParams() {
+				let requestContent = {};
+				var creator = this.$store.state.user.id
+				requestContent.creator = creator;
+				requestContent.supplierCode = this.supplierCode;
+				requestContent.fromWarehouseCode = this.fromWarehouseCode;
+				requestContent.toWarehouseCode = this.fromWarehouseCode;
+				var subList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var subItem = deepCopyData(detail)
+							subItem.fromLocationCode = detail.locationCode;
+							subItem.qty = detail.handleQty;
+							subItem.package = null;
+							subList.push(subItem)
+						}
+					})
+				})
+
+				requestContent.subList = subList
+				return requestContent;
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getFromLocation(location, code) {
+				this.fromLocationInfo = location;
+				this.fromLocationCode = code;
+				this.fromWarehouseCode = location.warehouseCode;
+				this.openScanPopup();
+			},
+
+			getToLocationCode(location, code) {
+				if (this.fromLocationCode == code) {
+					uni.showToast({
+						title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+						duration: 2000
+					})
+					return
+				}
+				this.toLocationCode = code;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clear();
+				})
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			clear() {
+				this.fromLocationInfo = {};
+				this.fromLocationCode = '';
+				this.fromWarehouseCode = '';
+				this.toWarehouseCode = '';
+				this.detailSource = [];
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/productPutaway/request/putawayRequestDetail.vue b/pages/productPutaway/request/putawayRequestDetail.vue
new file mode 100644
index 0000000..1d71a3d
--- /dev/null
+++ b/pages/productPutaway/request/putawayRequestDetail.vue
@@ -0,0 +1,123 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<request-top :dataContent="requestContent"></request-top>
+			</view>
+			<!-- <view class="header_item">
+				供应商 : {{requestContent.supplierCode}}
+			</view> -->
+			<u-line color="#D8D8D8" />
+		</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comRequestDetailCard :dataContent="item" @openDetail="openDetail">
+						</comRequestDetailCard>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<requestDetailInfoPopup ref="jobDetailPopup"></requestDetailInfoPopup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getProductPutawayRequestDetail,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource,
+	} from '@/common/detail.js';
+
+
+	import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
+	import requestDetailInfoPopup from '@/pages/productPutaway/coms/requestDetailInfoPopup.vue'
+	import requestTop from "@/mycomponents/request/requestTop.vue"
+	
+	export default {
+		components: {
+			comRequestDetailCard,
+			requestDetailInfoPopup,
+			requestTop
+		},
+		data() {
+			return {
+				id: '',
+				requestContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			this.getDetail();
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getProductPutawayRequestDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.requestContent = res.data;
+							that.subList = res.data.subList;
+							that.detailSource = getDataSource(that.subList);
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+			openDetail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/productReceipt/coms/comProductDetailCard.vue b/pages/productReceipt/coms/comProductDetailCard.vue
new file mode 100644
index 0000000..1c94c2f
--- /dev/null
+++ b/pages/productReceipt/coms/comProductDetailCard.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty"></itemCompareQty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend :detail="item" :isShowFromLocation="false"  :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<u-line color="#D8D8D8"></u-line>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+
+		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam"
+			 @confirm="confirm">
+		</recommend-qty-edit>
+		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
+			:locationTypeList="locationTypeList"></win-scan-location>
+		<productDetailInfoPopup ref="jobDetailPopup" :dataContent="showItem"></productDetailInfoPopup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue'
+	import productDetailInfoPopup from '@/pages/productReceipt/coms/productDetailInfoPopup.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	
+	import {
+		getDetailOption,
+		getPurchaseReceiptOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			itemCompareQty,
+			recommend,
+			recommendQtyEdit,
+			jobDetailPopup,
+			productDetailInfoPopup,
+			winScanLocation
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			locationTypeList: {
+				type: Array,
+				default: []
+			},
+			
+			
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined && this.$refs.collapse1 != null) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		data() {
+			return {
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				locatonItem:{},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty,this.settingParam.allowModifyLocation)
+			}
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				}  else if (e.content.text == "库位") {
+					this.showLocation(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty,item.labelQty);
+			},
+			showLocation(item) {
+				this.locatonItem =item;
+				this.$refs.scanLocationCode.openScanPopup();
+			},
+			//扫描源库位
+			getLocation(location, code) {
+				this.locatonItem.toLocationCode =code;
+				this.$emit('updateData')
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.handleQty = null
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.handleQty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productReceipt/coms/comProductJobCard.vue b/pages/productReceipt/coms/comProductJobCard.vue
new file mode 100644
index 0000000..a8daf82
--- /dev/null
+++ b/pages/productReceipt/coms/comProductJobCard.vue
@@ -0,0 +1,50 @@
+<template>
+ 	<job-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				<view class="">
+ 					申请单号 : {{dataContent.requestNumber}}
+ 				</view>
+ 			</view>
+
+ 			<view class="task_text">
+ 				<view class="">
+ 					车间代码 : {{dataContent.workShopCode}}
+ 				</view>
+ 			</view>
+
+ 			<view class="task_text">
+ 				<view class="">
+ 					班组 : {{dataContent.team}}
+ 				</view>
+ 			</view>
+ 		</view>
+ 	</job-com-main-card>
+ </template>
+
+ <script>
+ 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			jobComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/productReceipt/coms/comProductRecord.vue b/pages/productReceipt/coms/comProductRecord.vue
new file mode 100644
index 0000000..de707d5
--- /dev/null
+++ b/pages/productReceipt/coms/comProductRecord.vue
@@ -0,0 +1,169 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
+							<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"
+								:isShowBalance="true"></item-qty>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item,index)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<balance :dataContent="item" :isShowStdPack="false" :isShowStatus="true"
+								:isShowPack="true" :isShowFromLocation="false"></balance>
+							<!-- <production-label :dataContent="item" :packageContent="item.package"
+								:isShowLocation="false">
+							</production-label> -->
+							
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<recommend-qty-edit ref="recommendQtyEdit" :dataContent="editItem" :handleQty="editItem.qty" @confirm="confirm" :isShowStatus="isShowStatus"></recommend-qty-edit>
+		<package-detail-popup ref='packageDetailPopup'>
+		</package-detail-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import productionLabel from '@/mycomponents/balance/productionLabel.vue'
+	import record from '@/mycomponents/record/record.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import packageDetailPopup from '@/mycomponents/package/packageDetailPopup.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getClearOption
+	} from '@/common/array.js';
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			packageDetailPopup,
+			productionLabel,
+			recommendQtyEdit,
+			record,
+			balance
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			fromInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			toInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {},
+				detailOptions: [],
+				scanOptions: [],
+				removeOptions: [],
+				dataList: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+			this.removeOptions = getClearOption();
+		},
+
+		methods: {
+			removeData(e, dataContent) {
+				if (e.content.text == "清空") {
+					this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
+						res => {
+							if (res) {
+								this.$emit('removeItem')
+								// this.$emit('removeItem', this.dataContent)
+							}
+						});
+				}
+			},
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item.package)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+
+			edit(item) {
+				this.editItem = item;
+				this.$refs.recommendQtyEdit.openRecordEditPopup(item.qty);
+				// this.$refs.recommendQtyEdit.openEditPopup(item.qty);
+			},
+
+			detail(packageInfo) {
+				this.showItem = packageInfo;
+				this.$refs.packageDetailPopup.openPopup(packageInfo)
+			},
+			remove(item, index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							this.dataContent.subList.splice(index, 1)
+							this.$emit('removePack')
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productReceipt/coms/detailInfoPopup.vue b/pages/productReceipt/coms/detailInfoPopup.vue
new file mode 100644
index 0000000..ae30344
--- /dev/null
+++ b/pages/productReceipt/coms/detailInfoPopup.vue
@@ -0,0 +1,89 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">生产线代码 : </text>
+							<text class="text_wrap">{{dataContent.productionLineCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">工位代码 : </text>
+							<text class="text_wrap">{{dataContent.workStationCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">工序代码 : </text>
+							<text class="text_wrap">{{dataContent.processCode}} </text>
+						</view>
+						
+						<view class="item">
+							<text class="item_title">标包数量 : </text>
+							<text class="text_wrap">{{dataContent.stdPackQty}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">标包单位 : </text>
+							<text class="text_wrap">{{dataContent.stdPackUnit}} </text>
+						</view>
+						
+						<view class="item">
+							<text class="item_title">生产日期 : </text>
+							<text class="text_wrap">{{dataContent.produceDate}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">过期日期 : </text>
+							<text class="text_wrap">{{dataContent.expireDate}} </text>
+						</view>
+						
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.poNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.poLine}} </text>
+						</view>
+						
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productReceipt/coms/jobInfoPopup.vue b/pages/productReceipt/coms/jobInfoPopup.vue
new file mode 100644
index 0000000..e5513bc
--- /dev/null
+++ b/pages/productReceipt/coms/jobInfoPopup.vue
@@ -0,0 +1,66 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">生产计划单号 : </text>
+							<text class="text_wrap">{{dataContent.productionPlanNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">车间代码 : </text>
+							<text class="text_wrap">{{dataContent.workshopCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">班组 : </text>
+							<text class="text_wrap">{{dataContent.team}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">班次 : </text>
+							<text class="text_wrap">{{dataContent.shift}} </text>
+						</view>
+					</view>
+				</view>
+				<u-line></u-line>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productReceipt/coms/jobListPopup.vue b/pages/productReceipt/coms/jobListPopup.vue
new file mode 100644
index 0000000..cbcf199
--- /dev/null
+++ b/pages/productReceipt/coms/jobListPopup.vue
@@ -0,0 +1,46 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-product-job-card :dataContent="item" @click='selectItem(item)'></com-product-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	import comProductJobCard from '@/pages/productReceipt/coms/comProductJobCard.vue'
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comProductJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productReceipt/coms/productDetailInfoPopup.vue b/pages/productReceipt/coms/productDetailInfoPopup.vue
new file mode 100644
index 0000000..daed7ee
--- /dev/null
+++ b/pages/productReceipt/coms/productDetailInfoPopup.vue
@@ -0,0 +1,98 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">标包数量 : </text>
+							<text class="text_wrap">{{dataContent.stdPackQty}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">标包单位 : </text>
+							<text class="text_wrap">{{getStdPackUnitInfo(dataContent.stdPackUnit)}} </text>
+						</view>
+
+					</view>
+				</view>
+				<u-line></u-line>
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.poNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.poLine}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">项目代码 : </text>
+							<text class="text_wrap">{{dataContent.projectCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到货日期 : </text>
+							<text class="text_wrap">{{dateFormat(dataContent.arriveDate)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">生产日期 : </text>
+							<text class="text_wrap">{{dateFormat(dataContent.produceDate)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">过期日期 : </text>
+							<text class="text_wrap">{{dateFormat(dataContent.expireDate)}} </text>
+						</view>
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {getStdPackUnitInfo} from "@/common/directory.js"
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			getStdPackUnitInfo(value){
+				return getStdPackUnitInfo(value).label
+			},
+			dateFormat(value){
+				return dateFormat(value)
+			}
+			
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productReceipt/job/productReceiptDetail.vue b/pages/productReceipt/job/productReceiptDetail.vue
new file mode 100644
index 0000000..8cee17d
--- /dev/null
+++ b/pages/productReceipt/job/productReceiptDetail.vue
@@ -0,0 +1,417 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+			<u-line color="#D8D8D8"></u-line>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
+							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+						</comProductDetailCard>
+					</view>
+					<u-line />
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<requiredLocation title="收货库位" :locationCode="toLocationCode"
+						:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
+						:locationTypeList="toLocationTypeList"></requiredLocation>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult' :title="'制品标签'" headerType="HMQ"></win-scan-pack>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import {
+		getProductReceiptJobDetail,
+		takeProductReceiptJob,
+		cancleTakeProductReceiptJob,
+		productReceiptJobsubmit
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		navigateBack,
+		getPackingNumberAndBatch,
+	} from '@/common/basic.js';
+
+	import {
+		getDirectoryItemArray,
+		getInventoryStatusName
+	} from '@/common/directory.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import winScanPack from "@/mycomponents/scan/winScanPack.vue"
+	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import comProductDetailCard from "@/pages/productReceipt/coms/comProductDetailCard.vue"
+
+
+	export default {
+		name: 'receipt_detail',
+		components: {
+			winScanButton,
+			comDetailCard,
+			requiredLocation,
+			winScanPack,
+			jobTop,
+			comProductDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				toLocationCode: '',
+				isShowPackingCode: true,
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				toLocationTypeList: [],
+				managementList: [],
+				jobStatus:""
+
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务	
+					cancleTakeProductReceiptJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeProductReceiptJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getProductReceiptJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.subList = res.data.subList;
+							that.jobStatus = res.data.status
+							that.toLocationCode = that.subList[0].toLocationCode
+							that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
+							that.detailSource = getDataSource(that.subList)
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			getScanResult(result) {
+				let label = result.label;
+				var packingNumber = label.packingNumber;
+				var batch = label.batch;
+				var qty = label.qty;
+				var itemCode = label.itemCode;
+
+				var detail = this.detailSource.find(r => r.itemCode == itemCode);
+				if (detail == undefined) {
+					this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+				} else {
+					var itemDetail = detail.subList.find(r =>
+						r.packingNumber == packingNumber &&
+						r.batch == batch);
+					if (itemDetail == undefined) {
+						this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在任务列表中")
+					} else {
+						if (itemDetail.scaned) {
+							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
+						} else {
+							itemDetail.scaned = true;
+							itemDetail.handleQty = Number(result.label.qty);
+							itemDetail.toLocationCode = this.toLocationCode;
+							itemDetail.labelQty = Number(result.label.qty);
+							calcHandleQty(this.detailSource);
+							this.continueScan()
+							this.$forceUpdate()
+						}
+
+					}
+				}
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+
+			updateData() {
+				calcHandleQty(this.detailSource);
+			},
+
+
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.showMessageHint('请扫描收货库位', callback => {
+						this.$refs.comScanLocation.showLocation();
+					})
+
+					return isPass = false;
+				}
+				return isPass;
+			},
+
+			showMessageHint(hint, callback) {
+				this.$refs.comMessage.showErrorMessage(hint, res => {
+					if (res) {
+						callback()
+					}
+				});
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//校验库位、
+				if (!this.checkLocation()) {
+					return
+				}
+
+
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList
+							.length +
+							"]");
+					}
+				}
+
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams();
+						console.log("提交参数", JSON.stringify(params));
+						productReceiptJobsubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成制品收货记录<br>" + res.data, )
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							detail.toContainerNumber = '';
+							detail.toInventoryStatus = detail.inventoryStatus
+							detail.toLocationCode = this.toLocationCode
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/pages/productReceipt/job/productReceiptJob.vue b/pages/productReceipt/job/productReceiptJob.vue
new file mode 100644
index 0000000..c5e524a
--- /dev/null
+++ b/pages/productReceipt/job/productReceiptJob.vue
@@ -0,0 +1,287 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-product-job-card :dataContent="item" @click='openJobDetail(item)'></com-product-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+			<comMessage ref="comMessage"></comMessage>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getProductReceiptJobList,
+		cancleTakeProductReceiptJob
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+
+	import comProductJobCard from '@/pages/productReceipt/coms/comProductJobCard.vue'
+	import jobListPopup from '@/pages/productReceipt/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/productReceipt/coms/jobInfoPopup.vue'
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comProductJobCard,
+			jobListPopup,
+			jobInfoPopup
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList("refresh")
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+		
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+		
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+				
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getProductReceiptJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("制品收货(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("制品收货");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './productReceiptDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.jobListPopup.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeProductReceiptJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getProductReceiptJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/productReceipt/record/productReceiptRecord.vue b/pages/productReceipt/record/productReceiptRecord.vue
new file mode 100644
index 0000000..91c9dff
--- /dev/null
+++ b/pages/productReceipt/record/productReceiptRecord.vue
@@ -0,0 +1,494 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='openScanPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<com-product-record :dataContent="item" :index="index" @removeItem="removeItem(index,item)"
+								@updateData="updateData" @removePack="removePack">
+							</com-product-record>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<view class="uni-flex uni-row  u-col-center">
+							<text style="font-size: 32rpx;">位置 : </text>
+							<view class="uni-flex u-col-center uni-row" @click="showSelect">
+								<view class="" style="margin-left: 20rpx;">
+									{{positionInfo}}
+								</view>
+								<u-select v-model="show" mode="mutil-column-auto" :list="positionList"
+									@confirm="confirmSelect"></u-select>
+							</view>
+
+						</view>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult' title="制品标签" headerType="HMQ"></win-scan-pack>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		productionReceiptRecordSubmit,
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+	import {
+		goHome,
+		getPackingNumberAndBatchByList,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+	
+	import { Decimal } from 'decimal.js';//引入
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comProductRecord from '@/pages/productReceipt/coms/comProductRecord.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			comProductRecord,
+			requiredLocation,
+			comBlankView,
+		},
+		data() {
+			return {
+				detailSource: [], //绑定在页面上的数据源
+				toLocationTypeList: [],
+				toLocationInfo: {},
+				toLocationCode: "",
+				fromLocationTypeList: [],
+				fromLocationCode: "",
+				businessType: {},
+				dataContent: {},
+				managementList: [],
+				show: false,
+				positionInfo: "请选择位置",
+				positionList: [],
+				productionLineCode: '',
+				rawLocationCode: "",
+				fgLocationCode: "",
+				workshopCode: "",
+				workStationCode: "",
+				workShopName: "",
+				productionLineName: "",
+				workStationName: "",
+			};
+		},
+		onLoad(option) {
+			var typeCode = "ProductReceipt"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.openScanPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+			getWorkShopLineStation().then(res => {
+				this.positionList = res.data
+			}).catch(error => {
+
+			})
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+		methods: {
+			getScanResult(result) {
+				let label = result.label;
+				let pack = result.package;
+
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == label.itemCode) {
+						return res
+					}
+				})
+
+				if (item == undefined) {
+					var itemp = this.createItemInfo(label, pack);
+					let newDetail = this.createDetailInfo(label, pack);
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == label.packingNumber &&
+							r.batch == label.batch) {
+							return r;
+						}
+					})
+
+					if (detail == undefined) {
+						let newDetail = this.createDetailInfo(label, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + label.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+			},
+
+			createItemInfo(label, pack) {
+				let item = {
+					itemCode: label.itemCode,
+					itemName: pack.itemName,
+					stdPackQty: pack.stdPackQty,
+					stdPackUnit: pack.stdPackUnit,
+					qty: new Decimal(label.qty).toNumber(),
+					handleQty: new Decimal(0).toNumber(),
+					uom: pack.uom,
+					subList: []
+				}
+				return item;
+			},
+
+			createDetailInfo(label, pack) {
+				let detail = deepCopyData(label);
+				detail.scaned = true;
+				detail.qty = new Decimal(label.qty).toNumber();
+				detail.handleQty = new Decimal(label.qty).toNumber();
+				detail.inventoryStatus = "OK"
+				detail.stdPackQty = pack.stdPackQty;
+				detail.stdPackUnit = pack.stdPackUnit;
+
+				detail.package = pack;
+				detail.label = label;
+				return detail;
+			},
+
+			calcHandleQty() {
+				for (let item of this.detailSource) {
+					item.handleQty = new Decimal(0).toNumber();
+					for (let detail of item.subList) {
+						if (detail != undefined) {
+							item.handleQty = calc.add(item.handleQty,detail.handleQty)
+						}
+					}
+				}
+				this.scanPopupGetFocus();
+				this.$forceUpdate();
+			},
+
+
+			updateData() {
+				this.calcHandleQty();
+			},
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			commit() {
+				if (this.positionInfo == "请选择位置") {
+					this.showMessage("请先选择位置")
+					return;
+				}
+
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					this.managementList = [];
+					var precisionStrategParams = this.setPrecisionStrategParams()
+
+					getPrecisionStrategyList(precisionStrategParams, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							var params = this.setParams()
+							console.log("提交" + JSON.stringify(params))
+							productionReceiptRecordSubmit(params).then(res => {
+								uni.hideLoading()
+								if (res.data) {
+									this.showCommitSuccessMessage("提交成功<br>生成制品收货记录<br>" + res.data)
+								} else {
+									this.showErrorMessage("提交失败[" + res.msg + "]")
+								}
+							}).catch(error => {
+								uni.hideLoading()
+								this.showErrorMessage(error)
+							})
+
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+					})
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+
+			},
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.fgLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setParams() {
+
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var submitItem = deepCopyData(detail)
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+
+							submitItem.inventoryStatus = detail.inventoryStatus;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.toPackingNumber = info.packingNumber;
+
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+
+							submitItem.fromBatch = info.batch;
+							submitItem.toBatch = info.batch;
+
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+
+							submitItem.productionlineCode = this.productionLineCode;
+							submitItem.workStationCode = this.workStationCode;
+
+							submitItem.qty = detail.handleQty;
+							submitItem.package = "";
+
+							subList.push(submitItem)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.workshopCode = this.workshopCode;
+				return this.dataContent;
+			},
+
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
+			},
+			clearData() {
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {};
+				this.positionInfo = "请选择位置";
+				this.fgLocationCode = ""
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			updateData() {
+				this.calcHandleQty();
+			},
+			showSelect() {
+				this.show = !this.show
+
+			},
+			confirmSelect(e) {
+				this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
+				console.log("位置", this.positionInfo)
+				this.workshopCode = e[0].value
+				this.productionLineCode = e[1].value
+				this.workStationCode = e[2].value
+				this.workShopName = e[0].label
+				this.productionLineName = e[1].label
+				this.workStationName = e[2].label
+
+				let shop = this.positionList.find(shop => shop.value == this.workshopCode);
+				if (shop != undefined && shop.children != undefined) {
+					let prodLine = shop.children.find(line => line.value == this.productionLineCode);
+					if (prodLine != undefined && prodLine.children != undefined) {
+						let station = prodLine.children.find(r => r.value == this.workStationCode);
+						if (station.rawLocationCode == '' && station.rawLocationCode == null) {
+							this.showErrorMessage(this.workStationName + "的原材料库位为空,请重新选择")
+							return;
+						} else {
+							this.rawLocationCode = station.rawLocationCode;
+							this.fgLocationCode = station.fgLocationCode;
+						}
+					} else {
+						this.showErrorMessage("生产线-工位基础信息维护错误")
+					}
+				} else {
+					this.showErrorMessage("车间-生产线基础信息维护错误")
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/productionReceipt/coms/comProductionDetailCard.vue b/pages/productionReceipt/coms/comProductionDetailCard.vue
new file mode 100644
index 0000000..4c56737
--- /dev/null
+++ b/pages/productionReceipt/coms/comProductionDetailCard.vue
@@ -0,0 +1,121 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend :detail="item" ></recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<balance-qty-edit ref="qtyEdit" :dataContent="editItem" :settingParam="settingParam"
+			:handleQty="editItem.record.qty" @confirm="confirm"></balance-qty-edit>
+		<job-detail-popup ref="receiptHint" :dataContent="showItem"></job-detail-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			recommendQtyEdit,
+			balanceQtyEdit,
+			jobDetailPopup,
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.qtyEdit.openEditPopup(item.balance, item.record.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.record = {}
+							item.balance = {}
+							item.inventoryStatus = item.RecommendInventoryStatus
+							// item.record.qty = 0;
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.record.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productionReceipt/coms/comProductionJobCard.vue b/pages/productionReceipt/coms/comProductionJobCard.vue
new file mode 100644
index 0000000..5a09851
--- /dev/null
+++ b/pages/productionReceipt/coms/comProductionJobCard.vue
@@ -0,0 +1,43 @@
+<template>
+ 	<job-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				<view class="">
+ 					发料任务单号:{{dataContent.issueJobNumber}}
+ 				</view>
+ 			</view>
+ 			<view class="task_text">
+ 				<view class="">
+ 					车间:{{dataContent.workshopCode}}
+ 				</view>
+ 			</view>
+ 		</view>
+ 	</job-com-main-card>
+ </template>
+
+ <script>
+ 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			jobComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/productionReceipt/coms/comProductionRecord.vue b/pages/productionReceipt/coms/comProductionRecord.vue
new file mode 100644
index 0000000..0965c8c
--- /dev/null
+++ b/pages/productionReceipt/coms/comProductionRecord.vue
@@ -0,0 +1,194 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="removeItem($event,dataContent)" :right-options="removeOptions">
+							<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"
+								:isShowBalance="true"></item-qty>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item,index)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<!-- 	<balance :dataContent="item" :isShowStdPack="false" :isShowPack="true"
+								:isShowLocation="true"></balance> -->
+							<production-label :dataContent="item" :packageContent="item.package" :isShowStdPack="false"></production-label>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<u-line color="#D8D8D8"></u-line>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<balanceQtyEdit ref="balanceQtyEdit" @confirm="confirm"></balanceQtyEdit>
+		<job-detail-popup ref="winHint" :dataContent="showItem"></job-detail-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import productionLabel from '@/mycomponents/balance/productionLabel.vue'
+ 
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getClearOption
+	} from '@/common/array.js';
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			jobDetailPopup,
+			productionLabel,
+			balanceQtyEdit,
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			fromInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			toInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					if(this.dataContent.subList.length>0){
+						if(this.$refs.collapse1!=undefined){
+							this.$nextTick(res=>{
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {},
+				detailOptions: [],
+				scanOptions: [],
+				removeOptions: [],
+				dataList: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+			this.removeOptions =getClearOption();
+		},
+
+		methods: {
+			removeItem(e,dataContent){
+				if (e.content.text == "清空") {
+					this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
+						res => {
+							if (res) {
+								this.$emit('removeItem')
+								// this.$emit('removeItem', this.dataContent)
+							}
+						});
+				}
+			},
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+
+			edit(item) {
+				this.editItem = item;
+				this.$refs.balanceQtyEdit.openEditPopup(this.editItem, this.editItem.qty);
+			},
+
+			remove(item, index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							this.dataContent.subList.splice(index, 1)
+							this.$emit('updateData')
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.qty = qty;
+				this.$emit('updateData')
+			},
+			detail(item) {
+				this.showItem = item;
+				this.dataList = [{
+						title: "箱码",
+						content: item.packingNumber
+					},
+					{
+						title: "批次",
+						content: item.batch
+					},
+					{
+						title: "库位",
+						content: item.locationCode
+					},
+					{
+						title: "数量",
+						content: item.qty
+					},
+					{
+						title: "单位",
+						content: item.uom
+					}
+				]
+				this.$refs.winHint.openScanPopup()
+			},
+			remove(item,index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							this.dataContent.subList.splice(index, 1)
+							this.$emit('removePack')
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productionReceipt/coms/detailInfoPopup.vue b/pages/productionReceipt/coms/detailInfoPopup.vue
new file mode 100644
index 0000000..ca7f783
--- /dev/null
+++ b/pages/productionReceipt/coms/detailInfoPopup.vue
@@ -0,0 +1,61 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">生产线代码 : </text>
+							<text class="text_wrap">{{dataContent.productionLineCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">工位代码 : </text>
+							<text class="text_wrap">{{dataContent.workStationCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">在途库库位 : </text>
+							<text class="text_wrap">{{dataContent.onTheWayLocationCode}} </text>
+						</view>
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productionReceipt/coms/jobInfoPopup.vue b/pages/productionReceipt/coms/jobInfoPopup.vue
new file mode 100644
index 0000000..005efdb
--- /dev/null
+++ b/pages/productionReceipt/coms/jobInfoPopup.vue
@@ -0,0 +1,62 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">发料任务单号 : </text>
+							<text class="text_wrap">{{dataContent.issueJobNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">车间代码 : </text>
+							<text class="text_wrap">{{dataContent.workshopCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">使用在途库 : </text>
+							<text class="text_wrap">{{dataContent.使用在途库}} </text>
+						</view>
+					</view>
+				</view>
+				<u-line></u-line>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productionReceipt/coms/jobListPopup.vue b/pages/productionReceipt/coms/jobListPopup.vue
new file mode 100644
index 0000000..79eff27
--- /dev/null
+++ b/pages/productionReceipt/coms/jobListPopup.vue
@@ -0,0 +1,47 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-production-job-card :dataContent="item" @click='selectItem(item)'></com-production-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	import comProductionJobCard from '@/pages/productionReceipt/coms/comProductionJobCard.vue'
+	
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comProductionJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productionReceipt/job/productionReceiptDetail.vue b/pages/productionReceipt/job/productionReceiptDetail.vue
new file mode 100644
index 0000000..8570d82
--- /dev/null
+++ b/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -0,0 +1,544 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-main">
+			<view class="page-header">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<view class="header_item">
+					发料任务单号 : {{jobContent.issueJobNumber}}
+				</view>
+				<u-line color="#D8D8D8"></u-line>
+			</view>
+			<scroll-view scroll-y="true">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
+							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
+							:locationTypeList='tolocationTypeList'>
+						</com-detail-card>
+						<u-line />
+					</view>
+
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 1"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import {
+		getProductionReceiptJobDetail,
+		getBasicLocationByCode,
+		takeProductionReceiptJob,
+		cancleTakeProductionReceiptJob,
+		productionReceiptJobSubmit
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		updateTitle,
+		navigateBack,
+		getCurrDateTime,
+		getPackingNumberAndBatch,
+		getInventoryStatusName
+	} from '@/common/basic.js';
+	import {
+		getDataSource,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+	import {
+		getLocationTypeArray
+	} from '@/common/array.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+
+	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
+	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPackAndLocation,
+			requiredLocation,
+			comDetailCard,
+			detailInfoPopup,
+			comIssueRequestInfo,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				managementList: [],
+				fromLocationCode: "",
+				toLocationCode: "",
+				tolocationTypeList: [],
+				jobStatus:""
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务
+					cancleTakeProductionReceiptJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+		},
+
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeProductionReceiptJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getProductionReceiptJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status
+							that.subList = res.data.subList;
+							that.fromLocationCode = that.subList[0].fromLocationCode
+							that.toLocationCode = that.subList[0].toLocationCode
+							that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
+							that.detailSource = getDataSource(that.subList)
+							// updateTitle(this.jobContent.number);
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource);
+				this.continueScan()
+				this.$forceUpdate();
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			openDetail(item) {
+				this.$refs.detailInfoPopup.openPopup(item)
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			getScanResult(result) {
+				try {
+					var supplierCode = result.label.supplierCode;
+					if (supplierCode == '' || supplierCode == undefined) {
+						// this.showErrorMessage("标签中未解析到供应商信息,请重新扫描")
+						// return;
+					}
+					var packingNumber = result.balance.packingNumber;
+					var batch = result.balance.batch;
+					var qty = result.balance.qty;
+					var itemCode = result.balance.itemCode;
+					var locationCode = result.balance.locationCode;
+					var inventoryStatus = result.balance.inventoryStatus;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch &&
+								r.fromLocationCode == locationCode
+						})
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
+								"]不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
+									"]已经扫描")
+							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,是否继续上架?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.supplierCode = supplierCode
+													itemDetail.handleQty = Number(result.balance.qty)
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty)
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									} else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.supplierCode = supplierCode
+									itemDetail.handleQty = Number(result.balance.qty)
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+									itemDetail.balance = result.balance;
+									itemDetail.balance.balanceQty = Number(result.balance.qty)
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+				} catch (e) {
+					this.showMessage(e.message)
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//校验库位、
+				if (!this.checkLocation()) {
+					return
+				}
+
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this
+							.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.showMessageHint('请扫描目库位', callback => {
+						this.$refs.comScanLocation.showLocation();
+					})
+
+					return isPass = false;
+				}
+				return isPass;
+			},
+
+			showMessageHint(hint, callback) {
+				this.$refs.comMessage.showErrorMessage(hint, res => {
+					if (res) {
+						callback()
+					}
+				});
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams()
+						console.log("提交参数", JSON.stringify(params));
+
+						productionReceiptJobSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成发料接收记录" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							detail.toContainerNumber = "";
+							detail.toLocationCode = this.toLocationCode;
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/productionReceipt/job/productionReceiptJob.vue b/pages/productionReceipt/job/productionReceiptJob.vue
new file mode 100644
index 0000000..f5ed5c5
--- /dev/null
+++ b/pages/productionReceipt/job/productionReceiptJob.vue
@@ -0,0 +1,288 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-production-job-card :dataContent="item" @click='openJobDetail(item)'>
+						</com-production-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+
+			<uni-load-more :status="loadingType" />
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getProductionReceiptJobList,
+		cancleTakeProductionReceiptJob
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+
+	import comProductionJobCard from '@/pages/productionReceipt/coms/comProductionJobCard.vue'
+	import jobListPopup from '@/pages/productionReceipt/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/productionReceipt/coms/jobInfoPopup.vue'
+
+	export default {
+		name: 'productionReceipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comProductionJobCard,
+			jobListPopup,
+			jobInfoPopup
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+				
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+
+				getProductionReceiptJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("生产收料(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					this.loadingType = "";
+					updateTitle("生产收料");
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './productionReceiptDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.jobListPopup.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeProductionReceiptJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getProductionReceiptJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/productionReceipt/record/productionReceiptRecord.vue b/pages/productionReceipt/record/productionReceiptRecord.vue
new file mode 100644
index 0000000..d373181
--- /dev/null
+++ b/pages/productionReceipt/record/productionReceiptRecord.vue
@@ -0,0 +1,370 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
+								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
+				:locationTypeList="tolocationTypeList"></requiredLocation>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		productionReceiptRecordSubmit,
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				received: false,
+				isShowPackingCode: true,
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				businessTypeInfo: {},
+				fromLocationCode: "",
+				toLocationCode: "",
+				isShowLocation: false,
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				allowModifyLocation: false,
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {}
+			};
+		},
+		onLoad(option) {
+			var typeCode = "ProductionReceipt"
+
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				calcHandleQty(this.detailSource);
+			},
+
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			updateData() {
+				calcHandleQty(this.detailSource);
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+
+			},
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+
+			},
+
+			commit() {
+				if (this.toLocationCode == "") {
+					this.showMessage("请先选择目标库位")
+					return;
+				}
+				//允许部分提交
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var params = this.setParams();
+				console.log("提交" + JSON.stringify(params))
+				// productionReceiptRecordSubmit(params).then(res => {
+				// 	uni.hideLoading()
+				// 	if (res.data) {
+				// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data, )
+				// 	} else {
+				// 		this.showErrorMessage("提交失败[" + res.msg + "]")
+				// 	}
+				// }).catch(error => {
+				// 	uni.hideLoading()
+				// 	this.showErrorMessage(error)
+				// })
+
+			},
+
+			setParams() {
+				var subList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							// var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+							// 	detail.packingNumber, detail.batch);
+							// 	detail.toPackingNumber =info.packingNumber;
+							// 	detail.toBatch =info.batch;
+							subList.push(detail)
+						}
+					})
+				})
+				return subList;
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				if (this.fromLocationCode == code) {
+					uni.showToast({
+						title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+						duration: 2000
+					})
+					return
+				}
+				this.ToLocationCodeInfo = location;
+				this.toLocationCode = code;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.fromLocationCode = '';
+					this.toLocationCode =""
+
+				})
+			},
+
+			updateData() {
+				calcHandleQty(this.detailSource);
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/productionReturn/coms/comReturn.vue b/pages/productionReturn/coms/comReturn.vue
new file mode 100644
index 0000000..b879d6e
--- /dev/null
+++ b/pages/productionReturn/coms/comReturn.vue
@@ -0,0 +1,512 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='openScanPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<comReturnRecord :dataContent="item" :index="index" @removeItem="removeItem(index,item)"
+								@updateData="updateData" @removePack="removePack">
+							</comReturnRecord>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<view class="uni-flex uni-row  u-col-center">
+							<text style="font-size: 32rpx;">位置 : </text>
+							<view class="uni-flex u-col-center uni-row" @click="showSelect">
+								<view class="" style="margin-left: 20rpx;">
+									{{positionInfo}}
+								</view>
+								<u-select v-model="show" mode="mutil-column-auto" :list="positionList"
+									@confirm="confirmSelect"></u-select>
+							</view>
+
+						</view>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult' title="箱标签" headerType="HPQ"></win-scan-pack>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		productionReturnRecordSubmit,
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		getPackingNumberAndBatchByList
+	} from '@/common/basic.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comReturnRecord from '@/pages/productionReturn/coms/comReturnRecord.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+
+
+	export default {
+		name: 'comReturn',
+		components: {
+			winScanButton,
+			// comReturnRecord,
+			requiredLocation,
+			comBlankView,
+			comReturnRecord,
+			winScanPack
+		},
+		props: {
+			returnType: {
+				type: String,
+				default: ""
+			},
+			businessTypeCode: {
+				type: String,
+				default: "Move"
+			}, //业务类型
+
+		},
+
+		watch: {},
+
+		data() {
+			return {
+				id: '',
+				dataContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				fromLocationCode: '',
+				fromLocationTypeList: [],
+				toLocationCode: '',
+				tolocationTypeList: [],
+				businessType: {},
+				inventoryStatus: '',
+				managementList: [],
+				show: false,
+				positionInfo: "请选择位置",
+				positionList: [],
+				productionLineCode: '',
+				rawLocationCode: "",
+				fgLocationCode: "",
+				workshopCode: "",
+				workStationCode: "",
+				workShopName: "",
+				productionLineName: "",
+				workStationName: "",
+
+			};
+		},
+		onLoad() {},
+		mounted() {
+			getBusinessType(this.businessTypeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.openScanPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+			getWorkShopLineStation().then(res => {
+				this.positionList = res.data
+			}).catch(error => {
+
+			})
+
+
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh();
+		},
+
+		methods: {
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			getScanResult(result) {
+				let label = result.label;
+				let pack = result.package;
+
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == label.itemCode) {
+						return res
+					}
+				})
+
+				if (item == undefined) {
+					var itemp = this.createItemInfo(label, pack);
+					let newDetail = this.createDetailInfo(label, pack);
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == label.packingNumber &&
+							r.batch == label.batch) {
+							return r;
+						}
+					})
+
+					if (detail == undefined) {
+						let newDetail = this.createDetailInfo(label, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + label.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+			},
+			createItemInfo(label, pack) {
+				let item = {
+					itemCode: label.itemCode,
+					itemName: pack.itemName,
+					stdPackQty: pack.stdPackQty,
+					stdPackUnit: pack.stdPackUnit,
+					qty: Number(label.qty),
+					handleQty: 0,
+					uom: pack.uom,
+					subList: []
+				}
+				return item;
+			},
+
+			createDetailInfo(label, pack) {
+				let detail = {};
+				Object.assign(detail, label)
+				detail.scaned = true;
+				detail.qty = Number(label.qty);
+				detail.inventoryStatus = this.businessTypeCode == 'ReturnToStore' ? "OK" : "HOLD"
+				detail.stdPackQty = pack.stdPackQty;
+				detail.stdPackUnit = pack.stdPackUnit;
+				detail.handleQty = 0;
+				detail.package = pack;
+				detail.label = label;
+				return detail;
+			},
+
+			calcHandleQty() {
+				for (let item of this.detailSource) {
+					item.qty = 0;
+					for (let detail of item.subList) {
+						if (detail != undefined) {
+							item.qty = calc.add(item.qty, detail.qty)
+						}
+					}
+				}
+				this.scanPopupGetFocus();
+				this.$forceUpdate();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			showSelect() {
+				this.show = !this.show
+			},
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			removeData(item) {
+				for (let i = 0; i < this.detailSource.length; i++) {
+					if (this.detailSource[i].itemCode == item.itemCode) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			commit() {
+				if (this.positionInfo == "请选择位置") {
+					this.showMessage("请先选择位置")
+					return;
+				}
+
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					this.managementList = [];
+					var precisionStrategParams = this.setPrecisionStrategParams()
+
+					getPrecisionStrategyList(precisionStrategParams, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							var params = this.setParams()
+							console.log("提交" + JSON.stringify(params))
+							productionReturnRecordSubmit(params).then(res => {
+								uni.hideLoading()
+								if (res.data) {
+									this.showCommitSuccessMessage("提交成功<br>生成退料收货记录<br>" + res.data)
+								} else {
+									this.showErrorMessage("提交失败[" + res.msg + "]")
+								}
+							}).catch(error => {
+								uni.hideLoading()
+								this.showErrorMessage(error)
+							})
+
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+					})
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+
+
+			},
+
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.fgLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setParams() {
+
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							detail.itemCode = detail.itemCode;
+							detail.itemName = detail.package.itemName;
+							detail.itemDesc1 = detail.package.itemDesc1;
+							detail.itemDesc2 = detail.package.itemDesc2;
+
+							detail.inventoryStatus = detail.inventoryStatus;
+
+							detail.fromPackingNumber = info.packingNumber;
+							detail.toPackingNumber = info.packingNumber;
+
+							detail.fromContainerNumber = detail.containerNumber;
+							detail.toContainerNumber = detail.containerNumber
+
+							detail.fromBatch = info.batch;
+							detail.toBatch = info.batch;
+
+							detail.fromLocationCode = detail.locationCode;
+							detail.toLocationCode = detail.toLocationCode;
+
+							detail.productionlineCode = this.productionLineCode;
+							detail.workStationCode = this.workStationCode;
+
+
+							subList.push(detail)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.workshopCode = this.workshopCode;
+				this.dataContent.businessType = this.businessTypeCode;
+				return this.dataContent;
+			},
+
+
+
+
+
+			showMessage(message) {
+				this.scanPopupLoseFocus();
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showErrorMessage(message) {
+				this.scanPopupLoseFocus();
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
+			},
+			clearData() {
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {};
+				this.positionInfo = "请选择位置";
+				this.fgLocationCode = ""
+			},
+			confirmSelect(e) {
+				this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
+				console.log("位置", this.positionInfo)
+				this.workshopCode = e[0].value
+				this.productionLineCode = e[1].value
+				this.workStationCode = e[2].value
+				this.workShopName = e[0].label
+				this.productionLineName = e[1].label
+				this.workStationName = e[2].label
+
+				let shop = this.positionList.find(shop => shop.value == this.workshopCode);
+				if (shop != undefined && shop.children != undefined) {
+					let prodLine = shop.children.find(line => line.value == this.productionLineCode);
+					if (prodLine != undefined && prodLine.children != undefined) {
+						let station = prodLine.children.find(r => r.value == this.workStationCode);
+						if (station.rawLocationCode == '' && station.rawLocationCode == null) {
+							this.showErrorMessage(this.workStationName + "的原材料库位为空,请重新选择")
+							return;
+						} else {
+							this.rawLocationCode = station.rawLocationCode;
+							this.fgLocationCode = station.fgLocationCode;
+						}
+					} else {
+						this.showErrorMessage("生产线-工位基础信息维护错误")
+					}
+				} else {
+					this.showErrorMessage("车间-生产线基础信息维护错误")
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/productionReturn/coms/comReturnCommonRequest.vue b/pages/productionReturn/coms/comReturnCommonRequest.vue
new file mode 100644
index 0000000..7b545bb
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnCommonRequest.vue
@@ -0,0 +1,426 @@
+<template>
+	<view>
+		<com-empty-view v-if="requestList.length==0"></com-empty-view>
+		<request-filter ref="filter" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
+			:checkedWaitTask="checkedWaitTask">
+		</request-filter>
+		<view v-if="requestList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in requestList" :key="index">
+					<uni-swipe-action-item :right-options="item.options" @click="swipeClick($event,item)">
+						<com-return-request-card :dataContent="item" @click='openRequestDetail(item)'>
+						</com-return-request-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+			<uni-load-more :status="loadingType" />
+			<request-info-popup ref='requestInfoPopup'></request-info-popup>
+		</view>
+		<requestButton @goScan='openScanDetailPopup'></requestButton>
+	</view>
+	<comMessage ref="comMessage"></comMessage>
+</template>
+
+<script>
+	import requestFilter from '@/mycomponents/request/requestFilter.vue'
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comReturnRequestCard from '@/pages/productionReturn/coms/comReturnRequestCard.vue'
+	import requestInfoPopup from '@/pages/productionReturn/coms/requestInfoPopup.vue'
+	import requestButton from '@/mycomponents/button/requestButton.vue'
+
+	import {
+		getProductionReturnRequestList,
+		productionReturnRequestHandle,
+		productionReturnRequestSubmitApprove,
+		productionReturnRequestSubmitApproveAgree,
+		productionReturnRequestSubmitApproveRefused,
+		productionReturnRequestClose,
+		productionReturnRequestAddAgain
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		updateTitle,
+		clearTirmAndWrap
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailAndApproveOption,
+		getDetailAndApprovePassAndApproveNoOption,
+		getDetailAndHandleOption,
+		getDetailAndAddAndCloseOption,
+		getAddAgainOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			requestFilter,
+			requiredLocation,
+			comReturnRequestCard,
+			requestInfoPopup,
+			requestButton,
+		},
+		data() {
+			return {
+				requestList: [],
+				pageNo: 1,
+				pageSize: 10,
+				status: "1,2,3,4,5,6",
+				totalCount: 0,
+				checkedWaitTask: false,
+				detailOptions: [],
+				detailAndApproveOptions: [],
+				detailAndApprovePassAndApproveNoOption: [],
+				detailAndHandleOption: [],
+				detailAndAddAndCloseOption: [],
+				addAgainOption: [],
+				showOptions: [],
+				loadingType: "nomore",
+				title: "",
+				fromType: ""
+
+			};
+		},
+
+		props: {
+			businessType: {
+				type: String,
+				default: ''
+			},
+		},
+
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.addAgainOption = getAddAgainOption();
+			this.detailAndApproveOptions = getDetailAndApproveOption()
+			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
+			this.detailAndHandleOption = getDetailAndHandleOption()
+			this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
+			this.updateTitle();
+			this.getList('refresh');
+
+		},
+
+		methods: {
+			updateTitle() {
+				if (this.businessType == 'ReturnToStore') {
+					this.title = "生产合格退料申请"
+					this.fromType = "ReturnToStore"
+				} else if (this.businessType == 'ReturnToHold') {
+					this.title = "生产隔离退料申请"
+					this.fromType = "ReturnToHold"
+				}
+				updateTitle(this.title)
+			},
+
+			onShow() {
+				this.getList('refresh');
+			},
+			onReachBottom() {
+				//避免多次触发
+				if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+					return;
+				}
+				this.getList("more");
+			},
+
+			onPullDownRefresh() {
+				this.getList('refresh');
+			},
+
+			openRequestInfoPopup(item) {
+				this.$refs.requestInfoPopup.openPopup(item)
+			},
+			openRequestDetail(item) {
+				uni.navigateTo({
+					url: './requestDetail?id=' + item.id + '&businessType=' + this.businessType
+				});
+			},
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.requestList = [];
+				}
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				filters.push({
+					column: "business_type",
+					action: "==",
+					value: this.businessType
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getProductionReturnRequestList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					list.forEach(res => {
+						var options = this.updateOptions(res.status);
+						res.options = options;
+					})
+					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
+
+					this.pageNo++;
+					updateTitle(this.title + "(" + this.totalCount + ")")
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle(this.title)
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+
+			updateOptions(status) {
+				if (status == "1") {
+					this.showOptions = this.detailAndApproveOptions;
+				} else if (status == "2") {
+					this.showOptions = this.detailAndApprovePassAndApproveNoOption;
+				} else if (status == "3") {
+					this.showOptions = this.detailAndHandleOption;
+				} else if (status == "4") {
+					this.showOptions = this.detailAndAddAndCloseOption;
+				} else if (status == "5") {
+					this.showOptions = this.addAgainOption;
+				} else {
+					this.showOptions = this.detailOptions;
+				}
+				return this.showOptions
+			},
+
+			openScanDetailPopup() {
+				uni.navigateTo({
+					url: "./returnRequestCreate?fromType=" + this.fromType
+				})
+			},
+			openFilter() {
+				this.$refs.filter.openFilter();
+			},
+
+			swipeClick(e, dataContent) {
+				var text = clearTirmAndWrap(e.content.text)
+				if (text == "详情") {
+					this.openRequestInfoPopup(dataContent);
+				} else if (text == "处理") {
+					this.showQuestionMessage("确定要处理当前申请吗?", res => {
+						this.productionReturnRequestHandle(dataContent.id)
+					})
+				} else if (text == "提交审批") {
+					this.showQuestionMessage("确定要审批当前申请吗?", res => {
+						this.productionReturnRequestSubmitApprove(dataContent.id)
+					})
+				} else if (text == "审批通过") {
+					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
+						this.productionReturnRequestSubmitApproveAgree(dataContent.id)
+					})
+				} else if (text == "审批驳回") {
+					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
+						this.productionReturnRequestSubmitApproveRefused(dataContent.id)
+					})
+				} else if (text == "关闭") {
+					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
+						this.productionReturnRequestClose(dataContent.id)
+					})
+				} else if (text == "重新添加") {
+					this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
+						this.productionReturnRequestAddAgain(dataContent.id)
+					})
+				}
+			},
+
+			showQuestionMessage(hint, callBack) {
+				this.$refs.comMessage.showQuestionMessage(hint,
+					res => {
+						if (res) {
+							callBack()
+						}
+					});
+			},
+
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getProductionReturnRequestList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openRequestDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			productionReturnRequestSubmitApprove(id) {
+				productionReturnRequestSubmitApprove(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请提交审批成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请提交审批失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+
+			},
+			productionReturnRequestClose(id) {
+				productionReturnRequestClose(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请关闭成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请关闭失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			productionReturnRequestSubmitApproveAgree(id) {
+				productionReturnRequestSubmitApproveAgree(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批通过成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批通过失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			productionReturnRequestSubmitApproveRefused(id) {
+				productionReturnRequestSubmitApproveRefused(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批驳回成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批驳回失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			productionReturnRequestHandle(id) {
+				productionReturnRequestHandle(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请处理成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请处理失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			productionReturnRequestAddAgain(id) {
+				productionReturnRequestAddAgain(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请重新添加成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请重新添加失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productionReturn/coms/comReturnDetailCard.vue b/pages/productionReturn/coms/comReturnDetailCard.vue
new file mode 100644
index 0000000..eec41e6
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnDetailCard.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty"></itemCompareQty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend :detail="item" :isShowLocation="false" :isShowFromLocation="false"  :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<u-line color="#D8D8D8"></u-line>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+
+		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam"
+			 @confirm="confirm">
+		</recommend-qty-edit>
+		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
+			:locationTypeList="locationTypeList"></win-scan-location>
+		<returnDetailInfoPopup ref="jobDetailPopup" :dataContent="showItem"></returnDetailInfoPopup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue'
+	import returnDetailInfoPopup from '@/pages/productionReturn/coms/returnDetailInfoPopup.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	
+	import {
+		getDetailOption,
+		getPurchaseReceiptOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			itemCompareQty,
+			recommend,
+			recommendQtyEdit,
+			jobDetailPopup,
+			returnDetailInfoPopup,
+			winScanLocation
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			locationTypeList: {
+				type: Array,
+				default: []
+			},
+			
+			
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined && this.$refs.collapse1 != null) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		data() {
+			return {
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				locatonItem:{},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty,this.settingParam.allowModifyLocation)
+			}
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				}  else if (e.content.text == "库位") {
+					this.showLocation(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty,item.labelQty);
+			},
+			showLocation(item) {
+				this.locatonItem =item;
+				this.$refs.scanLocationCode.openScanPopup();
+			},
+			//扫描源库位
+			getLocation(location, code) {
+				this.locatonItem.toLocationCode =code;
+				this.$emit('updateData')
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.handleQty = null
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.handleQty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productionReturn/coms/comReturnJobCard.vue b/pages/productionReturn/coms/comReturnJobCard.vue
new file mode 100644
index 0000000..9f4c26e
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnJobCard.vue
@@ -0,0 +1,54 @@
+<template>
+	<job-com-main-card :dataContent="dataContent">
+		<view class="task_item">
+			<view class="task_text">
+				<view class="">
+					申请单号 : {{dataContent.requestNumber}}
+				</view>
+			</view>
+
+			<view class="task_text">
+				<view class="">
+					业务类型 : {{getBusinessTypeName(dataContent.businessType)}}
+				</view>
+			</view>
+
+		</view>
+	</job-com-main-card>
+</template>
+
+<script>
+	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+	export default {
+		components: {
+			jobComMainCard
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+			getBusinessTypeName(value) {
+				var name = "";
+				if (value == 'ReturnToStore') {
+					name = "合格退料"
+				} else if (value == 'ReturnToHold') {
+					name = "隔离退料"
+				}
+				return name;
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/productionReturn/coms/comReturnRecord.vue b/pages/productionReturn/coms/comReturnRecord.vue
new file mode 100644
index 0000000..0236cd3
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnRecord.vue
@@ -0,0 +1,177 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
+							<item-qty :dataContent="dataContent" :isShowBalanceQty="false" :isShowBalance="true"></item-qty>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item,index)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<balance :dataContent="item" :isShowStdPack="false" :isShowStatus="true" :isShowPack="true"
+								:isShowFromLocation="isShowFromLocation" :isShowToLocation="isShowToLocation"></balance>
+							<!-- <production-label :dataContent="item" :packageContent="item.package"
+								:isShowLocation="false">
+							</production-label> -->
+
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<recommend-qty-edit ref="recommendQtyEdit" :dataContent="editItem" :handleQty="editItem.qty" @confirm="confirm"
+			:isShowStatus="isShowStatus"></recommend-qty-edit>
+		<package-detail-popup ref='packageDetailPopup'>
+		</package-detail-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import productionLabel from '@/mycomponents/balance/productionLabel.vue'
+	import record from '@/mycomponents/record/record.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import packageDetailPopup from '@/mycomponents/package/packageDetailPopup.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getClearOption
+	} from '@/common/array.js';
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			packageDetailPopup,
+			productionLabel,
+			recommendQtyEdit,
+			record,
+			balance
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			fromInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			toInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: false
+			},
+			isShowToLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowFromLocation: {
+				type: Boolean,
+				default: true
+			}
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {},
+				detailOptions: [],
+				scanOptions: [],
+				removeOptions: [],
+				dataList: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+			this.removeOptions = getClearOption();
+		},
+
+		methods: {
+			removeData(e, dataContent) {
+				if (e.content.text == "清空") {
+					this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
+						res => {
+							if (res) {
+								this.$emit('removeItem')
+								// this.$emit('removeItem', this.dataContent)
+							}
+						});
+				}
+			},
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item.package)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+
+			edit(item) {
+				this.editItem = item;
+				this.$refs.recommendQtyEdit.openRecordEditPopup(item.handleQty);
+				// this.$refs.recommendQtyEdit.openEditPopup(item.qty);
+			},
+
+			detail(packageInfo) {
+				this.showItem = packageInfo;
+				this.$refs.packageDetailPopup.openPopup(packageInfo)
+			},
+			remove(item, index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							this.dataContent.subList.splice(index, 1)
+							this.$emit('removePack')
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.handleQty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productionReturn/coms/comReturnRecordTitle.vue b/pages/productionReturn/coms/comReturnRecordTitle.vue
new file mode 100644
index 0000000..d87eb49
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnRecordTitle.vue
@@ -0,0 +1,59 @@
+<template>
+	<view class="header_job_top">
+		<view class="cen_card">
+			<view class="cell_box uni-flex uni-row">
+				<view class="cell_info">
+					<view class="text_lightblue">车间</view>
+					<view>{{workshopCode}}</view>
+				</view>
+				<view class="cell_info">
+					<view class="text_lightblue">生产线</view>
+					<view>{{productionLineCode}}</view>
+				</view>
+				<view class="cell_info">
+					<view class="text_lightblue">工位</view>
+					<view>{{ workStationCode }}</view>
+				</view>
+				<view class="cell_info">
+					<view class="text_lightblue">原材料库位</view>
+					<view>{{ rawLocationCode }}</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		watch: {},
+
+		props: {
+			workshopCode: {
+				type: String,
+				default: ""
+			},
+			productionLineCode: {
+				type: String,
+				default: ""
+			},
+			workStationCode: {
+				type: String,
+				default: ""
+			},
+			rawLocationCode: {
+				type: String,
+				default: ""
+			},
+		},
+
+		methods: {}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productionReturn/coms/comReturnRequestCard.vue b/pages/productionReturn/coms/comReturnRequestCard.vue
new file mode 100644
index 0000000..cda5359
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnRequestCard.vue
@@ -0,0 +1,36 @@
+<template>
+ 	<request-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				车间代码 : {{dataContent.workshopCode}}
+ 			</view>
+ 		</view>
+ 	</request-com-main-card>
+ </template>
+
+ <script>
+ 	import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			requestComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/productionReturn/coms/comReturnRequestCreator.vue b/pages/productionReturn/coms/comReturnRequestCreator.vue
new file mode 100644
index 0000000..b6f73f6
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnRequestCreator.vue
@@ -0,0 +1,159 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<view class="uni-flex uni-column">
+			<comReturnRequestInfo :workShopCode="dataContent.workshopCode" :dataContent="dataContent">
+			</comReturnRequestInfo>
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in dataContent.subList" :key="index">
+					<uni-swipe-action-item @click="swipeClick($event,item,index)" :right-options="options">
+						<item-qty :dataContent="item" :isShowStdPack="false">
+						</item-qty>
+						<!-- <view v-if="item.batch!=''" style="margin-left: 10rpx;">
+							<batch :batch="item.batch"  ></batch>
+						</view> -->
+						
+						<u-line />
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+		</view>
+		<request-detail-info-popup ref="jobDetailPopup"></request-detail-info-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import comReturnRequestInfo from '@/pages/productionReturn/coms/comReturnRequestInfo.vue'
+	import requestDetailInfoPopup from '@/pages/issue/coms/requestDetailInfoPopup.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	
+	
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getDetailRemoveOption,
+	} from '@/common/array.js';
+
+	export default {
+		emits: ['openDetail'],
+		components: {
+			itemCompareQty,
+			recommend,
+			balanceQtyEdit,
+			itemQty,
+			comReturnRequestInfo,
+			requestDetailInfoPopup,
+			batch
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			isSwipe: {
+				type: Boolean,
+				default: true
+			},
+		},
+		watch: {
+			dataContent(newVal) {
+			},
+		},
+
+		data() {
+			return {
+				option: [],
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				detailOptions: [],
+				scanOptions: [],
+				options:[]
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getDetailRemoveOption();
+				// if (this.dataContent.allowModifyQty == 1) {
+				// 	this.scanOptions = getDetailEditRemoveOption();
+				// } else {
+				// 	this.scanOptions = getDetailRemoveOption();
+				// }
+			}
+			
+			this.options =this.scanOptions
+			// if(!this.isSwipe){
+			// 	this.options=[]
+			// }else {
+			// 	this.options =this.scanOptions
+			// }
+		},
+
+		methods: {
+			swipeClick(e, item,index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item,index)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.qtyEdit.openEditPopup(item.balance, item.record.qty);
+			},
+
+			detail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+				// this.$emit('openDetail', item);
+				// // this.showItem = item;
+				// // this.$refs.jobDetailPopup.openPopup(item)
+			},
+			remove(item,index) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							this.dataContent.subList.splice(index, 1)
+							this.$forceUpdate()
+							// this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.record.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productionReturn/coms/comReturnRequestInfo.vue b/pages/productionReturn/coms/comReturnRequestInfo.vue
new file mode 100644
index 0000000..4bed79f
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnRequestInfo.vue
@@ -0,0 +1,57 @@
+<template>
+	<view class="cen_card" style="padding: 0rpx;">
+		<view class="cell_box uni-flex uni-row">
+			<view class="cell_info">
+				<view class="text_lightblue">车间</view>
+				<view>{{workShopCode}}</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">生产线</view>
+				<view>{{dataContent.productionLineCode}}</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">工位</view>
+				<view>{{ dataContent.workStationCode }}</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">来源库位</view>
+				<view>{{ dataContent.fromLocationCode}}</view>
+			</view>
+		</view>
+		<u-line />
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			workShopCode: {
+				type: String,
+				default: ''
+			},
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
+
+
+<style>
+</style>
diff --git a/pages/productionReturn/coms/comReturnRequestPopup.vue b/pages/productionReturn/coms/comReturnRequestPopup.vue
new file mode 100644
index 0000000..1206fa2
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnRequestPopup.vue
@@ -0,0 +1,377 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup" :maskClick="false">
+			<view class="uni-flex uni-column pop_customer">
+				<view class="" style="padding:10rpx">
+					<view class="uni-flex u-col-center uni-row space-between" style="padding: 10rpx 10rpx 20rpx 10rpx">
+						<view class="" style="font-size: 35rpx;">
+							{{title}}
+						</view>
+						<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
+							@click="closeRequestPopup()"></image>
+					</view>
+					<u-line />
+					<view class="uni-flex uni-column" style="background-color: white; ">
+						<view class="uni-flex uni-column  ">
+							<view class="uni-flex uni-row padding title u-col-center">
+								<text>位置 : </text>
+								<view class="uni-flex u-col-center uni-row" @click="showSelect">
+									<view class="" style="margin-left: 20rpx;">
+										{{positionInfo}}
+									</view>
+									<u-select v-model="show" mode="mutil-column-auto" :list="positionList"
+										@confirm="confirmSelect"></u-select>
+								</view>
+
+							</view>
+							<u-line />
+
+
+							<view class="title padding" style="display: flex;">
+								<text style=" flex-shrink: 0;">物料：</text>
+								<view class="" style="width: 100% ;">
+									{{itemCode}}
+								</view>
+								<view class="">
+									<image src="/static/search.svg" mode=""
+										style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;" @click="itemCodeClick">
+									</image>
+								</view>
+
+							</view>
+
+							<u-line />
+
+							<view class="uni-flex uni-row  padding title u-col-center">
+								<text>数量 : </text>
+								<view class="uni-flex uni-row uni-center"
+									style="align-items: center;margin-left: 20rpx;">
+									<input style="text-align: center;" class="qty_input" v-model="counQty" type="number"
+										@confirm="confirm()" :focus="numberFocus"  @input="checkNum" :maxlength="maxlength" />
+									
+									<uom :uom="uom"></uom>
+									<view class="" v-if="stdPackInfo!=undefined" style="display: flex;flex-direction: row;margin-left: 10rpx;">
+										(<stdPackQty :dataContent="stdPackInfo"></stdPackQty>)
+									</view>
+
+								</view>
+							</view>
+							<u-line />
+						</view>
+					</view>
+				</view>
+				<view class="uni-flex uni-row hide_border">
+					<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button>
+					<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button>
+				</view>
+			</view>
+		</uni-popup>
+		<win-scan-item ref="scanPopup" title='物料代码' @getScanResult='getItemScanResult' :itemCodeTypeList="itemCodeTypeList">
+		</win-scan-item>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getBasicLocationByCode,
+		getBasicItemByCode,
+		getProductionlineItem,
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+	import {
+		getLocationTypeName,
+		getListLocationTypeDesc,
+		checkDirectoryItemExist
+	} from '@/common/directory.js';
+	import uom from '@/mycomponents/qty/uom.vue'
+	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
+	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
+
+
+	export default {
+		components: {
+			uom,
+			stdPackQty,
+			balanceStatus,
+			winScanItem
+		},
+		data() {
+			return {
+				// itemCode: 'CE115F11161AG',
+				workshopCode: "", //车间
+				workShopName: "",
+				productionLineCode: "", //生产线
+				productionLineName: "",
+				workStationCode: "", //工位
+				workStationName: "",
+				itemCode: '请扫描物料信息',
+				itemName: "",
+				qty: 0,
+				rawLocationCode: "",
+				fgLocationCode: "",
+				itemCodeFocus: false,
+				requestInfo: null,
+				itemCodeList: [],
+				counQty: undefined,
+				editPosition: true,
+				numberFocus: false,
+				uom: "",
+				positionInfo: "请选择位置",
+				show: false,
+				isModifiedPosition: true,
+				positionList: [],
+				maxlength:10,
+				stdPackInfo:undefined,
+				list: [{
+						value: 1,
+						label: '车间1',
+						children: [{
+								value: 2,
+								label: '生产线1',
+								children: [{
+										value: 3,
+										label: '工位1'
+									},
+									{
+										value: 4,
+										label: '工位2'
+									}
+								]
+							},
+							{
+								value: 5,
+								label: '生产线2',
+								children: [{
+										value: 6,
+										label: '工位1'
+									},
+									{
+										value: 7,
+										label: '工位2'
+									}
+								]
+							}
+						]
+					},
+					{
+						value: 8,
+						label: '车间2',
+						children: [{
+								value: 9,
+								label: '生产线1',
+								children: [{
+										value: 10,
+										label: '工位1'
+									},
+									{
+										value: 10,
+										label: '工位2'
+									}
+								]
+							}, {
+								value: 9,
+								label: '生产线2',
+								children: [{
+										value: 10,
+										label: '工位1'
+									},
+									{
+										value: 10,
+										label: '工位2'
+									}
+								]
+							},
+
+
+						]
+					}
+				]
+			}
+		},
+		props: {
+			title: {
+				type: String,
+				default: '需求信息'
+			},
+			itemCodeTypeList: {
+				type: Array,
+				default: []
+			},
+		},
+		methods: {
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //包含小数点
+				let reg = /^[0-9]+$/; //正整数
+				if (dot > -1) {
+					this.maxlength = dot + 7; //长度是小数点后两位
+					if (value.length > dot + 7) {
+			
+					}
+				}
+				if (reg.test(value)) { //如果是正整数不包含小数点
+					this.maxlength = 10;
+				}
+				this.change(value)
+			},
+			openRequestPopup(editPosition) {
+				if (this.positionList.length == 0) {
+					getWorkShopLineStation().then(res => {
+						this.positionList = res.data
+					}).catch(error => {
+
+					})
+				}
+
+				this.editPosition = editPosition;
+				if (this.isModifiedPosition) {
+					this.isModifiedPosition = false
+				} else {
+					this.itemCode = "请扫描物料信息";
+					this.uom = ""
+					this.qty = 0;
+					this.counQty = undefined
+					this.numberFocus = false
+					this.itemCodeGetFocus();
+				}
+
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closeRequestPopup() {
+				this.$refs.popup.close()
+			},
+			locationConfirm() {
+				//查询库位信息
+				this.checkLocatioCode();
+			},
+			itemCodeClick() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			itemCodeGetFocus() {
+				this.itemCodeFocus = true;
+			},
+			itemCodeLoseFocus() {
+				this.itemCodeFocus = false;
+			},
+
+			confirm() {
+				if (this.itemCode == "请扫描物料信息" ) {
+					this.showErrorMessage("请输入物料", "itemCode")
+					return
+				}
+				
+				if (this.counQty == undefined) {
+					this.showErrorMessage("请输入数量")
+					return
+				}
+				
+				if (this.qty == 0) {
+					this.showErrorMessage("数量必须大于0")
+					return
+				}
+
+				if (this.rawLocationCode == '') {
+					this.showErrorMessage(this.workStationName + "的原材料库位为空")
+					return
+				}
+				this.callback('add');
+			},
+
+			callback(action) {
+				let item = {
+					positionInfo: this.positionInfo,
+					workshopCode: this.workshopCode, //车间
+					workShopName: this.workShopName,
+					productionLineCode: this.productionLineCode, //生产线
+					productionLineName: this.productionLineName,
+					workStationCode: this.workStationCode, //工位
+					workStationName: this.workStationName,
+					rawLocationCode: this.rawLocationCode,
+					fgLocationCode: this.fgLocationCode,
+					itemCode: this.itemCode,
+					itemName: this.itemName,
+					uom: this.uom,
+					qty: this.qty
+				};
+				this.closeRequestPopup();
+				this.$emit("confirm", action, item);
+			},
+
+			showErrorMessage(message, type) {
+				setTimeout(r => {
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (type == "itemCode") {
+							this.itemCodeGetFocus();
+						} else {
+							this.numberFocus = true;
+						}
+					})
+					if (type == "itemCode") {
+						this.itemCode = "请扫描物料信息"
+					}
+				})
+			},
+			change(value) {
+				this.qty = value;
+			},
+			cancel(e) {
+				this.closeRequestPopup();
+			},
+			showSelect() {
+				if (this.editPosition) {
+					this.show = true
+				}
+
+			},
+			confirmSelect(e) {
+				this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
+				console.log("位置", this.positionInfo)
+				this.workshopCode = e[0].value
+				this.productionLineCode = e[1].value
+				this.workStationCode = e[2].value
+				this.workShopName = e[0].label
+				this.productionLineName = e[1].label
+				this.workStationName = e[2].label
+
+				let shop = this.positionList.find(shop => shop.value == this.workshopCode);
+				if (shop != undefined && shop.children != undefined) {
+					let prodLine = shop.children.find(line => line.value == this.productionLineCode);
+					if (prodLine != undefined && prodLine.children != undefined) {
+						let station = prodLine.children.find(r => r.value == this.workStationCode);
+						if (station.rawLocationCode == '' && station.rawLocationCode == null) {
+							this.showErrorMessage(this.workStationName + "的原材料库位为空,请重新选择")
+							return;
+						} else {
+							this.rawLocationCode = station.rawLocationCode;
+							this.fgLocationCode = station.fgLocationCode;
+						}
+					} else {
+						this.showErrorMessage("生产线-工位基础信息维护错误")
+					}
+				} else {
+					this.showErrorMessage("车间-生产线基础信息维护错误")
+				}
+			},
+
+			getItemScanResult(code, scanResult) {
+				this.itemCode = code;
+				this.itemName = scanResult.name
+				this.uom =scanResult.uom
+				this.stdPackInfo = scanResult.package;
+				this.numberFocus = true
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.title {
+		font-size: 30rpx;
+	}
+</style>
diff --git a/pages/productionReturn/coms/comScanReturnPack.vue b/pages/productionReturn/coms/comScanReturnPack.vue
new file mode 100644
index 0000000..b9175d3
--- /dev/null
+++ b/pages/productionReturn/coms/comScanReturnPack.vue
@@ -0,0 +1,513 @@
+<template>
+	<view>
+		<uni-popup ref="popup" :maskClick='false'>
+			<view class="">
+				<view class="popup_box">
+					<view class="pop_title">
+						扫描箱码
+						<text class="fr" @click="closeScanPopup()">关闭</text>
+					</view>
+					<!-- 	<view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						padding:20rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center">
+							位置 :
+						</view>
+						<view class="" style="width: 75%;padding: 0rpx">
+							<view class="uni-flex u-col-center uni-row" @click="showSelect">
+								<view class="" style="margin-left: 15rpx;font-size: 30rpx;">
+									{{positionInfo}}
+								</view>
+								<u-select v-model="show" mode="mutil-column-auto" :list="positionList" :defaultValue="defaultValueList"
+									@confirm="confirmSelect"></u-select>
+							</view>
+						</view>
+					</view> -->
+					<!-- <u-line class='line_color'></u-line> -->
+
+					<view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						margin-top: 8rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center" style="width: 25%; ">
+							来源库位
+						</view>
+						<view class="" style="width: 75%; padding: 8rpx;">
+							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请选择库位"
+								@confirm="fromLocationUpdate"></uni-combox>
+						</view>
+					</view>
+
+					<view class="">
+						<view class="">
+							<win-com-scan ref="comscan" placeholder="箱标签" @getResult="onScan" :clearResult="true"
+								:isShowHistory="false">
+							</win-com-scan>
+
+							<view style="width: 100%;">
+								<view style="width: 100%;" v-if="issueRecord.length>0">
+									<view class="uni-flex uni-row space-between u-col-center">
+										<view class="" style="padding: 10rpx;">
+											历史记录
+										</view>
+										<view class="" style="padding-right: 10rpx;">
+											<u-icon :name="expendIcon" size="35rpx" @click="expands()"></u-icon>
+										</view>
+									</view>
+									<u-line class='line_color' style='padding-top: 10rpx;padding-bottom: 20rpx;'>
+									</u-line>
+									<scroll-view scroll-y="true" class="scroll-view"
+										v-if="expand&&issueRecord.length>0">
+										<view class="uni-flex u-col" v-for="(record,index) in issueRecord">
+											<view style="width: 100%;">
+												<uni-swipe-action ref="swipeAction">
+													<uni-swipe-action-item @click="swipeClick($event,record,index)"
+														:right-options="scanOptions">
+														<view style="padding: 0px 10px">
+															<balance :dataContent="record" :isShowLocation="false"
+																:isShowStdPack="false"></balance>
+														</view>
+													</uni-swipe-action-item>
+												</uni-swipe-action>
+												<u-line class='line_color'></u-line>
+											</view>
+										</view>
+									</scroll-view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+		<comMessage ref="comMessage"></comMessage>
+		<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	</view>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+	import {
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getBalanceByManagementPrecision
+	} from '@/common/balance.js';
+
+	export default {
+		name: 'winScanPack',
+		components: {
+			winComScan,
+			balance,
+			balanceQtyEdit,
+			balanceSelect
+		},
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+
+		},
+		data() {
+			return {
+				dataContent: {},
+				jobContent: {},
+				expendIcon: 'arrow-down',
+				show: false,
+				scanList: [],
+				toLocation: null,
+				toLocationCode: '',
+				fromLocationList: [],
+				fromLocationCode: '',
+				fromLocation: null,
+				issueRecord: [], //发料历史
+				expand: true,
+				scanOptions: {},
+				editItem: {},
+				positionInfo: "请选择位置",
+				positionList: [],
+				defaultValueList: [],
+				fromInventoryStatuses: "",
+			}
+		},
+		created() {
+
+		},
+		watch: {},
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+		},
+		methods: {
+
+
+			openScanPopup(content, jobcontent) {
+				this.issueRecord = [];
+				this.dataContent = content;
+				this.jobContent = jobcontent;
+				this.initData();
+				// this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
+				// 	"-" + this.jobContent.subList[0].workStationCode
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+
+			closeScanPopup() {
+				this.$refs.popup.close();
+				this.$emit("closeScan")
+				//清除数据，恢复默认值
+				// Object.assign(this.$data, this.$options.data());
+			},
+
+			initData() {
+				let that = this;
+				that.fromLocationList = [];
+				if (that.dataContent != null) {
+					that.fromInventoryStatuses = this.jobContent.outInventoryStatuses
+					that.toLocation = that.dataContent[0];
+					that.toLocationCode = that.dataContent[0].toLocationCode;
+					that.fromLocationList = that.getFromLocationList();
+				}
+			},
+			showBalanceSelect(items) {
+				this.$refs.balanceSelect.openPopup(items);
+			},
+
+			getFromLocationList() {
+				let list = [];
+				let location = this.dataContent.find(r => r.toLocationCode == this.toLocationCode);
+				if (location != undefined) {
+					location.Items.forEach(item => {
+						item.Locations.forEach(f => {
+							list.push(f.fromLocationCode)
+						})
+					})
+					this.fromLocationCode = list[0];
+					return list;
+				} else {
+					this.$refs.comMessage.showErrorMessages('需求库位【' + this.toLocationCode + '】不存在', res => {
+						this.toLocationCode = '';
+					});
+				}
+			},
+
+			fromLocationUpdate(fromlocation) {
+				let location = this.fromLocationList.find(r => r == fromlocation)
+				if (location == undefined) {
+					this.fromLocationCode = ''
+					this.showErrorMessage('发料库位【' + fromlocation + '】不存在')
+				}
+			},
+			onScan(result) {
+				try {
+					let that = this;
+
+					if (that.fromLocationCode == '') {
+						that.showErrorMessage('请选择来源库位', res => {
+							that.$refs.toLocationCombox.onFocus();
+						});
+						return;
+					}
+					let packageInfo = result.package;
+					let itemCode = result.label.itemCode;
+					let packingCode = result.label.packingNumber;
+					let lot = result.label.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+					if (item == undefined) {
+						that.showErrorMessage('未查找到物料【' + itemCode + '】的发料明细',
+							res => {
+								that.getfocus();
+							}
+						)
+						return;
+					} else {
+						//查找库存信息
+						uni.showLoading({
+							title: '加载中',
+							mask: true
+						})
+						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
+							balanceRes => {
+								if (balanceRes.success) {
+									if (balanceRes.data.list.length == 0) {
+										this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
+											res => {
+												this.packGetFocus();
+											})
+									} else if (balanceRes.data.list.length == 1) {
+										let balance = balanceRes.data.list[0];
+										this.afterGetBalance(result.label, balance, packageInfo);
+									} else {
+										this.showBalanceSelect(balanceRes.data.list);
+									}
+								} else {
+									this.showErrorMessage(balanceRes.message.message);
+								}
+								uni.hideLoading();
+							});
+					}
+				} catch (e) {
+					this.showErrorMessage(e.stack)
+					uni.hideLoading();
+				}
+			},
+			selectBalanceItem(balance) {
+				this.afterGetBalance(this.label, balance);
+			},
+
+			afterGetBalance(label, balance, packageInfo) {
+				try {
+					let that = this;
+					let itemCode = label.itemCode;
+					let packingCode = label.packingNumber;
+					let lot = label.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+					let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode);
+					if (fromLocation != undefined) {
+						let batch = fromLocation.Batchs.find(r => r.batch == lot);
+						if (batch != undefined) {
+							if (batch.Records == undefined) {
+								batch.Records = [];
+							}
+
+							let record = batch.Records.find(r => r.packingNumber == packingCode);
+							if (record == undefined) {
+								//如果有推荐箱码
+								if (batch.Recommends.length > 0) {
+									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
+									if (recommend != undefined) {
+										that.addRecord(batch, label, balance, packageInfo)
+									} else {
+										//允许修改箱码
+										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
+											that.addRecord(batch, label, balance, packageInfo);
+										} else {
+											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
+												res => {
+													that.getfocus();
+												}
+											)
+										}
+									}
+								} else {
+									that.addRecord(batch, label, balance, packageInfo)
+								}
+							} else {
+								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
+									res => {
+										that.getfocus();
+									}
+								)
+							}
+						} else {
+							if (this.jobContent.AllowModifyBatch == null) {
+								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
+									'】的发料明细,是否要继续发料?', res => {
+										if (res) {
+											let batch = that.createBatchInfo(label, balance);
+											fromLocation.Batchs.unshift(batch);
+										}
+									})
+							} else {
+								that.showErrorMessage('未查找到批次【' + lot + '】的发料明细',
+									res => {
+										that.getfocus();
+									});
+							}
+						}
+					} else {
+						that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发料明细',
+							res => {
+								that.getfocus();
+							}
+						)
+					}
+				} catch (e) {
+					that.showErrorMessage(e.stack,
+						res => {
+							that.getfocus();
+						}
+					)
+				}
+			},
+
+			createBatchInfo(data, balance) {
+				let batch = {
+					batch: data.lot,
+					qty: 0,
+					uom: data.uom,
+					handleQty: Number(data.qty),
+					Records: []
+				}
+				let record = this.creatRecord(data, balance);
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				return batch;
+			},
+
+			creatRecord(label, balance, packageInfo) {
+				balance.stdPackQty = packageInfo.stdPackQty
+				balance.stdPackUnit = packageInfo.stdPackUnit
+				let record = {
+					itemCode: label.itemCode,
+					packingNumber: label.packingNumber,
+					batch: label.batch,
+					qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty),
+					uom: balance.uom,
+					inventoryStatus: balance.inventoryStatus,
+					balance: balance,
+					toLocationCode: this.toLocationCode,
+					supplierCode: label.supplierCode
+				}
+				return record;
+			},
+
+			calcBatchHandleQty(batch) {
+				let handleQty = 0;
+				batch.Records.forEach(res => {
+					handleQty = calc.add(handleQty,res.qty)
+				})
+				batch.handleQty = handleQty;
+			},
+
+			addRecord(batch, label, balance, packageInfo) {
+				let record = this.creatRecord(label, balance, packageInfo);
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				this.calcBatchHandleQty(batch);
+				this.getfocus();
+			},
+
+			getfocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			losefocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+
+			expands() {
+				this.expand = !this.expand;
+				this.expendIcon = this.expand == true ? "arrow-down" : "arrow-up"
+			},
+
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				// item.balance.balanceQty = item.balance.qty;
+				item.balance.balanceQty = item.balance.qty;
+				this.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(record, index) {
+				this.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							record.qty = 0;
+							this.issueRecord.splice(index, 1)
+
+							let item = this.toLocation.Items.find(r => r.itemCode == record.itemCode);
+							if (item != undefined) {
+								item.Locations.forEach(l => {
+									let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b
+										.batch == record.batch);
+									let rIndex = batch.Records.findIndex(r => r.packingNumber == record
+										.packingNumber && r
+										.batch == record.batch);
+									batch.Records.splice(rIndex, 1);
+								})
+							}
+							this.$emit('updateData', item);
+						}
+					});
+			},
+
+			packGetFocus() {
+				this.$refs.comscan.getfocus();
+			},
+			packLoseFocus() {
+				this.$refs.comscan.losefocus();
+			},
+			showMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showMessage(message, callback);
+				})
+			},
+			showErrorMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, callback);
+
+				})
+			},
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, callback);
+				})
+			},
+			confirm(val) {
+				this.editItem.qty = Number(val);
+				this.$emit('updateData', this.editItem)
+			},
+			cancle() {
+				this.closeScanPopup()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	button {
+		border: none;
+	}
+
+	button::after {
+		border: none
+	}
+
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+		padding: 10rpx;
+	}
+</style>
diff --git a/pages/productionReturn/coms/detailInfoPopup.vue b/pages/productionReturn/coms/detailInfoPopup.vue
new file mode 100644
index 0000000..3c0d964
--- /dev/null
+++ b/pages/productionReturn/coms/detailInfoPopup.vue
@@ -0,0 +1,57 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">生产线代码 : </text>
+							<text class="text_wrap">{{dataContent.productionLineCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">工位代码 : </text>
+							<text class="text_wrap">{{dataContent.workStationCode}} </text>
+						</view>
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productionReturn/coms/jobInfoPopup.vue b/pages/productionReturn/coms/jobInfoPopup.vue
new file mode 100644
index 0000000..9188858
--- /dev/null
+++ b/pages/productionReturn/coms/jobInfoPopup.vue
@@ -0,0 +1,53 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">车间代码 : </text>
+							<text class="text_wrap">{{dataContent.workshopCode}} </text>
+						</view>
+					</view>
+				</view>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productionReturn/coms/jobListPopup.vue b/pages/productionReturn/coms/jobListPopup.vue
new file mode 100644
index 0000000..4c73872
--- /dev/null
+++ b/pages/productionReturn/coms/jobListPopup.vue
@@ -0,0 +1,47 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-return-job-card :dataContent="item" @click='selectItem(item)'></com-return-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	import comReturnJobCard from '@/pages/productionReturn/coms/comReturnJobCard.vue'
+	
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comReturnJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productionReturn/coms/requestDetailInfoPopup.vue b/pages/productionReturn/coms/requestDetailInfoPopup.vue
new file mode 100644
index 0000000..e9258a9
--- /dev/null
+++ b/pages/productionReturn/coms/requestDetailInfoPopup.vue
@@ -0,0 +1,86 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<requestDetailCommonInfo :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">生产线代码 : </text>
+							<text class="text_wrap">{{dataContent.productionLineCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">工位代码 : </text>
+							<text class="text_wrap">{{dataContent.workStationCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">包装号 : </text>
+							<text class="text_wrap">{{dataContent.packingNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">器具号 : </text>
+							<text class="text_wrap">{{dataContent.containerNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">批次 : </text>
+							<text class="text_wrap">{{dataContent.batch}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从库位代码 : </text>
+							<text class="text_wrap">{{dataContent.fromLocationCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">库存状态 : </text>
+							<text class="text_wrap">{{dataContent.inventoryStatus}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从货主代码 : </text>
+							<text class="text_wrap">{{dataContent.fromOwnerCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到货主代码 : </text>
+							<text class="text_wrap">{{dataContent.toOwnerCode}} </text>
+						</view>
+						
+					</view>
+				</view>
+			</requestDetailCommonInfo>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue'
+	export default {
+		components: {
+			requestDetailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productionReturn/coms/requestInfoPopup.vue b/pages/productionReturn/coms/requestInfoPopup.vue
new file mode 100644
index 0000000..685f2c6
--- /dev/null
+++ b/pages/productionReturn/coms/requestInfoPopup.vue
@@ -0,0 +1,73 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<request-common-info :dataContent="dataContent"  @onClose="closePopup">
+				<view class="">
+					<comListItem :dataList="dataList"></comListItem>
+				</view>
+				<u-line></u-line>
+			</request-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestCommonInfo from '@/mycomponents/request/requestCommonInfo.vue'
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+		components: {
+			requestCommonInfo,
+			comListItem
+		},
+		data() {
+			return {
+				dataContent:{},
+				dataList:[]
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				this.dataList=[{
+						title: '车间代码',
+						content: this.dataContent.wrkshopCode
+					}, {
+						title: '从仓库代码',
+						content: this.dataContent.fromWarehouseCode
+					},{
+						title: '到仓库代码',
+						content: this.dataContent.toWarehouseCode,
+					},{
+						title: '从库位类型范围',
+						content: this.dataContent.fromLocationTypes,
+						type:"locationType"
+					},{
+						title: '到库位类型范围',
+						content: this.dataContent.toLocationTypes,
+						type:"locationType"
+					},{
+						title: '从库区代码范围',
+						content: this.dataContent.fromAreaCodes,
+					},{
+						title: '到库区代码范围',
+						content: this.dataContent.toAreaCodes,
+					}];
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productionReturn/coms/returnDetailInfoPopup.vue b/pages/productionReturn/coms/returnDetailInfoPopup.vue
new file mode 100644
index 0000000..4e1973e
--- /dev/null
+++ b/pages/productionReturn/coms/returnDetailInfoPopup.vue
@@ -0,0 +1,70 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">标包数量 : </text>
+							<text class="text_wrap">{{dataContent.stdPackQty}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">标包单位 : </text>
+							<text class="text_wrap">{{getStdPackUnitInfo(dataContent.stdPackUnit)}} </text>
+						</view>
+
+					</view>
+				</view>
+				<u-line></u-line>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {getStdPackUnitInfo} from "@/common/directory.js"
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			getStdPackUnitInfo(value){
+				return getStdPackUnitInfo(value).label
+			},
+			dateFormat(value){
+				return dateFormat(value)
+			}
+			
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productionReturn/job/returnDetail.vue b/pages/productionReturn/job/returnDetail.vue
new file mode 100644
index 0000000..5cb8f22
--- /dev/null
+++ b/pages/productionReturn/job/returnDetail.vue
@@ -0,0 +1,515 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+
+			<work-station :workshopCode="jobContent.workshopCode" :productionLineCode="titleInfo.productionLineCode"
+				:workStationCode="titleInfo.workStationCode" :rawLocationCode="titleInfo.fromLocationCode">
+			</work-station>
+		</view>
+		<u-line color="#D8D8D8" ></u-line>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comReturnDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
+							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+						</comReturnDetailCard>
+					</view>
+					<u-line />
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<requiredLocation title="目标库位" :locationCode="toLocationCode"
+						:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
+						:locationTypeList="toLocationTypeList"></requiredLocation>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<!-- <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> -->
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult' headerType="HMQ,HPQ"></win-scan-pack>
+		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getProductionReturnJobDetail,
+		productionReturnJobSubmit,
+		takeProductionReturnJob,
+		cancleTakeProductionReturnJob
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		navigateBack,
+		getPackingNumberAndBatch
+	} from '@/common/basic.js';
+	import {
+		getDirectoryItemArray,
+		getInventoryStatusName
+	} from '@/common/directory.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import comReturnDetailCard from "@/pages/productionReturn/coms/comReturnDetailCard.vue"
+	import detailInfoPopup from '@/pages/productionReturn/coms/detailInfoPopup.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import workStation from '@/mycomponents/workStation/workStation.vue'
+
+	export default {
+		name: 'receipt_detail',
+		components: {
+			winScanButton,
+			requiredLocation,
+			// winScanPackAndLocation,
+			winScanPack,
+			comReturnDetailCard,
+			detailInfoPopup,
+			jobTop,
+			workStation
+		},
+		data() {
+			return {
+				id: '',
+				jobContent: {},
+				toLocationCode: '',
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				fromLocationCode: '',
+				toLocationCode: '',
+				toLocationTypeList: [],
+				toLocationInfo: {},
+				businessTypeInfo: {},
+				titleInfo: "",
+				jobStatus:""
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				// //新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务
+					cancleTakeProductionReturnJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeProductionReturnJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getProductionReturnJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status
+							that.subList = res.data.subList;
+							that.detailSource = getDataSource(that.subList)
+
+							that.fromLocationCode = that.subList[0].fromLocationCode
+							that.toLocationCode = that.subList[0].toLocationCode
+							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
+							that.titleInfo = that.subList[0];
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.continueScan();
+				this.$forceUpdate();
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			openDetail(item) {
+				this.$refs.detailInfoPopup.openPopup(item)
+			},
+
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+				// let fromlocationCode = '';
+				// let fromlocationList = [];
+				// for (var i = 0; i < this.detailSource.length; i++) {
+				// 	let item = this.detailSource[i];
+				// 	item.subList.forEach(l => {
+				// 		//重复的库位不往里面插入
+				// 		var location = fromlocationList.find(res => res == l.fromLocationCode)
+						// if (location == undefined) {
+						// 	fromlocationList.push(l.fromLocationCode);
+						// }
+				// 		//来源库位赋默认值
+				// 		if (fromlocationCode == '') {
+				// 			if (!l.scaned) {
+				// 				fromlocationCode = l.fromLocationCode;
+				// 			}
+				// 		}
+				// 	})
+				// }
+				// this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+
+
+			},
+
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch
+						})
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
+							} else {
+								itemDetail.scaned = true;
+								itemDetail.handleQty = Number(result.package.qty)
+								itemDetail.inventoryStatus = "OK"
+								itemDetail.stdPackQty = result.package.stdPackQty
+								itemDetail.stdPackUnit = result.package.stdPackUnit
+								this.calcHandleQty();
+
+
+								//合格退料时不能查库存余额,因为生产退料时新生成的批次是000000  --nxt  
+								// let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								// let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								// if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+								// 	this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+								// 		']不一致,是否继续上架?', res => {
+								// 			if (res) {
+								// 				itemDetail.scaned = true;
+								// 				itemDetail.handleQty = Number(result.balance.qty)
+								// 				itemDetail.balance = result.balance;
+								// 				itemDetail.balance.balanceQty = result.balance.qty;
+								// 				itemDetail.balance.stdPackQty = result.package.stdPackQty
+								// 				itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+								// 				this.calcHandleQty();
+								// 			} else {
+								// 				this.scanPopupGetFocus();
+								// 			}
+								// 		});
+								// } else {
+								// itemDetail.scaned = true;
+								// itemDetail.handleQty = Number(result.balance.qty)
+								// itemDetail.balance = result.balance;
+								// itemDetail.balance.balanceQty = result.balance.qty;
+								// itemDetail.balance.stdPackQty = result.package.stdPackQty
+								// itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+								// this.calcHandleQty();
+								// }
+							}
+						}
+					}
+					this.scanPopupGetFocus();
+				} catch (e) {
+					this.showErrorMessage(e.message);
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				if (!this.checkLocation()) {
+					return
+				}
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this
+							.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+
+				var param = {
+					itemCode: itemCodes,
+					locationCode: this.toLocationCode
+				}
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams()
+						console.log("提交参数", JSON.stringify(params));
+
+						productionReturnJobSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成生产退料记录:" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = detail.packingNumber;
+							detail.toContainerNumber = detail.containerNumber;
+							detail.toBatch = detail.batch;
+
+							detail.toLocationCode = detail.toLocationCode;
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.showMessageHint('请扫描收货库位', callback => {
+						this.$refs.comScanLocation.showLocation();
+					})
+
+					return isPass = false;
+				}
+				return isPass;
+			},
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			// scanPopupGetFocus() {
+			// 	this.$refs.scanPopup.getFocus();
+			// },
+
+			// scanPopupLoseFocus() {
+			// 	this.$refs.scanPopup.loseFocus();
+			// },
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/productionReturn/job/returnJob.vue b/pages/productionReturn/job/returnJob.vue
new file mode 100644
index 0000000..9e79f81
--- /dev/null
+++ b/pages/productionReturn/job/returnJob.vue
@@ -0,0 +1,287 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-return-job-card :dataContent="item" @click='openJobDetail(item)'></com-return-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getProductionreturnJobList,
+		cancleTakeProductionReturnJob
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import comReturnJobCard from '@/pages/productionReturn/coms/comReturnJobCard.vue'
+	import jobListPopup from '@/pages/productionReturn/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/productionReturn/coms/jobInfoPopup.vue'
+
+	export default {
+		components: {
+			comEmptyView,
+			jobFilter,
+			comReturnJobCard,
+			jobListPopup,
+			jobInfoPopup
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+				
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+
+				getProductionreturnJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("生产退料(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './returnDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.jobListPopup.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeProductionReturnJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getProductionreturnJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/productionReturn/record/returnToHold.vue b/pages/productionReturn/record/returnToHold.vue
new file mode 100644
index 0000000..d2b78ee
--- /dev/null
+++ b/pages/productionReturn/record/returnToHold.vue
@@ -0,0 +1,559 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='openScanPopup(true)' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-header">
+				<work-station :workshopCode="workshopCode" :productionLineCode="productionLineCode"
+					:workStationCode="workStationCode" :rawLocationCode="rawLocationCode"
+					:fgLocationCode="fgLocationCode"></work-station>
+			</view>
+			<u-line />
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<comReturnRecord :dataContent="item" :index="index" @removeItem="removeItem(index,item)"
+								@updateData="updateData" @removePack="removePack" :isShowToLocation="false">
+							</comReturnRecord>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<view class="">
+							<view class="uni-flex uni-row u-col-center" @click="">
+								<view>
+									目标库位
+									<text style="font-size: 35rpx;color:#3FBAFF;">&nbsp HOLD</text>
+								</view>
+								<image v-if="false" style="width:45rpx;height: 45rpx;"
+									src="/static/icons/icons_edit.svg"></image>
+							</view>
+						</view>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup(false)'></win-scan-button>
+		</view>
+		<winScanPackAndPosition ref="scanPopup" @getResult='getScanResult'></winScanPackAndPosition>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		productionReturnRecordSubmit,
+		getPrecisionStrategy,
+		getBalanceByFilter
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		getPackingNumberAndBatchByList,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		Decimal
+	} from 'decimal.js'; //引入
+
+	import {
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+	import {
+		getPrecisionStrategyParams
+	} from '@/common/balance.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comReturnRecord from '@/pages/productionReturn/coms/comReturnRecord.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import winScanPackAndPosition from "@/mycomponents/scan/winScanPackAndPosition.vue"
+	import comReturnRecordTitle from '@/pages/productionReturn/coms/comReturnRecordTitle.vue'
+	import workStation from '@/mycomponents/workStation/workStation.vue'
+
+	export default {
+		name: 'comReturn',
+		components: {
+			winScanButton,
+			comReturnRecordTitle,
+			requiredLocation,
+			comBlankView,
+			comReturnRecord,
+			winScanPack,
+			winScanPackAndPosition,
+			workStation
+		},
+
+		watch: {},
+
+		data() {
+			return {
+				id: '',
+				dataContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				fromLocationCode: '',
+				fromLocationTypeList: [],
+				toLocationCode: '',
+				tolocationTypeList: [],
+				businessType: {},
+				inventoryStatus: '',
+				managementList: [],
+				show: false,
+				positionList: [],
+				productionLineCode: '',
+				rawLocationCode: "",
+				fgLocationCode: "",
+				workshopCode: "",
+				workStationCode: "",
+				workShopName: "",
+				productionLineName: "",
+				workStationName: "",
+				businessTypeCode: "ReturnToHold",
+				positionInfo: "",
+				recommendLocationList: [], //推荐库位列表
+
+			};
+		},
+		onLoad() {
+			getBusinessType(this.businessTypeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.openScanPopup(true);
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+		mounted() {
+
+
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh();
+		},
+
+		methods: {
+			openScanPopup(isEditPosition) {
+				this.$refs.scanPopup.openScanPopup(isEditPosition);
+			},
+
+			async getScanResult(result, param) {
+				this.positionInfo = param.positionInfo;
+				this.workshopCode = param.workshopCode;
+				this.productionLineCode = param.productionLineCode;
+				this.workStationCode = param.workStationCode;
+				this.rawLocationCode = param.rawLocationCode;
+
+				let label = result.label;
+				let pack = result.package;
+
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == label.itemCode) {
+						return res
+					}
+				})
+
+				if (item == undefined) {
+					var filters = []
+					filters.push({
+						column: "itemCode",
+						action: "==",
+						value: label.itemCode
+					})
+					filters.push({
+						column: "locationCode",
+						action: "==",
+						value: this.rawLocationCode
+					})
+
+					var params = {
+						filters: filters,
+						pageNo: 1,
+						pageSize: 100,
+					}
+					var isCheckItemCode = await getBalanceByFilter(params);
+					if (isCheckItemCode.data == null || isCheckItemCode.data.list == 0) {
+						this.showErrorMessage("未查询到物料号[" + label.itemCode + "]" +
+							"库位[" + this.rawLocationCode + "]的信息")
+						return
+					}
+
+
+					var itemp = this.createItemInfo(label, pack);
+					let newDetail = this.createDetailInfo(label, pack);
+					newDetail.toLocationCode = "HOLD";
+					newDetail.locationCode = this.rawLocationCode;
+					newDetail.fromLocationCode = this.rawLocationCode;
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == label.packingNumber &&
+							r.batch == label.batch) {
+							return r;
+						}
+					})
+
+					if (detail == undefined) {
+						let newDetail = this.createDetailInfo(label, pack);
+						newDetail.toLocationCode = "HOLD";
+						newDetail.locationCode = this.rawLocationCode;
+						newDetail.fromLocationCode = this.rawLocationCode;
+						item.subList.push(newDetail);
+
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + label.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+			},
+			createItemInfo(label, pack) {
+				let item = {
+					itemCode: label.itemCode,
+					itemName: pack.itemName,
+					stdPackQty: pack.stdPackQty,
+					stdPackUnit: pack.stdPackUnit,
+					qty: new Decimal(label.qty).toNumber(),
+					handleQty: new Decimal(0).toNumber(),
+					uom: pack.uom,
+					subList: []
+				}
+				return item;
+			},
+
+			createDetailInfo(label, pack) {
+				let detail = deepCopyData(label);
+				detail.scaned = true;
+				detail.qty = new Decimal(label.qty).toNumber();
+				detail.handleQty = new Decimal(label.qty).toNumber();
+				detail.inventoryStatus = "OK"
+				detail.stdPackQty = pack.stdPackQty;
+				detail.stdPackUnit = pack.stdPackUnit;
+				detail.batch = pack.batch;
+				detail.packingNumber = pack.number;
+				detail.package = pack;
+				detail.label = label;
+				return detail;
+			},
+
+			calcHandleQty() {
+				for (let item of this.detailSource) {
+					item.handleQty = new Decimal(0).toNumber();
+					for (let detail of item.subList) {
+						if (detail != undefined) {
+							item.handleQty = calc.add(item.handleQty, detail.handleQty)
+						}
+					}
+				}
+				this.scanPopupGetFocus();
+				this.$forceUpdate();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			showSelect() {
+				this.show = !this.show
+			},
+			updateData() {
+				this.calcHandleQty();
+			},
+
+
+			removeData(item) {
+				for (let i = 0; i < this.detailSource.length; i++) {
+					if (this.detailSource[i].itemCode == item.itemCode) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			async commit() {
+				if (this.positionInfo == "请选择位置") {
+					this.showMessage("请先选择位置")
+					return;
+				}
+
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					this.fromManagementList = [];
+					this.toManagementList = [];
+					var fromPrecisionStrategParams = this.setFromPrecisionStrategParams(this.detailSource)
+					var toPrecisionStrategParams = this.setToPrecisionStrategParams(this.detailSource);
+					var fromManagement = await getPrecisionStrategy(fromPrecisionStrategParams);
+					this.fromManagementList = fromManagement.data;
+
+					if (this.fromManagementList.length == 0) {
+						this.showErrorMessage("查询来源库位管理模式异常")
+						return;
+					}
+					var toManagement = await getPrecisionStrategy(toPrecisionStrategParams);
+					this.toManagementList = toManagement.data;
+					if (this.toManagementList.length == 0) {
+						this.showErrorMessage("查询目标库位管理模式异常")
+						return;
+					}
+					var params = this.setParams()
+					console.log("提交" + JSON.stringify(params))
+					productionReturnRecordSubmit(params).then(res => {
+						uni.hideLoading()
+						if (res.data) {
+							this.showCommitSuccessMessage("提交成功<br>生成退料记录<br>" + res.data)
+						} else {
+							this.showErrorMessage("提交失败[" + res.msg + "]")
+						}
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error)
+					})
+
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+
+			},
+
+			setFromPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.fromLocationCode == res.fromLocationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.fromLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setToPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.toLocationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var submitItem = deepCopyData(detail)
+							var fromInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail
+								.itemCode,
+								detail.packingNumber, detail.fromLocationCode, detail.batch);
+							var toInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail
+								.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+
+							submitItem.inventoryStatus = detail.inventoryStatus;
+
+							submitItem.fromPackingNumber = fromInfo.packingNumber;
+							submitItem.toPackingNumber = toInfo.packingNumber;
+
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+
+							submitItem.fromBatch = fromInfo.batch;
+							submitItem.toBatch = toInfo.batch;
+
+							submitItem.fromLocationCode = detail.fromLocationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+
+							submitItem.productionlineCode = this.productionLineCode;
+							submitItem.workStationCode = this.workStationCode;
+
+							submitItem.qty = detail.handleQty;
+
+							subList.push(submitItem)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.workshopCode = this.workshopCode;
+				this.dataContent.businessType = this.businessTypeCode;
+				return this.dataContent;
+			},
+
+
+
+			showMessage(message) {
+				this.scanPopupLoseFocus();
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showErrorMessage(message) {
+				this.scanPopupLoseFocus();
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
+			},
+			clearData() {
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {};
+				this.positionInfo = "请选择位置";
+				this.workshopCode = "";
+				this.productionLineCode = "";
+				this.workStationCode = "";
+				this.rawLocationCode = "";
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/productionReturn/record/returnToStore.vue b/pages/productionReturn/record/returnToStore.vue
new file mode 100644
index 0000000..4ed8792
--- /dev/null
+++ b/pages/productionReturn/record/returnToStore.vue
@@ -0,0 +1,600 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='openScanPopup(true)' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-header">
+				<work-station :workshopCode="workshopCode" :productionLineCode="productionLineCode"
+					:workStationCode="workStationCode" :rawLocationCode="rawLocationCode"
+					:fgLocationCode="fgLocationCode"></work-station>
+			</view>
+			<u-line />
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<comReturnRecord :dataContent="item" :index="index" @removeItem="removeItem(index,item)"
+								:isShowFromLocation="true"
+								@updateData="updateData" @removePack="removePack">
+							</comReturnRecord>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup(false)'></win-scan-button>
+		</view>
+		<winScanPackAndPosition ref="scanPopup" @getResult='getScanResult'></winScanPackAndPosition>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		productionReturnRecordSubmit,
+		getPutawayRecommendLocation,
+		getPrecisionStrategy,
+		getBalanceByFilter
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		getPackingNumberAndBatchByList,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	import {
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+	
+	import {
+		calc
+	} from '@/common/calc.js';
+	
+	import { Decimal } from 'decimal.js';//引入
+
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+	import {
+		getPrecisionStrategyList,
+		getPrecisionStrategyParams
+	} from '@/common/balance.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comReturnRecord from '@/pages/productionReturn/coms/comReturnRecord.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import winScanPackAndPosition from "@/mycomponents/scan/winScanPackAndPosition.vue"
+	import comReturnRecordTitle from '@/pages/productionReturn/coms/comReturnRecordTitle.vue'
+	import workStation from '@/mycomponents/workStation/workStation.vue'
+
+	export default {
+		name: 'comReturn',
+		components: {
+			winScanButton,
+			comReturnRecordTitle,
+			requiredLocation,
+			comBlankView,
+			comReturnRecord,
+			winScanPack,
+			winScanPackAndPosition,
+			workStation
+		},
+
+		watch: {},
+
+		data() {
+			return {
+				id: '',
+				dataContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				fromLocationCode: '',
+				fromLocationTypeList: [],
+				toLocationCode: '',
+				tolocationTypeList: [],
+				businessType: {},
+				inventoryStatus: '',
+				managementList: [],
+				show: false,
+				positionList: [],
+				productionLineCode: '',
+				rawLocationCode: "",
+				fgLocationCode: "",
+				workshopCode: "",
+				workStationCode: "",
+				workShopName: "",
+				productionLineName: "",
+				workStationName: "",
+				businessTypeCode: "ReturnToStore",
+				positionInfo: "",
+				recommendLocationList: [], //推荐库位列表
+				fromWarehouseCode: '', //来源仓库
+				fromManagementList: [],
+				toManagementList: []
+
+			};
+		},
+		onLoad() {
+			getBusinessType(this.businessTypeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.openScanPopup(true);
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+		mounted() {
+
+
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh();
+		},
+
+		methods: {
+			openScanPopup(isEditPosition) {
+				this.$refs.scanPopup.openScanPopup(isEditPosition);
+			},
+
+			async getScanResult(result, param) {
+				this.positionInfo = param.positionInfo;
+				this.workshopCode = param.workshopCode;
+				this.productionLineCode = param.productionLineCode;
+				this.workStationCode = param.workStationCode;
+				this.rawLocationCode = param.rawLocationCode;
+
+				let label = result.label;
+				let pack = result.package;
+				
+				if(label.batch==""){
+					this.showErrorMessage("扫描标签批次为空")
+					return;
+				}
+				
+				if(label.packingNumber==""){
+					this.showErrorMessage("扫描标签箱码为空")
+					return;
+				}
+
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == label.itemCode) {
+						return res
+					}
+				})
+
+				if (item == undefined) {
+					
+						var filters = []
+						filters.push({
+							column: "itemCode",
+							action: "==",
+							value: label.itemCode
+						})
+						filters.push({
+							column: "locationCode",
+							action: "==",
+							value: this.rawLocationCode
+						})
+									
+						var params = {
+							filters: filters,
+							pageNo: 1,
+							pageSize: 100,
+						}
+					 var isCheckItemCode =	await getBalanceByFilter(params);
+					if(isCheckItemCode.data==null||isCheckItemCode.data.list==0){
+						this.showErrorMessage("未查询到物料号[" + label.itemCode + "]" +
+						"库位[" + this.rawLocationCode + "]的信息")
+						return 
+					}
+					
+					// 获取推荐库位
+					this.getRecommendLocation(label, pack, toLocation => {
+						var itemp = this.createItemInfo(label, pack);
+						let newDetail = this.createDetailInfo(label, pack);
+						newDetail.toLocationCode = toLocation.code;
+						newDetail.fromLocationCode = this.rawLocationCode;
+						newDetail.locationCode = this.rawLocationCode;
+						newDetail.toWarehouseCode = toLocation.warehouseCode;
+						itemp.subList.push(newDetail);
+						this.detailSource.push(itemp)
+						this.calcHandleQty();
+					})
+
+				} else {
+					debugger
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == label.packingNumber &&
+							r.batch == label.batch) {
+							return r;
+						}
+					})
+
+					if (detail == undefined) {
+						this.getRecommendLocation(label, pack, toLocation => {
+							let newDetail = this.createDetailInfo(label, pack);
+							newDetail.toLocationCode = toLocation.code;
+							newDetail.fromLocationCode = this.rawLocationCode;
+							newDetail.locationCode = this.rawLocationCode;
+							newDetail.toWarehouseCode = toLocation.warehouseCode;
+							item.subList.push(newDetail);
+							this.calcHandleQty();
+						});
+
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + label.batch + "]已经在列表中")
+						}
+					}
+				}
+			},
+			createItemInfo(label, pack) {
+				let item = {
+					itemCode: label.itemCode,
+					itemName: pack.itemName,
+					stdPackQty: pack.stdPackQty,
+					stdPackUnit: pack.stdPackUnit,
+					qty: new Decimal(label.qty).toNumber(),
+					handleQty: new Decimal(0).toNumber(),
+					uom: pack.uom,
+					subList: []
+				}
+				return item;
+			},
+
+			createDetailInfo(label, pack) {
+				let detail = deepCopyData(label);
+				detail.scaned = true;
+				detail.qty = new Decimal(label.qty).toNumber();
+				detail.handleQty = new Decimal(label.qty).toNumber();
+				detail.inventoryStatus = "OK"
+				detail.stdPackQty = pack.stdPackQty;
+				detail.stdPackUnit = pack.stdPackUnit;
+				detail.batch = pack.batch;
+				detail.packingNumber = pack.number;
+				detail.package = pack;
+				detail.label = label;
+				return detail;
+			},
+
+			calcHandleQty() {
+				for (let item of this.detailSource) {
+					item.handleQty = new Decimal(0).toNumber();
+					for (let detail of item.subList) {
+						if (detail != undefined) {
+							item.handleQty = calc.add(item.handleQty,detail.handleQty)
+						}
+					}
+				}
+				this.scanPopupGetFocus();
+				this.$forceUpdate();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+						this.clearData();
+						this.$refs.scanPopup.initData();
+					}
+				}
+				this.updateData();
+			},
+
+			showSelect() {
+				this.show = !this.show
+			},
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			//获取推荐库位
+			getRecommendLocation(label, pack, callback) {
+				let recommend = this.recommendLocationList.find(r => r.itemCode == label.itemCode);
+				if (recommend == undefined) {
+					let param = {
+						itemCode: label.itemCode,
+						batch: label.batch,
+						inventoryStatus: label.inventoryStatus,
+						supplierCode: pack.supplierCode
+					};
+					console.log(JSON.stringify(param))
+					getPutawayRecommendLocation(param).then(res => {
+						this.recommendLocationList.push({
+							itemCode: label.itemCode,
+							locationCode: res.data.code
+						})
+						callback(res.data);
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error)
+					})
+
+				} else {
+					callback(recommend);
+				}
+			},
+
+			removeData(item) {
+				for (let i = 0; i < this.detailSource.length; i++) {
+					if (this.detailSource[i].itemCode == item.itemCode) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			async commit() {
+				if (this.positionInfo == "请选择位置") {
+					this.showMessage("请先选择位置")
+					return;
+				}
+
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					this.fromManagementList = [];
+					this.toManagementList = [];
+					var fromPrecisionStrategParams = this.setFromPrecisionStrategParams(this.detailSource)
+					var toPrecisionStrategParams = this.setToPrecisionStrategParams(this.detailSource);
+					var fromManagement =await getPrecisionStrategy(fromPrecisionStrategParams);
+					this.fromManagementList =fromManagement.data ;
+					
+					if (this.fromManagementList.length == 0) {
+						this.showErrorMessage("查询来源库位管理模式异常")
+						return;
+					}
+					var toManagement =await getPrecisionStrategy(toPrecisionStrategParams);
+					this.toManagementList =toManagement.data ;
+					if (this.toManagementList.length == 0) {
+						this.showErrorMessage("查询目标库位管理模式异常")
+						return;
+					}
+					var params = this.setParams()
+					console.log("提交" + JSON.stringify(params))
+					productionReturnRecordSubmit(params).then(res => {
+						uni.hideLoading()
+						if (res.data) {
+							this.showCommitSuccessMessage("提交成功<br>生成退料记录<br>" + res.data)
+						} else {
+							this.showErrorMessage("提交失败[" + res.msg + "]")
+						}
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error)
+					})
+
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+
+			},
+
+			setFromPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.fromLocationCode == res.fromLocationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.fromLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setToPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.toLocationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setParams() {
+
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var submitItem = deepCopyData(detail)
+							var fromInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode,
+								detail.packingNumber, detail.fromLocationCode, detail.batch);
+							
+							var toInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+
+							submitItem.inventoryStatus = detail.inventoryStatus;
+
+							submitItem.fromPackingNumber = fromInfo.packingNumber;
+							submitItem.toPackingNumber = toInfo.packingNumber;
+
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+
+							submitItem.fromBatch = fromInfo.batch;
+							submitItem.toBatch = toInfo.batch;
+
+							submitItem.fromLocationCode = detail.fromLocationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+
+							submitItem.productionlineCode = this.productionLineCode;
+							submitItem.workStationCode = this.workStationCode;
+							
+							submitItem.qty = detail.handleQty;
+							subList.push(submitItem)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.workshopCode = this.workshopCode;
+				this.dataContent.businessType = this.businessTypeCode;
+				this.dataContent.toWarehouseCode = this.toWarehouseCode;
+				return this.dataContent;
+			},
+
+
+			showMessage(message) {
+				this.scanPopupLoseFocus();
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showErrorMessage(message) {
+				this.scanPopupLoseFocus();
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+					this.$refs.scanPopup.initData();
+				})
+			},
+			clearData() {
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {};
+				this.positionInfo = "请选择位置";
+				this.workshopCode = "";
+				this.productionLineCode = "";
+				this.workStationCode = "";
+				this.rawLocationCode = "";
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/productionReturn/request/requestDetail.vue b/pages/productionReturn/request/requestDetail.vue
new file mode 100644
index 0000000..1dba06a
--- /dev/null
+++ b/pages/productionReturn/request/requestDetail.vue
@@ -0,0 +1,141 @@
+<template>
+	<view class="page-wraper">
+
+		<view class="page-header">
+			<view class="header_job_top">
+				<request-top :dataContent="requestContent"></request-top>
+			</view>
+			<view class="header_item">
+				<comReturnRequestInfo :workShopCode="requestContent.workshopCode" :dataContent="requestContent">
+				</comReturnRequestInfo>
+			</view>
+
+		</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comRequestDetailCard :dataContent="item" @openDetail="openDetail">
+						</comRequestDetailCard>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<requestDetailInfoPopup ref="jobDetailPopup"></requestDetailInfoPopup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getProductionReturnRequestDetail,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource,
+	} from '@/common/detail.js';
+
+
+	import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
+	import requestDetailInfoPopup from '@/pages/productionReturn/coms/requestDetailInfoPopup.vue'
+	import comReturnRequestInfo from '@/pages/productionReturn/coms/comReturnRequestInfo.vue'
+	import requestTop from "@/mycomponents/request/requestTop.vue"
+
+	export default {
+		components: {
+			comRequestDetailCard,
+			requestDetailInfoPopup,
+			comReturnRequestInfo,
+			requestTop
+		},
+		data() {
+			return {
+				id: '',
+				requestContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			var businessType = option.businessType;
+			var title = "生产退料申请详情"
+			if (businessType == 'ReturnToStore') {
+				title = "生产合格退料申请详情"
+			} else if (this.businessType == 'ReturnToHold') {
+				title = "生产隔离退料申请详情"
+			}
+			this.getDetail();
+			updateTitle(title)
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getProductionReturnRequestDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.requestContent = res.data;
+							that.subList = res.data.subList;
+							that.detailSource = getDataSource(that.subList);
+							that.requestContent.fromLocationCode = that.subList[0].fromLocationCode
+							that.requestContent.productionLineCode = that.subList[0].productionLineCode
+							that.requestContent.workStationCode = that.subList[0].workStationCode
+
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+			openDetail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/productionReturn/request/returnRequestCreate.vue b/pages/productionReturn/request/returnRequestCreate.vue
new file mode 100644
index 0000000..a204b7d
--- /dev/null
+++ b/pages/productionReturn/request/returnRequestCreate.vue
@@ -0,0 +1,228 @@
+<template>
+	<view class="page-wraper">
+		<view class="" v-if='detailSource.subList.length==0'>
+			<com-blank-view @goScan='goScan(true)'></com-blank-view>
+		</view>
+		<view v-else class="page-wraper">
+			<view class="page-main">
+				<comReturnRequestCreator ref="issueRequest" :dataContent="detailSource" :isSwipe="false">
+				</comReturnRequestCreator>
+				<button class="btn_add" @click="goScan(false)">+去添加</button>
+			</view>
+
+			<div class="btn_bottom">
+				<view class="" style="display: flex;flex-direction: row;">
+					<view class="">
+						<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+					</view>
+				</view>
+			</div>
+
+			<comScanReturnPack ref="comScanIssuePack">
+			</comScanReturnPack>
+			<comMessage ref="comMessage"></comMessage>
+		</view>
+	</view>
+	<comReturnRequestPopup ref="comIssueRequestPopup" @confirm='requestConfirm' title="申请信息" :itemCodeTypeList="itemCodeTypeList"></comReturnRequestPopup>
+</template>
+
+<script>
+	import {
+		productionReturnRequestCreate,
+	} from '@/api/request2.js';
+	
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		goHome,
+		updateTitle,
+		navigateBack,
+		getRemoveOption,
+		getCurrDateOneMonthsTimes
+	} from '@/common/basic.js';
+
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import comReturnRequestPopup from '@/pages/productionReturn/coms/comReturnRequestPopup.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import comScanReturnPack from '@/pages/productionReturn/coms/comScanReturnPack.vue'
+	import comReturnRequestCreator from '@/pages/productionReturn/coms/comReturnRequestCreator.vue'
+	export default {
+		name: '',
+		components: {
+			comBlankView,
+			comReturnRequestPopup,
+			jobDetailPopup,
+			comScanReturnPack,
+			comReturnRequestCreator,
+		},
+		data() {
+			return {
+				subList: [], //接口返回的任务subList
+				detailSource: {
+					subList: []
+				}, //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				requestList: [], //需求信息
+				fromType: '',
+				title: "",
+				itemCodeTypeList: []
+
+			}
+		},
+
+		mounted() {
+			
+		},
+		onLoad(option) {
+			this.fromType = option.fromType
+			if (this.fromType == 'ReturnToStore') {
+				this.title = "生产合格退料申请"
+			} else if (this.fromType == 'ReturnToHold') {
+				this.title = "生产隔离退料申请"
+			}
+			updateTitle(this.title)
+			
+			var typeCode = this.fromType
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.itemCodeTypeList = res.itemCodeTypeList;
+					this.goScan(true)
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+
+		},
+		methods: {
+			goScan(editPosition) {
+				this.$refs.comIssueRequestPopup.openRequestPopup(editPosition);
+			},
+
+			//确定需求信息
+			requestConfirm(action, item) {
+
+				if (this.detailSource.subList.length == 0) {
+					this.detailSource = {
+						workshopCode: item.workshopCode,
+						workShopName: item.workShopName,
+						productionLineCode: item.productionLineCode,
+						productionLineName: item.productionLineName,
+						workStationCode: item.workStationCode,
+						workStationName: item.workStationName, //工位
+						fromLocationCode: item.rawLocationCode,
+						status: "1",
+						totalQty: 0,
+						subList: []
+					}
+					var subItem = {
+						productionLineCode: item.productionLineCode,
+						workStationCode: item.workStationCode,
+						itemCode: item.itemCode,
+						itemName: item.itemName,
+						inventoryStatus: "OK",
+						packingNumber: "",
+						fromLocationCode: item.rawLocationCode,
+						qty: item.qty,
+						uom: item.uom
+					}
+					this.detailSource.subList.push(subItem)
+				} else {
+					var result = this.detailSource.subList.filter(res => {
+						if (res.itemCode == item.itemCode) {
+							return res
+						}
+					})
+
+					//没有添加数据
+					if (result.length == 0) {
+						var subItem = {
+							productionLineCode: item.productionLineCode,
+							workStationCode: item.workStationCode,
+							itemCode: item.itemCode,
+							itemName: item.itemName,
+							inventoryStatus: "OK",
+							packingNumber: "",
+							fromLocationCode: item.rawLocationCode,
+							qty: item.qty,
+							uom: item.uom
+						}
+
+						this.detailSource.subList.push(subItem)
+
+					} else {
+						//有了更新数据
+						result[0].qty = calc.add(result[0].qty,item.qty)
+
+					}
+				}
+				this.caclcQty();
+			},
+
+			caclcQty() {
+				var totalQty = 0;
+				this.detailSource.subList.forEach(res => {
+					totalQty = calc.add(totalQty,res.qty)
+				})
+				this.detailSource.totalQty = totalQty;
+			},
+
+			setParams() {
+				//合格退料
+				if (this.fromType == "ReturnToStore") {
+					this.detailSource.isOK = true
+					this.detailSource.dueTime = getCurrDateOneMonthsTimes()
+					this.detailSource.subList.forEach(res => {
+						res.batch = "000000"
+					})
+					//隔离退料
+				} else if (this.fromType == "ReturnToHold") {
+					this.detailSource.isOK = false
+					this.detailSource.dueTime = getCurrDateOneMonthsTimes()
+					this.detailSource.subList.forEach(res => {
+						res.batch = ""
+					})
+				}
+				return this.detailSource
+			},
+			submit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+				productionReturnRequestCreate(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成发料申请<br>" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productionReturn/request/returnToHoldRequest.vue b/pages/productionReturn/request/returnToHoldRequest.vue
new file mode 100644
index 0000000..47463da
--- /dev/null
+++ b/pages/productionReturn/request/returnToHoldRequest.vue
@@ -0,0 +1,59 @@
+<template>
+	<view class="">
+		<comReturnCommonRequest ref="request" businessType="ReturnToHold"></comReturnCommonRequest>
+	</view>
+		
+</template>
+
+<script>
+	import comReturnCommonRequest from '@/pages/productionReturn/coms/comReturnCommonRequest.vue'
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	export default {
+		components: {
+			comReturnCommonRequest,
+		},
+		data() {
+			return {
+				requestList: [],
+
+			};
+		},
+		
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.request.openFilter();
+			}
+		},
+
+
+		onShow() {
+			if(this.$refs.request!=undefined){
+				this.$refs.request.onShow()
+			}
+			
+		},
+		onPullDownRefresh() {
+			this.$refs.request.onPullDownRefresh()
+		},
+		onReachBottom() {
+			this.$refs.request.onReachBottom()
+		},
+		
+		methods: {
+
+			
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productionReturn/request/returnToStoreRequest.vue b/pages/productionReturn/request/returnToStoreRequest.vue
new file mode 100644
index 0000000..2bcde74
--- /dev/null
+++ b/pages/productionReturn/request/returnToStoreRequest.vue
@@ -0,0 +1,59 @@
+<template>
+	<view class="">
+		<comReturnCommonRequest ref="request" businessType="ReturnToStore"></comReturnCommonRequest>
+	</view>
+		
+</template>
+
+<script>
+	import comReturnCommonRequest from '@/pages/productionReturn/coms/comReturnCommonRequest.vue'
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	export default {
+		components: {
+			comReturnCommonRequest,
+		},
+		data() {
+			return {
+				requestList: [],
+
+			};
+		},
+		
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.request.openFilter();
+			}
+		},
+
+
+		onShow() {
+			if(this.$refs.request!=undefined){
+				this.$refs.request.onShow()
+			}
+			
+		},
+		onPullDownRefresh() {
+			this.$refs.request.onPullDownRefresh()
+		},
+		onReachBottom() {
+			this.$refs.request.onReachBottom()
+		},
+		
+		methods: {
+
+			
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/purchaseReceipt/coms/comReceiptDetailCard.vue b/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
new file mode 100644
index 0000000..da34e49
--- /dev/null
+++ b/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
@@ -0,0 +1,146 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty"></itemCompareQty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList" :key="item.id">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend :detail="item" :isShowLocation="false" :isShowFromLocation="false"  :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</view>
+				<u-line />
+			</uni-collapse-item>
+		</uni-collapse>
+
+		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam"
+			 @confirm="confirm">
+		</recommend-qty-edit>
+		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
+			:locationTypeList="locationTypeList"></win-scan-location>
+		<receipt-detail-info-popup ref="jobDetailPopup" :dataContent="showItem"></receipt-detail-info-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue'
+	import receiptDetailInfoPopup from '@/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	
+	import {
+		getDetailOption,
+		getPurchaseReceiptOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			itemCompareQty,
+			recommend,
+			recommendQtyEdit,
+			jobDetailPopup,
+			receiptDetailInfoPopup,
+			winScanLocation
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			locationTypeList: {
+				type: Object,
+				default: {}
+			},
+			
+			
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				locatonItem:{},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty,this.settingParam.allowModifyLocation)
+			}
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				}  else if (e.content.text == "库位") {
+					this.showLocation(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty,item.labelQty);
+			},
+			showLocation(item) {
+				this.locatonItem =item;
+				this.$refs.scanLocationCode.openScanPopup();
+			},
+			//扫描源库位
+			getLocation(location, code) {
+				this.locatonItem.toLocationCode =code;
+				this.$emit('updateData')
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.handleQty = null
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.handleQty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/purchaseReceipt/coms/comReceiptJobCard.vue b/pages/purchaseReceipt/coms/comReceiptJobCard.vue
new file mode 100644
index 0000000..8c8ddfd
--- /dev/null
+++ b/pages/purchaseReceipt/coms/comReceiptJobCard.vue
@@ -0,0 +1,49 @@
+<template>
+	<job-com-main-card :dataContent="dataContent">
+		<view class="task_item">
+			<!-- <view class="task_text">
+				<view class="">
+					申请单号 : {{dataContent.requestNumber}}
+				</view>
+			</view> -->
+			<view class="task_text">
+				<view class="">
+					发货单号 : {{dataContent.asnNumber}}
+				</view>
+			</view>
+			<view class="task_text">
+				<view class="">
+					供应商代码 : {{dataContent.supplierCode}}
+					<!-- 供应商名称 : {{dataContent.supplierName}} -->
+				</view>
+			</view>
+		</view>
+	</job-com-main-card>
+</template>
+
+<script>
+	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+	export default {
+		components: {
+			jobComMainCard,
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue b/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue
new file mode 100644
index 0000000..b44816c
--- /dev/null
+++ b/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue
@@ -0,0 +1,110 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">标包数量 : </text>
+							<text class="text_wrap">{{dataContent.stdPackQty}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">标包单位 : </text>
+							<text class="text_wrap">{{getStdPackUnitInfo(dataContent.stdPackUnit)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">供应商计量数量 : </text>
+							<text class="text_wrap">{{dataContent.supplierQty}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">供应商计量单位 : </text>
+							<text class="text_wrap">{{getStdPackUnitInfo(dataContent.supplierUom)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">转换率 : </text>
+							<text class="text_wrap">{{dataContent.convertRate}} </text>
+						</view>
+
+					</view>
+				</view>
+				<u-line></u-line>
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.poNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.poLine}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">项目代码 : </text>
+							<text class="text_wrap">{{dataContent.projectCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到货日期 : </text>
+							<text class="text_wrap">{{dateFormat(dataContent.arriveDate)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">生产日期 : </text>
+							<text class="text_wrap">{{dateFormat(dataContent.produceDate)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">过期日期 : </text>
+							<text class="text_wrap">{{dateFormat(dataContent.expireDate)}} </text>
+						</view>
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {getStdPackUnitInfo} from "@/common/directory.js"
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			getStdPackUnitInfo(value){
+				return getStdPackUnitInfo(value).label
+			},
+			dateFormat(value){
+				return dateFormat(value)
+			}
+			
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/purchaseReceipt/coms/receiptInfoPopup.vue b/pages/purchaseReceipt/coms/receiptInfoPopup.vue
new file mode 100644
index 0000000..dc5bf8e
--- /dev/null
+++ b/pages/purchaseReceipt/coms/receiptInfoPopup.vue
@@ -0,0 +1,80 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">发货单号 : </text>
+							<text class="text_wrap">{{dataContent.asnNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">要货计划单号 : </text>
+							<text class="text_wrap">{{dataContent.ppNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">供应商代码 : </text>
+							<text class="text_wrap">{{dataContent.carrierCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">承运商 : </text>
+							<text class="text_wrap">{{dataContent.carrierCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">运输方式 : </text>
+							<text class="text_wrap">{{getTransferModeName(dataContent.transferMode)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">车牌号 : </text>
+							<text class="text_wrap">{{dataContent.vehiclePlateNumber}} </text>
+						</view>
+					</view>
+				</view>
+				<u-line></u-line>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	import {getTransferModeName} from '@/common/directory.js'
+	
+	
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			getTransferModeName(value){
+				return getTransferModeName(value)
+			}
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/purchaseReceipt/coms/receiptJobListPopup.vue b/pages/purchaseReceipt/coms/receiptJobListPopup.vue
new file mode 100644
index 0000000..c1e6bcf
--- /dev/null
+++ b/pages/purchaseReceipt/coms/receiptJobListPopup.vue
@@ -0,0 +1,46 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-receipt-job-card :dataContent="item" @click='selectItem(item)'></com-receipt-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comReceiptJobCard from '@/pages/purchaseReceipt/coms/comReceiptJobCard.vue'
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comReceiptJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/purchaseReceipt/job/receiptDetail.vue b/pages/purchaseReceipt/job/receiptDetail.vue
new file mode 100644
index 0000000..19fe596
--- /dev/null
+++ b/pages/purchaseReceipt/job/receiptDetail.vue
@@ -0,0 +1,518 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				发货单号 : {{jobContent.asnNumber}}
+			</view>
+			<required-location ref="requiredLocation" title="默认收货库位 :" :locationCode="jobToLocationCode"
+				:isShowEdit="false"></required-location>
+			<u-line color="#D8D8D8" />
+		</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
+							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+						</com-receipt-detail-card>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<required-location ref="requiredLocation" title="收货库位 :" :locationCode="toLocationCode"
+						:isShowEdit="true" @getLocation='scanLocationCode' :locationTypeList="toLocationTypeList">
+					</required-location>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<winScanPackAndCont ref="scanPopup" @getResult='getScanResult'></winScanPackAndCont>
+		<comMessage ref="comMessage"></comMessage>
+
+	</view>
+</template>
+
+<script>
+	import {
+		purchaseReceiptJobSubmit,
+		getPurchaseReceiptJobDetail,
+		takePurchaseReceiptJob,
+		cancleTakePurchaseReceiptJob
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		getCurrDateTime,
+		getPackingNumberAndBatch,
+		updateTitle,
+		compareAsc,
+		navigateBack
+	} from '@/common/basic.js';
+
+	import {
+		getDirectoryItemArray,
+	} from '@/common/directory.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPackAndCont from '@/mycomponents/scan/winScanPackAndCont.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comReceiptDetailCard from '@/pages/purchaseReceipt/coms/comReceiptDetailCard.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+
+	export default {
+		name: 'receipt_detail',
+		components: {
+			winScanButton,
+			winScanPackAndCont,
+			comReceiptDetailCard,
+			requiredLocation,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				toLocationTypeList: [],
+				toLocationCode: '',
+				jobToLocationCode: "",
+				toLocationInfo: {},
+				businessTypeInfo: {},
+				managementList: [],
+				jobStatus: ""
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus == "2") {
+					//取消承接任务	
+					cancleTakePurchaseReceiptJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+				return true;
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				if (this.id != null) {
+					takePurchaseReceiptJob(this.id).then(res => {
+						uni.hideLoading();
+						callback();
+					}).catch(error => {
+						uni.hideLoading();
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getPurchaseReceiptJobDetail(this.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes);
+							// that.jobContent.toLocationTypeList = that.toLocationTypeList;
+							that.subList = res.data.subList;
+							// that.subList[0].containerNumber = "CN-00000001";
+							// that.subList[1].containerNumber = "CN-00000001";
+							that.jobStatus = res.data.status
+							that.jobToLocationCode = that.subList[0].toLocationCode
+							that.detailSource = getDataSource(that.subList)		
+						} else {
+							that.showMessage('列表数据为0');
+						}
+						// updateTitle("采购收货-" + that.jobContent.number);
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+
+			getScanResult(result) {
+				try {
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+						return;
+					}
+					if (result.label.labelType == "ContainerLabel") {
+						var containerNumber = result.label.container;
+						var itemDetail = detail.subList.filter(r => r.containerNumber == containerNumber);
+						if (itemDetail.length == 0) {
+							this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】不在列表中")
+						} else {
+							if (itemDetail[0].scaned) {
+								this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】已经扫描")
+							} else {
+								itemDetail.forEach(item => {
+									item.scaned = true;
+									item.handleQty = item.qty;
+									item.toLocationCode = this.toLocationCode;
+								})
+								this.detailSource[0].subList.sort(compareAsc('scaned')); //按扫描信息排序
+								calcHandleQty(this.detailSource);
+								this.continueScan()
+								this.$forceUpdate()
+							}
+						}
+					} else if (result.label.labelType == "PurchaseLabel") {
+						var packingNumber = result.label.packingNumber;
+						var batch = result.label.batch;
+						var qty = result.label.qty;
+						var detail = this.detailSource.find(r => r.itemCode == itemCode);
+						if (detail == undefined) {
+							this.showMessage("物料号【" + itemCode + "】不在列表中")
+						} else {
+							var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch ==
+							batch);
+							if (itemDetail == undefined) {
+								this.showMessage("箱码【" + packingNumber + "】、批次【" + batch + "】不在列表中")
+							} else {
+								if (itemDetail.scaned) {
+									this.showMessage("箱码【" + packingNumber + "】已经扫描")
+								} else {
+									itemDetail.scaned = true;
+									this.detailSource[0].subList.sort(compareAsc('scaned')); //按扫描信息排序
+									itemDetail.handleQty = Number(result.label.qty);
+									itemDetail.toLocationCode = this.toLocationCode;
+									itemDetail.labelQty = Number(result.label.qty);
+									calcHandleQty(this.detailSource);
+									this.continueScan()
+									this.$forceUpdate()
+								}
+							}
+						}
+					}
+
+				} catch (e) {
+					this.showErrorMessage(e.message)
+				}
+			},
+
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+			updateData() {
+				calcHandleQty(this.detailSource);
+			},
+
+			scanLocationCode(location, code) {
+				if(this.jobContent.allowModifyLocation == 'TRUE'){
+					this.toLocationCode = code;
+				}else {
+					if(code==this.jobToLocationCode){
+						this.toLocationCode =code;
+					}else {
+						this.showErrorMessage("任务设置中不允许修改库位,扫描的库位【"+code+"】与推荐的库位【"+this.jobToLocationCode+"】不一致")
+					}
+				}
+				
+				// this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+				// 	this.toLocationCode = code
+				// 	this.detailSource.forEach(item => {
+				// 		item.subList.forEach(detail => {
+				// 			detail.toLocationCode = code
+				// 		})
+				// 	})
+				// })
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//校验库位、
+				if (!this.checkLocation()) {
+					return
+				}
+
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this
+							.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+
+				//获取管理模式，封装参数
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams()
+						console.log("提交参数", JSON.stringify(params));
+
+						purchaseReceiptJobSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成采购收货记录<br>" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+
+			},
+
+			setParams() {
+				var subList = []
+				var createTime = getCurrDateTime();
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.createTime = createTime;
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.$refs.comMessage.showMessage('请扫描收货库位', res => {
+						if (res) {
+							this.$refs.requiredLocation.showLocation();
+						}
+					});
+					return isPass = false;
+				}
+				//空库位校验
+				// var isHaveNullLocation = false;
+				// var nullLocationList = [];
+				// this.detailSource.forEach(item => {
+				// 	item.subList.forEach(detail => {
+				// 		if (detail.toLocationCode == null || detail.toLocationCode == "") {
+				// 			nullLocationList.push(detail)
+				// 		}
+				// 	})
+				// })
+
+				// if (nullLocationList.length > 0) {
+				// 	//弹出提示，是否把其他的库位都变成默认库位
+				// 	this.$refs.comMessage.showQuestionMessage("是否把其他的库位都变成默认库位", res => {
+				// 		nullLocationList.forEach(res => {
+				// 			res.toLocationCode = this.toLocationCode
+				// 		})
+				// 	})
+				// 	isPass = false;
+				// }
+				return isPass;
+			},
+
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus()
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus()
+						}
+					});
+				})
+			},
+
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/purchaseReceipt/job/receiptJob.vue b/pages/purchaseReceipt/job/receiptJob.vue
new file mode 100644
index 0000000..0c720e2
--- /dev/null
+++ b/pages/purchaseReceipt/job/receiptJob.vue
@@ -0,0 +1,302 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" :isShowAsn="true" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" @onScanAsnNumber="getScanAsnNumber"
+			:checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-receipt-job-card :dataContent="item" @click='openJobDetail(item)'></com-receipt-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+			<receipt-info-popup ref='jobInfoPopup'></receipt-info-popup>
+			<receipt-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></receipt-job-list-popup>
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getPurchaseReceiptJobList,
+		cancleTakePurchaseReceiptJob
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+
+	import comReceiptJobCard from '@/pages/purchaseReceipt/coms/comReceiptJobCard.vue'
+	import receiptJobListPopup from '@/pages/purchaseReceipt/coms/receiptJobListPopup.vue'
+	import receiptInfoPopup from '@/pages/purchaseReceipt/coms/receiptInfoPopup.vue'
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comReceiptJobCard,
+			receiptInfoPopup,
+			receiptJobListPopup,
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getPurchaseReceiptJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("采购收货(" + this.totalCount + ")");
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("采购收货");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+
+				})
+			},
+
+			getScanAsnNumber(code) {
+				this.getDataListByType(code, "asnNumber")
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code, "number")
+			},
+			getDataListByType(code, type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				if (type == "asnNumber") {
+					filters.push({
+						column: "asn_number",
+						action: "==",
+						value: code
+					})
+				} else if (type == "number") {
+					filters.push({
+						column: "number",
+						action: "==",
+						value: code
+					})
+				}
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getPurchaseReceiptJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					} else {
+						if (type == "asnNumber") {
+							that.showItemList(res.data.list);
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './receiptDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.jobListPopup.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								var id = dataContent.id
+								this.cancleJob(id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakePurchaseReceiptJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+					
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/purchaseReturn/coms/comReturnJobCard.vue b/pages/purchaseReturn/coms/comReturnJobCard.vue
new file mode 100644
index 0000000..154820a
--- /dev/null
+++ b/pages/purchaseReturn/coms/comReturnJobCard.vue
@@ -0,0 +1,47 @@
+<template>
+	<job-com-main-card :dataContent="dataContent">
+		<view class="task_item">
+			<view class="task_item">
+				<view class="task_text">
+					<view class="">
+						申请单号 : {{dataContent.requestNumber}}
+					</view>
+				</view>
+			</view>
+			<view class="task_item">
+				<view class="task_text">
+					<view class="">
+						供应商 : {{dataContent.supplierCode}}
+					</view>
+				</view>
+			</view>
+		</view>
+	</job-com-main-card>
+</template>
+
+<script>
+	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+	export default {
+		components: {
+			jobComMainCard,
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/purchaseReturn/coms/comReturnRequestCard.vue b/pages/purchaseReturn/coms/comReturnRequestCard.vue
new file mode 100644
index 0000000..ee1589b
--- /dev/null
+++ b/pages/purchaseReturn/coms/comReturnRequestCard.vue
@@ -0,0 +1,39 @@
+<template>
+ 	<request-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				收货单号 : {{dataContent.purchaseReceiptRecordNumber}}
+ 			</view>
+ 			<view class="task_text">
+ 				供应商代码 : {{dataContent.supplierCode}}
+ 			</view>
+ 		</view>
+ 	</request-com-main-card>
+ </template>
+
+ <script>
+ 	import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			requestComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/purchaseReturn/coms/requestDetailInfoPopup.vue b/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
new file mode 100644
index 0000000..b7edbb2
--- /dev/null
+++ b/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
@@ -0,0 +1,105 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<request-detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<u-line></u-line>
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.poNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.poLine}} </text>
+						</view>
+					</view>
+				</view>
+			</request-detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue'
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+
+		components: {
+			requestDetailCommonInfo,
+			comListItem
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				},
+				dataList: []
+			}
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					this.dataList = [{
+						title: '包装号',
+						content: this.dataContent.packingNumber
+					}, {
+						title: '器具号',
+						content: this.dataContent.containerNumber
+					}, {
+						title: '批次',
+						content: this.dataContent.batch
+					}, {
+						title: '替代批次',
+						content: this.dataContent.altBatch,
+					}, {
+						title: '到库位代码',
+						content: this.dataContent.toLocationCode
+					}, {
+						title: '库存状态',
+						content: this.dataContent.inventoryStatus,
+						type: "inventoryStatus"
+					}, {
+						title: '订单号',
+						content: this.dataContent.poNumber
+					}, {
+						title: '订单行',
+						content: this.dataContent.poLine
+					}, {
+						title: '原因',
+						content: this.dataContent.reason
+					}, {
+						title: '从货主代码',
+						content: this.dataContent.fromOwnerCode,
+					}, {
+						title: '到货主代码',
+						content: this.dataContent.toOwnerCode,
+					}];
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/purchaseReturn/coms/requestInfoPopup.vue b/pages/purchaseReturn/coms/requestInfoPopup.vue
new file mode 100644
index 0000000..80d32c4
--- /dev/null
+++ b/pages/purchaseReturn/coms/requestInfoPopup.vue
@@ -0,0 +1,102 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<request-common-info :dataContent="dataContent"  @onClose="closePopup">
+				<view class="">
+					<comListItem :dataList="dataList"></comListItem>
+				</view>
+				<u-line></u-line>
+			</request-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestCommonInfo from '@/mycomponents/request/requestCommonInfo.vue'
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+		components: {
+			requestCommonInfo,
+			comListItem
+		},
+		data() {
+			return {
+				dataContent:{},
+				dataList:[]
+			}
+		},
+		watch:{
+		},
+
+		mounted() {},
+		props: {
+		},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				this.dataList=[{
+						title: '采购收货记录单号',
+						content: this.dataContent.purchaseReceiptRecordNumber
+					}, {
+						title: '发货单号',
+						content: this.dataContent.asnNumber
+					},{
+						title: '要货计划单号',
+						content: this.dataContent.ppNumber,
+					},{
+						title: '供应商代码',
+						content: this.dataContent.supplierCode,
+					},{
+						title: '承运商',
+						content: this.dataContent.carrierCode,
+					},{
+						title: '运输方式',
+						content: this.dataContent.transferMode,
+						type:"transferMode",
+					},{
+						title: '车牌号',
+						content: this.dataContent.vehiclePlateNumber,
+					},{
+						title: '从仓库代码',
+						content: this.dataContent.fromWarehouseCode,
+					},{
+						title: '到仓库代码',
+						content: this.dataContent.toWarehouseCode,
+					},{
+						title: '从库位类型范围',
+						content: this.dataContent.fromLocationTypes,
+						type:"locationType"
+					},
+					{
+						title: '到库位类型范围',
+						content: this.dataContent.toLocationTypes,
+						type:"locationType"
+					},
+					{
+						title: '从库区代码范围',
+						content: this.dataContent.fromAreaCodes,
+					},
+					{
+						title: '到库区代码范围',
+						content: this.dataContent.toAreaCodes
+					},
+					{
+						title: '从月台代码',
+						content: this.dataContent.fromDockCode
+					}];
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/purchaseReturn/coms/returnDetailInfoPopup.vue b/pages/purchaseReturn/coms/returnDetailInfoPopup.vue
new file mode 100644
index 0000000..642fa7e
--- /dev/null
+++ b/pages/purchaseReturn/coms/returnDetailInfoPopup.vue
@@ -0,0 +1,57 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.poNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.poLine}} </text>
+						</view>
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res=>{
+					this.$refs.popup.open('bottom')
+				},500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/purchaseReturn/coms/returnInfoPopup.vue b/pages/purchaseReturn/coms/returnInfoPopup.vue
new file mode 100644
index 0000000..abef135
--- /dev/null
+++ b/pages/purchaseReturn/coms/returnInfoPopup.vue
@@ -0,0 +1,79 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">发货单号 : </text>
+							<text class="text_wrap">{{dataContent.asnNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">要货计划单号 : </text>
+							<text class="text_wrap">{{dataContent.ppNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">供应商代码 : </text>
+							<text class="text_wrap">{{dataContent.supplierCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">承运商 : </text>
+							<text class="text_wrap">{{dataContent.carrierCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">运输方式 : </text>
+							<text class="text_wrap">{{getTransferModeName(dataContent.transferMode)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">车牌号 : </text>
+							<text class="text_wrap">{{dataContent.vehiclePlateNumber}} </text>
+						</view>
+					</view>
+				</view>
+				<u-line></u-line>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	import {getTransferModeName} from '@/common/directory.js'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res=>{
+					this.$refs.popup.open('bottom')
+				},500)
+				
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			getTransferModeName(value){
+				return getTransferModeName(value)
+			}
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/purchaseReturn/coms/returnJobListPopup.vue b/pages/purchaseReturn/coms/returnJobListPopup.vue
new file mode 100644
index 0000000..56759af
--- /dev/null
+++ b/pages/purchaseReturn/coms/returnJobListPopup.vue
@@ -0,0 +1,52 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-return-job-card :dataContent="item" @click='selectItem(item)'></com-return-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	import comReturnJobCard from '@/pages/purchaseReturn/coms/comReturnJobCard.vue'
+	
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comReturnJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+				// setTimeout(res=>{
+				// 	this.receiptList = items;
+				// 	this.$refs['popupItems'].open("center");
+				// },100)
+				
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue
new file mode 100644
index 0000000..b7a7205
--- /dev/null
+++ b/pages/purchaseReturn/job/returnDetail.vue
@@ -0,0 +1,471 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号：{{jobContent.requestNumber}}
+			</view>
+			<u-line color="#D8D8D8"></u-line>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<com-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData"
+							@updateData='updateData' @openDetail="openDetail">
+						</com-detail-card>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<return-detail-info-popup ref="jobDetailPopup"></return-detail-info-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getBasicLocationByCode,
+		getPurchasereturnJobDetail,
+		purchaseReturnJobsubmit,
+		cancleTakePurchasereturnJob,
+		takePurchasereturnJob
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		getCurrDateTime,
+		getPackingNumberAndBatch,
+		navigateBack
+	} from '@/common/basic.js';
+	import {
+		getInventoryStatusName
+	} from '@/common/directory.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import returnDetailInfoPopup from '@/pages/purchaseReturn/coms/returnDetailInfoPopup.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+
+	export default {
+		name: 'returnDetail',
+		components: {
+			winScanButton,
+			winScanPackAndLocation,
+			comDetailCard,
+			returnDetailInfoPopup,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				businessTypeInfo: {},
+				managementList: [],
+				jobStatus: ""
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus == "2") {
+					//取消承接任务	
+					cancleTakePurchasereturnJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				if (this.id != null) {
+					takePurchasereturnJob(this.id).then(res => {
+						uni.hideLoading();
+						callback();
+					}).catch(error => {
+						uni.hideLoading();
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getPurchasereturnJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status
+							that.subList = res.data.subList;
+							that.toLocationCode = that.jobContent.toLocationCode
+							that.detailSource = getDataSource(that.subList);
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.continueScan()
+				this.$forceUpdate();
+			},
+
+			calcScanCount(closeScan) {
+				let items = this.subList.filter(r => {
+					if (r.scaned) {
+						return r;
+					}
+				})
+				this.scanCount = items != null ? items.length : 0;
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				}
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var itemDetail = undefined;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						//箱码、批次、库位、
+						itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch &&
+								r.fromLocationCode == result.fromLocationCode
+						})
+						let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+						//不存在提示
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
+								.fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>已经扫描")
+							return;
+						} else {
+							itemDetail = detail.subList.find(r => {
+								return r.packingNumber == packingNumber &&
+									r.batch == batch &&
+									r.fromLocationCode == result.fromLocationCode &&
+									r.inventoryStatus == result.balance.inventoryStatus
+							})
+							//箱码、批次、库位、状态不一致
+							if (itemDetail == undefined) {
+								itemDetail = detail.subList.find(r => {
+									return r.packingNumber == packingNumber &&
+										r.batch == batch &&
+										r.fromLocationCode == result.fromLocationCode
+								})
+								if (itemDetail.scaned) {
+									this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
+										.fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>已经扫描")
+									return;
+								}
+
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+										']不一致,是否继续退货?', res => {
+											if (res) {
+												itemDetail.scaned = true;
+												itemDetail.handleQty = Number(result.balance.qty);
+												itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+												itemDetail.inventoryStatus =result.balance.inventoryStatus;
+												itemDetail.balance = result.balance;
+												itemDetail.balance.balanceQty = result.balance.qty;
+												itemDetail.balance.stdPackQty = result.package.stdPackQty
+												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+												this.calcHandleQty();
+											} else {
+												this.scanPopupGetFocus();
+											}
+										});
+								} else {
+									this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+										itemStatus +
+										']不一致,不允许转移!', res => {
+											this.scanPopupGetFocus();
+										});
+								}
+
+
+							} else {
+								// 箱码、批次、库位、状态一致
+								if (itemDetail.scaned) {
+									this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
+										.fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>已经扫描")
+									return;
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.handleQty = Number(result.balance.qty);
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+									itemDetail.inventoryStatus =result.balance.inventoryStatus;
+									itemDetail.balance = result.balance;
+									itemDetail.balance.balanceQty = Number(result.balance.qty);
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									this.calcHandleQty();
+								}
+							}
+
+						}
+
+					}
+					this.scanPopupGetFocus();
+				} catch (e) {
+					this.showErrorMessage(e.message);
+				}
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//允许部分提交
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this
+							.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+				purchaseReturnJobsubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage(res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toPackingNumber = detail.packingNumber;
+							detail.toContainerNumber = detail.containerNumber;
+							detail.toBatch = detail.batch;
+
+							detail.toLocationCode = detail.toLocationCode;
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			openDetail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.scanPopupGetFocus()
+					}
+				});
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.scanPopupGetFocus()
+					}
+				});
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+			showCommitSuccessMessage(number) {
+				this.$refs.comMessage.showSuccessMessage('提交成功<br>生成退货记录:' + number, res => {
+					navigateBack(1)
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/purchaseReturn/job/returnJob.vue b/pages/purchaseReturn/job/returnJob.vue
new file mode 100644
index 0000000..3e0fec9
--- /dev/null
+++ b/pages/purchaseReturn/job/returnJob.vue
@@ -0,0 +1,305 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" @onScanAsnNumber="getScanAsnNumber"
+			:checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-return-job-card :dataContent="item" @click='openJobDetail(item)'></com-return-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+			<return-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></return-job-list-popup>
+			<return-info-popup ref='jobInfoPopup'></return-info-popup>
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+
+	import {
+		getPurchaseReturnJobList,
+		cancleTakePurchasereturnJob
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+
+	import comReturnJobCard from '@/pages/purchaseReturn/coms/comReturnJobCard.vue'
+	import returnJobListPopup from '@/pages/purchaseReturn/coms/returnJobListPopup.vue'
+	import returnInfoPopup from '@/pages/purchaseReturn/coms/returnInfoPopup.vue'
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comReturnJobCard,
+			returnInfoPopup,
+			returnJobListPopup,
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: []
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+
+				getPurchaseReturnJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("采购退货(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("采购退货");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showErrorMessage(error)
+				})
+			},
+
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './returnDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.jobListPopup.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakePurchasereturnJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+					
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+
+			getScanAsnNumber(code) {
+				this.getDataListByType(code, "asnNumber")
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code, "number")
+			},
+			getDataListByType(code, type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				if (type == "asnNumber") {
+					filters.push({
+						column: "asn_number",
+						action: "==",
+						value: code
+					})
+				} else if (type == "number") {
+					filters.push({
+						column: "number",
+						action: "==",
+						value: code
+					})
+				}
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getPurchaseReturnJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					} else {
+						if (type == "asnNumber") {
+							that.showItemList(res.data.list);
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue
new file mode 100644
index 0000000..2ba1de4
--- /dev/null
+++ b/pages/purchaseReturn/record/returnRecord.vue
@@ -0,0 +1,398 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-header">
+				<view class="header_item">
+					供应商代码：{{supplierCode}}
+				</view>
+				<view class="header_item">
+					采购订单：{{poNumber}}
+				</view>
+				<u-line color="#D8D8D8"></u-line>
+			</view>
+
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" @removeItem="removeItem(index,item)"
+								@updateData="updateData" @removePack="removePack" :isShowToLocation="false">
+							</record-com-detail-card>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'>
+		</win-scan-pack-and-location>
+		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		purchaseReturnRecordSubmit,
+		purchaseReturnRequestCreate
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		updateTitle,
+		navigateBack,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+
+	export default {
+		components: {
+			winScanButton,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+
+		},
+
+		data() {
+			return {
+				id: '',
+				submitMainContent: {}, //提交内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				fromLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				businessType: {}, //业务类型
+				supplierCode: '', //供应商代码
+				poNumber: '',
+				fromType: "",
+				dataContent: {}
+			};
+		},
+
+		onLoad(option) {
+			this.fromType = option.fromType
+			if (this.fromType == "requestType") {
+				updateTitle("采购退货申请")
+			} else {
+				updateTitle("采购退货记录")
+			}
+			var typeCode = "PurchaseReturn"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {
+
+		},
+		methods: {
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanFromLocationCode.openScanPopup();
+				})
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+
+			getScanResult(result) {
+				if (this.supplierCode == '') {
+					this.supplierCode = result.label.supplierCode;
+				} else {
+					if (this.supplierCode != result.label.supplierCode) {
+						this.showErrorMessage('扫描的供应商代码[' + result.label.supplierCode + ']与默认供应商代码[' + this.poNumber + ']不一致')
+						return;
+					}
+				}
+
+				if (this.poNumber == '') {
+					this.poNumber = result.label.poNumber;
+				} else {
+					if (this.poNumber != result.label.poNumber) {
+						this.showErrorMessage('扫描的采购订单号[' + result.label.poNumber + ']与默认采购订单号[' + this.poNumber + ']不一致')
+						return;
+					}
+				}
+				this.getDataSource(result)
+			},
+
+			getDataSource(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemInfo = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack);
+					itemInfo.subList.push(newDetail);
+					this.detailSource.push(itemInfo)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus &&
+							r.scaned == true) {
+							return r;
+						}
+					})
+
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						this.showErrorMessage('箱码[' + balance.packingNumber + "]已经在列表中")
+					}
+				}
+				calcHandleQty(this.detailSource);
+			},
+
+			updateData() {
+				calcHandleQty(this.detailSource);
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			commit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//直接创建申请
+
+					//直接创建记录
+					//采购退货直接出库，不用查询管理模式
+					var params = this.setRecordParams(true)
+					console.log("提交参数", JSON.stringify(params));
+
+					purchaseReturnRecordSubmit(params).then(res => {
+						uni.hideLoading()
+						if (res.data) {
+							this.showCommitSuccessMessage("提交成功<br>生成采购退货记录<br>" + res.data)
+						} else {
+							this.showErrorMessage("提交失败[" + res.msg+"]")
+						}
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error)
+					})
+				} else {
+					this.showErrorMessage("没有要提交的数据")
+				}
+			},
+
+
+			setRecordParams(queryModel) {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.dataContent.creator = creator;
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var submitItem = deepCopyData(detail)
+							submitItem.itemCode = detail.itemCode;
+							submitItem.inventoryStatus = detail.inventoryStatus;
+
+							submitItem.fromPackingNumber = detail.packingNumber;
+							submitItem.toPackingNumber = detail.packingNumber;;
+
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+
+							submitItem.fromBatch = detail.batch;
+							submitItem.toBatch = detail.batch;
+
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = ''; //采购退货直接出库，目标库位为空
+							
+							submitItem.qty = detail.handleQty;
+							submitItem.package = "";
+							subList.push(submitItem)
+						}
+					})
+				})
+				this.dataContent.subList = subList
+				this.dataContent.creator = creator;
+				// this.dataContent.jobNumber = '';
+				return this.dataContent;
+			},
+
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			getFromLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+
+			getFromLocationCode(location, code) {
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					if (this.fromType == "requestType") {
+						navigateBack(1)
+					} else {
+						//清空
+						this.subList = [];
+						this.detailSource = [];
+						this.toLocationInfo = {}
+					}
+
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/purchaseReturn/request/returnRequest.vue b/pages/purchaseReturn/request/returnRequest.vue
new file mode 100644
index 0000000..710dc47
--- /dev/null
+++ b/pages/purchaseReturn/request/returnRequest.vue
@@ -0,0 +1,396 @@
+<template>
+	<view>
+		<com-empty-view v-if="requestList.length==0"></com-empty-view>
+		<request-filter ref="filter" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
+			:checkedWaitTask="checkedWaitTask">
+		</request-filter>
+		<view v-if="requestList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in requestList" :key="index">
+					<uni-swipe-action-item :right-options="item.options" @click="swipeClick($event,item)">
+						<com-return-request-card :dataContent="item" @click='openRequestDetail(item)'>
+						</com-return-request-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+			<uni-load-more :status="loadingType" />
+			<request-info-popup ref='requestInfoPopup'></request-info-popup>
+		</view>
+		<requestButton @goScan='openScanDetailPopup'></requestButton>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import requestFilter from '@/mycomponents/request/requestFilter.vue'
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comReturnRequestCard from '@/pages/purchaseReturn/coms/comReturnRequestCard.vue'
+	import requestInfoPopup from '@/pages/purchaseReturn/coms/requestInfoPopup.vue'
+	import requestButton from '@/mycomponents/button/requestButton.vue'
+
+	import {
+		goHome,
+		updateTitle,
+		clearTirmAndWrap
+	} from '@/common/basic.js';
+	import {
+		getPurchaseReturnRequestList,
+		purchaseReturnRequestClose,
+		purchaseReturnRequestApprove,
+		purchaseReturnRequestApproveAgree,
+		purchaseReturnRequestApproveRefused,
+		purchaseReturnRequestHandle,
+		purchaseReturnRequestAddAgain
+	} from '@/api/request2.js';
+	import {
+		getDetailOption,
+		getDetailAndApproveOption,
+		getDetailAndApprovePassAndApproveNoOption,
+		getDetailAndHandleOption,
+		getDetailAndAddAndCloseOption,
+		getAddAgainOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			requiredLocation,
+			comReturnRequestCard,
+			requestInfoPopup,
+			requestButton,
+			requestFilter
+		},
+		data() {
+			return {
+				requestList: [],
+				pageNo: 1,
+				pageSize: 10,
+				status: "1,2,3,4,5,6",
+				totalCount: 0,
+				checkedWaitTask: false,
+				detailOptions: [],
+				detailAndApproveOptions: [],
+				detailAndApprovePassAndApproveNoOption: [],
+				detailAndHandleOption: [],
+				detailAndAddAndCloseOption: [],
+				addAgainOption: [],
+				showOptions: [],
+				fromType: "requestType",
+				loadingType: "nomore",
+
+			};
+		},
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.addAgainOption = getAddAgainOption();
+			this.detailAndApproveOptions = getDetailAndApproveOption()
+			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
+				this.detailAndHandleOption = getDetailAndHandleOption()
+			this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
+
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+		onShow() {
+			this.getList('refresh');
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+
+		mounted() {
+
+		},
+		methods: {
+			openRequestDetail(item) {
+				uni.navigateTo({
+					url: './returnRequestDetail?id=' + item.id + '&fromType=' + this.fromType
+				});
+			},
+
+			openRequestInfoPopup(item) {
+				this.$refs.requestInfoPopup.openPopup(item)
+			},
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.requestList = [];
+				}
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getPurchaseReturnRequestList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					list.forEach(res => {
+						var options = this.updateOptions(res.status);
+						res.options = options;
+					})
+					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
+					this.pageNo++;
+					updateTitle("采购退货申请(" + this.totalCount + ")");
+
+				}).catch(error => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("采购退货申请");
+					this.loadingType = "";
+					that.showMessage(error)
+				})
+			},
+
+			updateOptions(status) {
+				if (status == "1") {
+					this.showOptions = this.detailAndApproveOptions;
+				} else if (status == "2") {
+					this.showOptions = this.detailAndApprovePassAndApproveNoOption;
+				} else if (status == "3") {
+					this.showOptions = this.detailAndHandleOption;
+				} else if (status == "4") {
+					this.showOptions = this.detailAndAddAndCloseOption;
+				} else if (status == "5") {
+					this.showOptions = this.addAgainOption;
+				} else {
+					this.showOptions = this.detailOptions;
+				}
+				return this.showOptions
+			},
+
+			openScanDetailPopup(item) {
+				uni.navigateTo({
+					url: "./returnRequestCreate"
+				})
+			},
+
+			swipeClick(e, dataContent) {
+				var text = clearTirmAndWrap(e.content.text)
+				if (text == "详情") {
+					this.openRequestInfoPopup(dataContent);
+				} else if (text == "处理") {
+					this.showQuestionMessage("确定要处理当前申请吗?", res => {
+						this.purchaseReturnRequestHandle(dataContent.id)
+					})
+				} else if (text == "提交审批") {
+					this.showQuestionMessage("确定要审批当前申请吗?", res => {
+						this.purchaseReturnRequestApprove(dataContent.id)
+					})
+				} else if (text == "审批通过") {
+					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
+						this.purchaseReturnRequestApproveAgree(dataContent.id)
+					})
+				} else if (text == "审批驳回") {
+					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
+						this.purchaseReturnRequestApproveRefused(dataContent.id)
+					})
+				} else if (text == "关闭") {
+					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
+						this.purchaseReturnRequestClose(dataContent.id)
+					})
+				} else if (text == "重新添加") {
+					this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
+						this.purchaseReturnRequestAddAgain(dataContent.id)
+					})
+				}
+			},
+			showQuestionMessage(hint, callBack) {
+				this.$refs.comMessage.showQuestionMessage(hint,
+					res => {
+						if (res) {
+							callBack()
+						}
+					});
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getPurchaseReturnRequestList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的退货任务');
+					} else if (res.data.list.length == 1) {
+						that.openRequestDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+
+			purchaseReturnRequestApprove(id) {
+				purchaseReturnRequestApprove(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请提交审批成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请提交审批失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+
+			},
+
+			purchaseReturnRequestClose(id) {
+				purchaseReturnRequestClose(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请关闭成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请关闭失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			purchaseReturnRequestAddAgain(id) {
+				purchaseReturnRequestAddAgain(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请重新添加成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请重新添加失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			purchaseReturnRequestApproveAgree(id) {
+				purchaseReturnRequestApproveAgree(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批通过成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批通过失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			purchaseReturnRequestApproveRefused(id) {
+				purchaseReturnRequestApproveRefused(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批驳回成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批驳回失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			purchaseReturnRequestHandle(id) {
+				purchaseReturnRequestHandle(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请处理成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请处理失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/purchaseReturn/request/returnRequestCreate.vue b/pages/purchaseReturn/request/returnRequestCreate.vue
new file mode 100644
index 0000000..d308530
--- /dev/null
+++ b/pages/purchaseReturn/request/returnRequestCreate.vue
@@ -0,0 +1,358 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<u-line></u-line>
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" @removeItem="removeItem(index,item)"
+								@updateData="updateData" @removePack="removePack"
+								:isShowToLocation="false">
+							</record-com-detail-card>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'>
+		</win-scan-pack-and-location>
+		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		purchaseReturnRequestCreate
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		updateTitle,
+		navigateBack,
+		deepCopyData,
+		getCurrDateOneMonthsTimes
+	} from '@/common/basic.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+	
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+
+	export default {
+		components: {
+			winScanButton,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+
+		},
+
+		data() {
+			return {
+				id: '',
+				submitMainContent: {}, //提交内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				fromLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				businessType: {}, //业务类型
+				poNumber: '',
+				dataContent : {}
+			};
+		},
+
+		onLoad(option) {
+			var typeCode = "PurchaseReturn"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {
+
+		},
+		methods: {
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanFromLocationCode.openScanPopup();
+				})
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+
+			getScanResult(result) {
+				if (this.poNumber == '') {
+					this.poNumber = result.label.poNumber;
+				} else {
+					if (this.poNumber != result.label.poNumber) {
+						this.showErrorMessage('扫描的采购订单号[' + result.label.poNumber + ']与默认采购订单号[' + this.poNumber + ']不一致')
+						return;
+					}
+				}
+				this.getDataSource(result)
+			},
+
+			getDataSource(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemInfo = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); 
+					itemInfo.subList.push(newDetail);
+					this.detailSource.push(itemInfo)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus &&
+							r.scaned == true) {
+							return r;
+						}
+					})
+
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						this.showErrorMessage('箱码[' + balance.packingNumber + "]已经在列表中")
+					}
+				}
+				calcHandleQty(this.detailSource);
+			},
+
+			updateData() {
+				calcHandleQty(this.detailSource);
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			commit() {
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+						uni.showLoading({
+							title: "提交中....",
+							mask: true
+						});
+						var params = this.setRequestParams();
+						console.log("提交" + JSON.stringify(params))
+						purchaseReturnRequestCreate(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成采购退货申请<br>" + res.data)
+							} else {
+								this.showErrorMessage("提交失败["+res.msg+"]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+
+				} else {
+					this.showErrorMessage("没有要提交的数据")
+				}
+			},
+
+			
+			setRequestParams(){
+				var subList = []
+				var supplierCode=""
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var submitItem = deepCopyData(detail)
+							if(supplierCode==""){
+								supplierCode = detail.package.supplierCode
+							}
+							submitItem.fromLocationCode = detail.locationCode
+							submitItem.qty =detail.handleQty;
+							subList.push(submitItem)
+						}
+					})
+				})
+				
+				this.dataContent.subList = subList
+				this.dataContent.purchaseReceiptRecordNumber="";
+				this.transferMode ="";
+				this.dataContent.supplierCode = supplierCode
+				this.dataContent.dueTime =getCurrDateOneMonthsTimes()
+				//这些都应该由接口赋值
+				// this.dataContent.businessType = "PurchasePutaway"
+				// this.dataContent.departmentCode = "研发部门";
+				// this.dataContent.status=  1 ;
+				// this.dataContent.autoCommit =  "FALSE";
+				// this.dataContent.autoAgree = "FALSE";
+				// this.dataContent.autoExecute = "FALSE";
+				// this.dataContent.directCreateRecord = "FALSE";
+				return this.dataContent;
+			},
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			getFromLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+
+			getFromLocationCode(location, code) {
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+						navigateBack(1)
+				
+					
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/purchaseReturn/request/returnRequestDetail.vue b/pages/purchaseReturn/request/returnRequestDetail.vue
new file mode 100644
index 0000000..96deb92
--- /dev/null
+++ b/pages/purchaseReturn/request/returnRequestDetail.vue
@@ -0,0 +1,128 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<request-top :dataContent="requestContent"></request-top>
+			</view>
+			<view class="header_item">
+				供应商 : {{requestContent.supplierCode}}
+			</view>
+			<u-line color="#D8D8D8" />
+		</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<com-request-detail-card :dataContent="item" @openDetail="openDetail">
+						</com-request-detail-card>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<request-detail-info-popup ref="jobDetailPopup"></request-detail-info-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getPurchaseReturnRequestDetail,
+
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource,
+	} from '@/common/detail.js';
+
+
+	import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
+	import requestDetailInfoPopup from '@/pages/purchaseReturn/coms/requestDetailInfoPopup.vue'
+	import requestTop from "@/mycomponents/request/requestTop.vue"
+
+
+	export default {
+		components: {
+			comRequestDetailCard,
+			requestDetailInfoPopup,
+			requestTop
+		},
+		data() {
+			return {
+				id: '',
+				requestContent: {}, //任务内容
+				subList: [], //接口返回的任务details
+				detailSource: [], //绑定在页面上的数据源
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			this.getDetail();
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getPurchaseReturnRequestDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.requestContent = res.data;
+							that.subList = res.data.subList;
+							that.subList.forEach(res => {
+								// res.fromLocationCode = res.toLocationCode
+								res.locationCode = res.fromLocationCode
+							})
+							that.detailSource = getDataSource(that.subList);
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+			openDetail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/putaway/coms/comPutawayJobCard.vue b/pages/putaway/coms/comPutawayJobCard.vue
new file mode 100644
index 0000000..4f19c5d
--- /dev/null
+++ b/pages/putaway/coms/comPutawayJobCard.vue
@@ -0,0 +1,48 @@
+<template>
+	<job-com-main-card :dataContent="dataContent">
+		<view class="task_item">
+			<view class="task_item">
+				<view class="task_text">
+					<view class="">
+						申请单号 : {{dataContent.requestNumber}}
+					</view>
+				</view>
+			</view>
+
+			<view class="task_item">
+				<view class="task_text">
+					<view class="">
+						客户代码 : {{dataContent.supplierCode}}
+					</view>
+				</view>
+			</view>
+		</view>
+	</job-com-main-card>
+</template>
+
+<script>
+	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+	export default {
+		components: {
+			jobComMainCard,
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/putaway/coms/comPutawayRequestCard.vue b/pages/putaway/coms/comPutawayRequestCard.vue
new file mode 100644
index 0000000..e142866
--- /dev/null
+++ b/pages/putaway/coms/comPutawayRequestCard.vue
@@ -0,0 +1,36 @@
+<template>
+ 	<request-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				供应商代码 : {{dataContent.supplierCode}}
+ 			</view>
+ 		</view>
+ 	</request-com-main-card>
+ </template>
+
+ <script>
+ 	import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			requestComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/putaway/coms/putawayDetailInfoPopup.vue b/pages/putaway/coms/putawayDetailInfoPopup.vue
new file mode 100644
index 0000000..eef803f
--- /dev/null
+++ b/pages/putaway/coms/putawayDetailInfoPopup.vue
@@ -0,0 +1,57 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.poNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.poLine}} </text>
+						</view>
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/putaway/coms/putawayInfoPopup.vue b/pages/putaway/coms/putawayInfoPopup.vue
new file mode 100644
index 0000000..e3e2e79
--- /dev/null
+++ b/pages/putaway/coms/putawayInfoPopup.vue
@@ -0,0 +1,53 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">供应商代码 : </text>
+							<text class="text_wrap">{{dataContent.carrierCode}} </text>
+						</view>
+					</view>
+				</view>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/putaway/coms/putawayJobListPopup.vue b/pages/putaway/coms/putawayJobListPopup.vue
new file mode 100644
index 0000000..9a17ec1
--- /dev/null
+++ b/pages/putaway/coms/putawayJobListPopup.vue
@@ -0,0 +1,47 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-return-job-card :dataContent="item" @click='selectItem(item)'></com-return-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	import comReturnJobCard from '@/pages/purchaseReturn/coms/comReturnJobCard.vue'
+	
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comReturnJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/putaway/coms/requestDetailInfoPopup.vue b/pages/putaway/coms/requestDetailInfoPopup.vue
new file mode 100644
index 0000000..21a597b
--- /dev/null
+++ b/pages/putaway/coms/requestDetailInfoPopup.vue
@@ -0,0 +1,86 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<requestDetailCommonInfo :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">包装号 : </text>
+							<text class="text_wrap">{{dataContent.packingNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">器具号 : </text>
+							<text class="text_wrap">{{dataContent.containerNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">批次 : </text>
+							<text class="text_wrap">{{dataContent.batch}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">库存状态 : </text>
+							<text class="text_wrap">{{dataContent.inventoryStatus}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.poNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.poLine}} </text>
+						</view>
+						
+						<view class="item">
+							<text class="item_title">从库位代码 : </text>
+							<text class="text_wrap">{{dataContent.fromLocationCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从货主代码 : </text>
+							<text class="text_wrap">{{dataContent.fromOwnerCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到货主代码 : </text>
+							<text class="text_wrap">{{dataContent.toOwnerCode}} </text>
+						</view>
+					</view>
+				</view>
+			</requestDetailCommonInfo>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue'
+	export default {
+		components: {
+			requestDetailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/putaway/coms/requestInfoPopup.vue b/pages/putaway/coms/requestInfoPopup.vue
new file mode 100644
index 0000000..d4aed62
--- /dev/null
+++ b/pages/putaway/coms/requestInfoPopup.vue
@@ -0,0 +1,73 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<request-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<comListItem :dataList="dataList"></comListItem>
+				</view>
+				<u-line></u-line>
+			</request-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestCommonInfo from '@/mycomponents/request/requestCommonInfo.vue'
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+		components: {
+			requestCommonInfo,
+			comListItem
+		},
+		data() {
+			return {
+				dataContent: {},
+				dataList: []
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				this.dataList = [{
+					title: '从仓库代码',
+					content: this.dataContent.fromWarehouseCode
+				}, {
+					title: '到仓库代码',
+					content: this.dataContent.toWarehouseCode
+				}, {
+					title: '从库位类型范围',
+					content: this.dataContent.fromLocationTypes,
+					type:"locationType"
+				}, {
+					title: '到库位类型范围',
+					content: this.dataContent.toLocationTypes,
+					type:"locationType"
+				}, {
+					title: '从库区代码范围',
+					content: this.dataContent.fromAreaCodes,
+				}, {
+					title: '到库区代码范围',
+					content: this.dataContent.toAreaCodes,
+				}, {
+					title: '供应商代码',
+					content: this.dataContent.supplierCode,
+				}];
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue
new file mode 100644
index 0000000..8e6cea6
--- /dev/null
+++ b/pages/putaway/job/putawayDetail.vue
@@ -0,0 +1,515 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+			<u-line color="#D8D8D8"></u-line>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
+							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
+							:locationTypeList='tolocationTypeList'>
+						</com-detail-card>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+
+		<putaway-detail-info-popup ref="jobDetailPopup"></putaway-detail-info-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getManagementPrecisions,
+	} from '@/common/balance.js';
+
+	import {
+		getPutawayJobDetail,
+		getBasicLocationByCode,
+		putawayJobSubmit,
+		takePutawayJob,
+		cancleTakePutawayJob
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		getCurrDateTime,
+		getPackingNumberAndBatch,
+		navigateBack
+	} from '@/common/basic.js';
+
+	import {
+		getDirectoryItemArray,
+		getInventoryStatusName
+	} from '@/common/directory.js';
+
+	import {
+		getDataSource,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import putawayDetailInfoPopup from '@/pages/putaway/coms/putawayDetailInfoPopup.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPackAndLocation,
+			requiredLocation,
+			comDetailCard,
+			putawayDetailInfoPopup,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				managementList: [],
+				fromLocationCode: "",
+				toLocationCode: "",
+				tolocationTypeList: [],
+				jobStatus:""
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务
+					cancleTakePutawayJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takePutawayJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getPutawayJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status
+							that.subList = res.data.subList;
+							that.detailSource = getDataSource(that.subList)
+
+							that.fromLocationCode = that.subList[0].fromLocationCode
+							that.toLocationCode = that.subList[0].toLocationCode
+							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
+
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			calcScanCount(closeScan) {
+				let items = this.subList.filter(r => {
+					if (r.scaned) {
+						return r;
+					}
+				})
+				this.scanCount = items != null ? items.length : 0;
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				}
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource);
+				this.continueScan()
+				this.$forceUpdate();
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.balance.packingNumber;
+					var batch = result.balance.batch;
+					var qty = result.balance.qty;
+					var itemCode = result.balance.itemCode;
+					var locationCode = result.balance.locationCode;
+					var inventoryStatus = result.balance.inventoryStatus;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch &&
+								r.fromLocationCode == result.fromLocationCode
+						})
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+								.fromLocationCode + "】不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+									.fromLocationCode + "】已经扫描")
+							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,是否继续上架?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty);
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty);
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									} else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.handleQty = Number(result.balance.qty);
+									itemDetail.toInventoryStatus = itemDetail.inventoryStatus
+									itemDetail.balance = result.balance;
+									itemDetail.balance.balanceQty = Number(result.balance.qty);
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+				} catch (e) {
+					this.showMessage(e.message)
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+			openDetail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.showMessageHint('请扫描收货库位', callback => {
+						this.$refs.comScanLocation.showLocation();
+					})
+
+					return isPass = false;
+				}
+				return isPass;
+			},
+
+			showMessageHint(hint, callback) {
+				this.$refs.comMessage.showErrorMessage(hint, res => {
+					if (res) {
+						callback()
+					}
+				});
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				if (!this.checkLocation()) {
+					return
+				}
+
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this
+							.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+
+				//获取管理模式，封装参数
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams()
+						console.log("提交参数", JSON.stringify(params));
+						putawayJobSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成采购上架记录<br>" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+
+			},
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							detail.toContainerNumber = '';
+
+							detail.singlePrice = detail.balance.singlePrice;
+							detail.amount = detail.balance.singlePrice * detail.handleQty;
+
+							detail.arriveDate = detail.balance.arriveDate;
+							detail.produceDate = detail.balance.produceDate;
+							detail.expireDate = detail.balance.expireDate;
+							subList.push(detail)
+						}
+					})
+				})
+
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/putaway/job/putawayJob.vue b/pages/putaway/job/putawayJob.vue
new file mode 100644
index 0000000..6a3069f
--- /dev/null
+++ b/pages/putaway/job/putawayJob.vue
@@ -0,0 +1,289 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-putaway-job-card :dataContent="item" @click='openJobDetail(item)'></com-putaway-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<putaway-info-popup ref='jobInfoPopup'></putaway-info-popup>
+			<putaway-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></putaway-job-list-popup>
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+			
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	
+	import {
+		getPutawayJobList,
+		cancleTakePutawayJob
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import comPutawayJobCard from '@/pages/putaway/coms/comPutawayJobCard.vue'
+	import putawayJobListPopup from '@/pages/putaway/coms/putawayJobListPopup.vue'
+	import putawayInfoPopup from '@/pages/putaway/coms/putawayInfoPopup.vue'
+
+	export default {
+		name: 'Putaway',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comPutawayJobCard,
+			putawayJobListPopup,
+			putawayInfoPopup,
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+				
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+
+				getPutawayJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("采购上架(" + this.totalCount + ")");
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					this.loadingType = "";
+					updateTitle("采购上架");
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './putawayDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.scanList.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakePutawayJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getPutawayJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue
new file mode 100644
index 0000000..be7af0b
--- /dev/null
+++ b/pages/putaway/record/putawayRecord.vue
@@ -0,0 +1,507 @@
+<template>
+	<view class="page-wraper">
+
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-header">
+				<view class="header_item">
+					来源库位 : {{fromLocationCode}}
+				</view>
+				<u-line />
+			</view>
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
+								:isShowFromLocation="false" @removeItem="removeItem(index,item)"
+								@updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
+						</view>
+
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<!-- <requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
+							@getLocation='getToLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation> -->
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation='false'>
+		</win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+	</view>
+</template>
+
+<script>
+	import {
+		putawayRequestSubmit,
+		putawayRecordSubmit,
+		validateItemAndLocation,
+		getPutawayRecommendLocation
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle,
+		getCurrDateTime,
+		getPackingNumberAndBatchByList,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import {
+		getManagementPrecisions,
+		getPrecisionStrategyList,
+		getPrecisionStrategyParams
+	} from '@/common/balance.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				dataContent: {}, //内容
+				detailSource: [], //绑定在页面上的数据源
+				fromLocationInfo: {},
+				fromLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				showToLoaction: true,
+				recommendLocationList: [], //推荐库位列表
+				fromWarehouseCode: '' //来源仓库
+			};
+		},
+		onLoad(option) {
+			this.clear();
+			var typeCode = "PurchasePutaway"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (this.fromWarehouseCode == '') {
+					this.fromWarehouseCode = balance.warehouseCode;
+				}
+				if (item == undefined) {
+					// 获取推荐库位
+					this.getRecommendLocation(balance, pack, toLocation => {
+						var itemp = createItemInfo(balance, pack);
+						let newDetail = createDetailInfo(balance, pack); //
+						newDetail.toLocationCode = toLocation.code;
+						newDetail.toWarehouseCode = toLocation.warehouseCode;
+						itemp.subList.push(newDetail);
+						this.detailSource.push(itemp)
+					})
+
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						this.getRecommendLocation(balance, pack, toLocation => {
+							let newDetail = createDetailInfo(balance, pack);
+							newDetail.toLocationCode = toLocation.code;
+							newDetail.toWarehouseCode = toLocation.warehouseCode;
+							item.subList.push(newDetail);
+						});
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+			},
+
+			//获取推荐库位
+			getRecommendLocation(balance, pack, callback) {
+				uni.showLoading({
+					title: '扫描中...',
+					mask: true
+				})
+				let recommend = this.recommendLocationList.find(r => r.itemCode == balance.itemCode);
+				if (recommend == undefined) {
+					let param = {
+						itemCode: balance.itemCode,
+						batch: balance.batch,
+						inventoryStatus: balance.inventoryStatus,
+						supplierCode: pack.supplierCode
+					};
+					console.log(JSON.stringify(param))
+					getPutawayRecommendLocation(param).then(res => {
+						this.recommendLocationList.push({
+							itemCode: balance.itemCode,
+							locationCode: res.data.code
+						})
+						callback(res.data);
+						uni.hideLoading();
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error);
+						uni.hideLoading();
+					})
+
+				} else {
+					callback(recommend);
+				}
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+			calcHandleQty() {
+				for (let item of this.detailSource) {
+					item.qty = 0;
+					for (let detail of item.subList) {
+						if (detail != undefined) {
+							item.qty = calc.add(item.qty,detail.qty)
+						}
+					}
+				}
+				this.$forceUpdate();
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			// scanLocationCode(location, code) {
+			// 	this.toLocationCode = code
+			// 	this.toLocationCode = location;
+
+			// },
+
+			commit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				//记录有目标库位，需要查询管理模式
+				let precisionStrategyParams = getPrecisionStrategyParams(this.detailSource);
+				//2:获取管理模式，封装参数
+				getPrecisionStrategyList(precisionStrategyParams, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setRecordParams()
+						console.log("提交参数", JSON.stringify(params));
+
+						putawayRecordSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成采购上架记录<br>" + res.data, )
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+			},
+
+
+			getItemAndLocationRelations() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.toLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									res.locationCode == detail.toLocationCode &&
+									res.batch == detail.batch &&
+									res.inventoryStatus == detail.inventoryStatus) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode,
+									batch: detail.batch,
+									inventoryStatus: detail.inventoryStatus,
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setRecordParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							var submitItem = deepCopyData(detail)
+							submitItem.toPackingNumber = info.packingNumber;
+							submitItem.toBatch = info.batch;
+							submitItem.toContainerNumber = detail.containerNumber;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.fromBatch = info.batch;
+							submitItem.fromContainerNumber = detail.containerNumber;
+
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+
+							// detail.toInventoryStatus = detail.inventoryStatus
+							// detail.toLocationCode = detail.toLocationCode
+							submitItem.qty = detail.handleQty ;
+							submitItem.package = "";
+							subList.push(submitItem)
+						}
+					})
+				})
+				if (subList.length > 0) {
+					this.dataContent.toWarehouseCode = subList[0].toWarehouseCode;
+				}
+				this.dataContent.subList = subList
+				this.dataContent.creator = creator;
+				this.dataContent.fromWarehouseCode = this.fromWarehouseCode;
+				return this.dataContent;
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationInfo = location;
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				if (this.fromLocationCode == code) {
+					uni.showToast({
+						title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+						duration: 2000
+					})
+					return
+				}
+				this.toLocationCode = code;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clear();
+				})
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			clear() {
+				this.fromLocationInfo = {};
+				this.fromLocationCode = '';
+				this.fromWarehouseCode = '';
+				this.toWarehouseCode = '';
+				this.detailSource = [];
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/putaway/request/putawayRequest.vue b/pages/putaway/request/putawayRequest.vue
new file mode 100644
index 0000000..c46f125
--- /dev/null
+++ b/pages/putaway/request/putawayRequest.vue
@@ -0,0 +1,397 @@
+<template>
+	<view>
+		<com-empty-view v-if="requestList.length==0"></com-empty-view>
+		<request-filter ref="filter" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
+			:checkedWaitTask="checkedWaitTask">
+		</request-filter>
+		<view v-if="requestList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in requestList" :key="index">
+					<uni-swipe-action-item :right-options="item.options" @click="swipeClick($event,item)">
+						<com-putaway-request-card :dataContent="item" @click='openRequestDetail(item)'>
+						</com-putaway-request-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+			<uni-load-more :status="loadingType" />
+			<request-info-popup ref='requestInfoPopup'></request-info-popup>
+		</view>
+		<requestButton @goScan='openScanDetailPopup'></requestButton>
+	</view>
+	<comMessage ref="comMessage"></comMessage>
+</template>
+
+<script>
+	import requestFilter from '@/mycomponents/request/requestFilter.vue'
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comPutawayRequestCard from '@/pages/putaway/coms/comPutawayRequestCard.vue'
+	import requestInfoPopup from '@/pages/putaway/coms/requestInfoPopup.vue'
+	import requestButton from '@/mycomponents/button/requestButton.vue'
+
+	import {
+		goHome,
+		updateTitle,
+		clearTirmAndWrap
+	} from '@/common/basic.js';
+
+	import {
+		getPutawayRequestList,
+		putawayRequestClose,
+		putawayRequestApprove,
+		putawayRequestApproveAgree,
+		putawayRequestApproveRefused,
+		putawayRequestHandle,
+		putawayRequestAddAgain
+	} from '@/api/request2.js';
+	import {
+		getDetailOption,
+		getDetailAndApproveOption,
+		getDetailAndApprovePassAndApproveNoOption,
+		getDetailAndHandleOption,
+		getDetailAndAddAndCloseOption,
+		getAddAgainOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			requestFilter,
+			requiredLocation,
+			comPutawayRequestCard,
+			requestInfoPopup,
+			requestButton,
+		},
+		data() {
+			return {
+				requestList: [],
+				pageNo: 1,
+				pageSize: 10,
+				status: "1,2,3,4,5,6",
+				totalCount: 0,
+				checkedWaitTask: false,
+				detailOptions: [],
+				detailAndApproveOptions: [],
+				detailAndApprovePassAndApproveNoOption: [],
+				detailAndHandleOption: [],
+				detailAndAddAndCloseOption: [],
+				addAgainOption: [],
+				showOptions: [],
+				fromType: "requestType",
+				loadingType: "nomore",
+			};
+		},
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.addAgainOption = getAddAgainOption();
+			this.detailAndApproveOptions = getDetailAndApproveOption()
+			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
+				this.detailAndHandleOption = getDetailAndHandleOption()
+			this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
+
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+		onShow() {
+			this.getList('refresh');
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+
+		mounted() {
+
+		},
+		methods: {
+			requestConfirm(action, item) {},
+
+			openRequestDetail(item) {
+				uni.navigateTo({
+					url: './putawayRequestDetail?id=' + item.id
+				});
+			},
+			openRequestInfoPopup(item) {
+				this.$refs.requestInfoPopup.openPopup(item)
+			},
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.requestList = [];
+				}
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getPutawayRequestList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					list.forEach(res => {
+						var options = this.updateOptions(res.status);
+						res.options = options;
+					})
+					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
+
+					this.pageNo++;
+					updateTitle("采购上架申请(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("采购上架申请");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+			updateOptions(status) {
+				if (status == "1") {
+					this.showOptions = this.detailAndApproveOptions;
+				} else if (status == "2") {
+					this.showOptions = this.detailAndApprovePassAndApproveNoOption;
+				} else if (status == "3") {
+					this.showOptions = this.detailAndHandleOption;
+				} else if (status == "4") {
+					this.showOptions = this.detailAndAddAndCloseOption;
+				} else if (status == "5") {
+					this.showOptions = this.addAgainOption;
+				} else {
+					this.showOptions = this.detailOptions;
+				}
+				return this.showOptions
+			},
+
+			openScanDetailPopup() {
+				uni.navigateTo({
+					url: "../request/putawayRequestCreate"
+				})
+
+				// uni.navigateTo({
+				// 	url: "../record/putawayRecord?fromType=" + this.fromType
+				// })
+			},
+
+
+			swipeClick(e, dataContent) {
+				var text = clearTirmAndWrap(e.content.text)
+				if (text == "详情") {
+					this.openRequestInfoPopup(dataContent);
+				} else if (text == "处理") {
+					this.showQuestionMessage("确定要处理当前申请吗?", res => {
+						this.putawayRequestHandle(dataContent.id)
+					})
+				} else if (text == "提交审批") {
+					this.showQuestionMessage("确定要审批当前申请吗?", res => {
+						this.putawayRequestApprove(dataContent.id)
+					})
+				} else if (text == "审批通过") {
+					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
+						this.putawayRequestApproveAgree(dataContent.id)
+					})
+				} else if (text == "审批驳回") {
+					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
+						this.putawayRequestApproveRefused(dataContent.id)
+					})
+				} else if (text == "关闭") {
+					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
+						this.putawayRequestClose(dataContent.id)
+					})
+				} else if (text == "重新添加") {
+					this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
+						this.putawayRequestAddAgain(dataContent.id)
+					})
+				}
+			},
+			showQuestionMessage(hint, callBack) {
+				this.$refs.comMessage.showQuestionMessage(hint,
+					res => {
+						if (res) {
+							callBack()
+						}
+					});
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getPutawayRequestList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openRequestDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			putawayRequestApprove(id) {
+				putawayRequestApprove(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请提交审批成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请提交审批失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+
+			},
+
+			putawayRequestClose(id) {
+				putawayRequestClose(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请关闭成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请关闭失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			putawayRequestAddAgain(id) {
+				putawayRequestAddAgain(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请重新添加成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请重新添加失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			putawayRequestApproveAgree(id) {
+				putawayRequestApproveAgree(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批通过成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批通过失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			putawayRequestApproveRefused(id) {
+				putawayRequestApproveRefused(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批驳回成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批驳回失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			putawayRequestHandle(id) {
+				putawayRequestHandle(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请处理成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请处理失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/putaway/request/putawayRequestCreate.vue b/pages/putaway/request/putawayRequestCreate.vue
new file mode 100644
index 0000000..3dcbcfc
--- /dev/null
+++ b/pages/putaway/request/putawayRequestCreate.vue
@@ -0,0 +1,431 @@
+<template>
+	<view class="page-wraper">
+
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-header">
+				<view class="header_item">
+					来源库位 : {{fromLocationCode}}
+				</view>
+				<view class="header_item">
+					供应商代码 : {{supplierCode}}
+				</view>
+				<u-line />
+			</view>
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
+								:isShowFromLocation="false" :isShowToLocation='false'
+								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<!-- <requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
+							@getLocation='getToLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation> -->
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation='false'>
+		</win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getFromLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+	</view>
+</template>
+
+<script>
+	import {
+		putawayRequestSubmit,
+		validateItemAndLocation,
+		getPutawayRecommendLocation
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle,
+		getCurrDateTime,
+		deepCopyData,
+		getPackingNumberAndBatchByList
+	} from '@/common/basic.js';
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import {
+		getManagementPrecisions,
+		getPrecisionStrategyList,
+		getPrecisionStrategyParams
+	} from '@/common/balance.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				dataContent: {}, //内容
+				detailSource: [], //绑定在页面上的数据源
+				fromLocationInfo: {},
+				fromLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				showToLoaction: true,
+				recommendLocationList: [], //推荐库位列表
+				fromWarehouseCode: '', //来源仓库
+				supplierCode: '' //供应商代码
+			};
+		},
+		onLoad(option) {
+			this.clear();
+			var typeCode = "PurchasePutaway"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				if (this.supplierCode == '') {
+					this.supplierCode = result.package.supplierCode
+				} else {
+					if (this.supplierCode != result.package.supplierCode) {
+						this.showErrorMessage('请扫描同一供应商【' + this.supplierCode + '】的物品')
+						return;
+					}
+				}
+
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (this.fromWarehouseCode == '') {
+					this.fromWarehouseCode = balance.warehouseCode;
+				}
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					newDetail.poNumber = pack.poNumber;
+					newDetail.poLine = pack.poLine;
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						newDetail.poNumber = pack.poNumber;
+						newDetail.poLine = pack.poLine;
+						// newDetail.toLocationCode = toLocation.code;
+						// newDetail.toWarehouseCode = toLocation.warehouseCode;
+						item.subList.push(newDetail);
+						// this.getRecommendLocation(balance, pack, toLocation => {
+						// 	let newDetail = createDetailInfo(balance, pack);
+						// 	newDetail.toLocationCode = toLocation.code;
+						// 	newDetail.toWarehouseCode = toLocation.warehouseCode;
+						// 	item.subList.push(newDetail);
+						// });
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+			calcHandleQty() {
+				for (let item of this.detailSource) {
+					item.qty = 0;
+					for (let detail of item.subList) {
+						if (detail != undefined) {
+							item.qty = calc.add(item.qty,detail.qty)
+						}
+					}
+				}
+				this.$forceUpdate();
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			// scanLocationCode(location, code) {
+			// 	this.toLocationCode = code
+			// 	this.toLocationCode = location;
+
+			// },
+
+			commit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var params = this.setRequestParams()
+				console.log("提交参数", JSON.stringify(params));
+
+				putawayRequestSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成采购上架申请<br>" + res.data, )
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+			setRequestParams() {
+				let requestContent = {};
+				var creator = this.$store.state.user.id
+				requestContent.creator = creator;
+				requestContent.supplierCode = this.supplierCode;
+				requestContent.fromWarehouseCode = this.fromWarehouseCode;
+				requestContent.toWarehouseCode = this.fromWarehouseCode;
+				var subList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var subItem = deepCopyData(detail);
+							subItem.fromLocationCode = detail.locationCode;
+							subItem.qty = detail.handleQty != 0 ? detail.handleQty : detail.qty;
+							subItem.package = null;
+							subList.push(subItem)
+						}
+					})
+				})
+
+				requestContent.subList = subList
+				return requestContent;
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getFromLocation(location, code) {
+				this.fromLocationInfo = location;
+				this.fromLocationCode = code;
+				this.fromWarehouseCode = location.warehouseCode;
+				this.openScanPopup();
+			},
+
+			getToLocationCode(location, code) {
+				if (this.fromLocationCode == code) {
+					uni.showToast({
+						title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+						duration: 2000
+					})
+					return
+				}
+				this.toLocationCode = code;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clear();
+				})
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			clear() {
+				this.fromLocationInfo = {};
+				this.fromLocationCode = '';
+				this.fromWarehouseCode = '';
+				this.toWarehouseCode = '';
+				this.detailSource = [];
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/putaway/request/putawayRequestDetail.vue b/pages/putaway/request/putawayRequestDetail.vue
new file mode 100644
index 0000000..cb5340e
--- /dev/null
+++ b/pages/putaway/request/putawayRequestDetail.vue
@@ -0,0 +1,126 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<request-top :dataContent="requestContent"></request-top>
+			</view>
+			<view class="header_item">
+				供应商 : {{requestContent.supplierCode}}
+			</view>
+			<u-line color="#D8D8D8" />
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comRequestDetailCard :dataContent="item" 
+							 @openDetail="openDetail">
+						</comRequestDetailCard>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<requestDetailInfoPopup ref="jobDetailPopup"></requestDetailInfoPopup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getPutawayRequestDetail,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource,
+	} from '@/common/detail.js';
+
+
+	import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
+	import requestDetailInfoPopup from '@/pages/putaway/coms/requestDetailInfoPopup.vue'
+	import requestTop from "@/mycomponents/request/requestTop.vue"
+	
+	export default {
+		components: {
+			comRequestDetailCard,
+			requestDetailInfoPopup,
+			requestTop
+		},
+		data() {
+			return {
+				id: '',
+				requestContent: {}, //任务内容
+				subList: [], //接口返回的任务details
+				detailSource: [], //绑定在页面上的数据源
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			this.getDetail();
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getPutawayRequestDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+					if (res.data.subList.length > 0) {
+						that.requestContent = res.data;
+						that.subList = res.data.subList;
+						that.detailSource = getDataSource(that.subList);
+					} else {
+						that.showMessage('列表数据为0');
+					}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+			},
+			
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+					}
+				});
+			},
+
+			openDetail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/query/coms/comItemBalance.vue b/pages/query/coms/comItemBalance.vue
new file mode 100644
index 0000000..3205e09
--- /dev/null
+++ b/pages/query/coms/comItemBalance.vue
@@ -0,0 +1,87 @@
+<template>
+	<view :class="dataContent.scaned?'scan_view':''" style="width: 100%;">
+		<view class="uni-flex uni-row space-between">
+			<view>
+				<pack v-if="isShowPack" :packingCode="dataContent.packingNumber"></pack>
+				<batch v-if="isShowBatch" :batch="dataContent.batch"></batch>
+				<location v-if="isShowLocation" :locationCode="dataContent.locationCode"></location>
+				<bussinessType v-if="isShowBusiness" :bussinessType="dataContent.businessType"
+					:number="dataContent.jobNumber"></bussinessType>
+			</view>
+			<view>
+				<qty v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent"
+					:isShowStdPack="isShowStdPack"></qty>
+
+				<compare-qty v-else :dataContent="dataContent" :recommendQty="dataContent.qty"
+					:handleQty="dataContent.record.qty" :isShowStdPack="isShowStdPack">
+				</compare-qty>
+			</view>
+		</view>
+	<u-line></u-line>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import qty from '@/mycomponents/qty/qty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+	import bussinessType from '@/mycomponents/balance/bussinessType.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			qty,
+			compareQty,
+			bussinessType
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowStdPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBusiness: {
+				type: Boolean,
+				default: false
+			},
+			scaned: {
+				type: Boolean,
+				default: true
+			},
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/query/coms/comItemDetailCard.vue b/pages/query/coms/comItemDetailCard.vue
new file mode 100644
index 0000000..806094a
--- /dev/null
+++ b/pages/query/coms/comItemDetailCard.vue
@@ -0,0 +1,78 @@
+<template>
+	<view>
+		<com-empty-view v-if="itemList.length==0"></com-empty-view>
+		<view class="" style="background-color: #fff; width: 100%;" v-for="(item,index) in itemList">
+			<!-- <view class="flex uni-center u-col-center" style="flex-direction: row; "> -->
+			<view>
+				<com-item-balance :dataContent="item" :isShowStdPack="false" :isShowPack="isShowPack"
+					:isShowBatch="isShowBatch" :isShowLocation="isShowLocation" :isShowBusiness="isShowBusiness">
+				</com-item-balance>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getBusinessTypeDesc
+	} from '@/common/directory.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import Batch from "@/mycomponents/Batch/Batch.vue"
+	import location from '@/mycomponents/location/location.vue'
+	import comItemBalance from '@/pages/query/coms/comItemBalance.vue'
+	import bussinessType from '@/mycomponents/balance/bussinessType.vue'
+
+
+	export default {
+		name: "comdetail",
+		components: {
+			comEmptyView,
+			Batch,
+			location,
+			bussinessType,
+			comItemBalance
+		},
+		data() {
+			return {};
+		},
+
+		// 此处定义传入的数据
+		props: {
+			itemList: {
+				type: Array,
+				value: null
+			},
+			displayLocations: {
+				type: Boolean,
+				default: true
+			},
+			type: {
+				type: String,
+				default: "partCode"
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowBusiness: {
+				type: Boolean,
+				default: false
+			},
+		},
+		methods: {}
+	}
+</script>
+
+
+
+<style>
+</style>
diff --git a/pages/query/coms/comLocationDetailCard.vue b/pages/query/coms/comLocationDetailCard.vue
new file mode 100644
index 0000000..d43e7d7
--- /dev/null
+++ b/pages/query/coms/comLocationDetailCard.vue
@@ -0,0 +1,77 @@
+<template>
+	<view class="">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<u-line />
+				<template v-slot:title>
+					<itemQty :dataContent="dataContent" :isShowBalance="true"></itemQty>
+				</template>
+			 
+				<view v-for="(item, index) in dataContent.list">
+					<balance :dataContent="item" :isShowFromLocation="false" :isShowPack="isShowPack"
+						:isShowStdPack="false">
+					</balance>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	export default {
+		components: {
+			itemQty,
+			balance
+		},
+		data() {
+			return {
+
+
+
+			};
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {},
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowStdPack: {
+				type: Boolean,
+				default: true
+			},
+		},
+
+		methods: {
+			edit() {
+
+			},
+			detail() {
+
+			},
+			remove() {
+
+			},
+			resetScan() {
+
+			}
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/query/container.vue b/pages/query/container.vue
new file mode 100644
index 0000000..5976b97
--- /dev/null
+++ b/pages/query/container.vue
@@ -0,0 +1,280 @@
+<template>
+	<!-- <page-meta root-font-size="18px"></page-meta> -->
+	<view class="">
+		<com-blank-view @goScan='openScanPopup' v-if="containerNumber==''"></com-blank-view>
+
+		<my-paging v-show="containerNumber!=''" ref="paging" v-model="dataList" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<template #top>
+				<view v-if="containerNumber!=''">
+					<containerInfo :itemDetail="containerInfo" ></containerInfo>
+					<u-line />
+					<z-tabs :list="tabList" @change="tabChange" />
+				</view>
+
+			</template>
+			<view class="" style="padding-bottom: 50rpx;">
+				<view v-if="tabIndex == 0" v-for="(item, index) in dataList">
+					<comLocationDetailCard :isShowPack="false" :dataContent="item" style='margin: 10rpx;'>
+					</comLocationDetailCard>
+				</view>
+				<view v-if="tabIndex == 1" v-for="(item, index) in dataList">
+					<comLocationDetailCard :dataContent="item" style='margin: 10rpx;'></comLocationDetailCard>
+				</view>
+			</view>
+
+		</my-paging>
+
+		、
+		<win-scan-button @goScan='openScanPopup' v-if="containerNumber!=''"></win-scan-button>
+		<winScanContainer ref="scanPopup" title='器具代码' @getContainer='getScanCode'>
+		</winScanContainer>
+		<show-modal ref="modal"></show-modal>
+		<comMessage ref="comMessage"></comMessage>
+
+	</view>
+</template>
+
+<script>
+	import {
+		getBalanceByContainerNumber,
+		getBalanceByContainerNumberGroup,
+		getContainerByNumber
+	} from '@/api/request2.js';
+
+	import {
+		maxPageSize,
+		goHome
+	} from '@/common/basic.js';
+	
+	import {
+			calc
+		} from '@/common/calc.js';
+
+	import locationInfo from '@/mycomponents/location/locationInfo.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comLocationDetailCard from '@/pages/query/coms/comLocationDetailCard.vue'
+	import winScanContainer from "@/mycomponents/scan/winScanContainer.vue"
+	import containerInfo from '@/mycomponents/container/containerInfo.vue'
+
+	export default {
+		name: 'location',
+		components: {
+			locationInfo,
+			comBlankView,
+			winScanButton,
+			comLocationDetailCard,
+			containerInfo,
+			winScanContainer
+			
+		},
+		data() {
+			return {
+				containerInfo: {},
+				containerNumber: '',
+				summarys: [],
+				balances: [],
+				// 每页数据量
+				pageSize: 1000,
+				// 当前页
+				pageCurrent: 1,
+				// 数据总量
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
+
+				detailList: [],
+				summarysList: [],
+				dataList: [],
+				tabList: ['汇总', '明细'],
+				tabIndex: 0,
+			};
+		},
+		onLoad() {
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		filters: {},
+		mounted() {
+			this.openScanPopup()
+		},
+		methods: {
+			openScanPopup() {
+				var test =this.$refs;
+				this.$refs.scanPopup.openScanPopup();
+			},
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+			getScanCode(code) {
+				this.containerNumber = '';
+				this.summarys = [];
+				this.balances = [];
+				this.occupieds = [];
+				this.containerNumber = code.number;
+				this.containerInfo = code;
+				this.tabChange(0)
+				// this.getItemInfo(code.number);
+			},
+
+			getItemInfo(code) {
+				uni.showLoading({
+					title: "正在查询器具信息...",
+					mask: true
+				});
+				getContainerByNumber(code).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length > 0) {
+						this.closeScanPopup();
+						this.containerNumber = res.data.list[0].number;
+						this.containerInfo = res.data.list[0];
+						this.tabChange(0)
+					} else {
+						this.showMessage('未查找到器具【' + code + '】');
+					}
+
+				}).catch(error => {
+					uni.hideLoading();
+					this.containerNumber = "";
+					this.showMessage(error);
+				})
+			},
+
+			getSummary(pageNo, pageSize) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+				var params = {
+					containerNumber: this.containerNumber,
+					pageNo: pageNo,
+					pageSize: pageSize
+				}
+				getBalanceByContainerNumberGroup(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length > 0) {
+						this.summarysList = this.setShowList(res.data.list)
+						this.$refs.paging.complete(this.summarysList);
+					} else {
+						this.$refs.paging.complete(false);
+						this.showMessage('未查找到器具【' + this.containerNumber + '】的库存信息');
+					}
+				}).catch(error => {
+					this.$refs.paging.complete(false);
+					uni.hideLoading();
+					this.showMessage(error);
+				})
+
+			},
+
+			getDetailList(pageNo, pageSize) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+				var params = {
+					containerNumber: this.containerNumber,
+					pageNo: pageNo,
+					pageSize: pageSize
+				}
+				getBalanceByContainerNumber(params).then(res => {
+					uni.hideLoading();
+					if (res.data.total > 0) {
+						this.detailList = this.setShowList(res.data.list)
+						this.$refs.paging.complete(this.detailList);
+					} else {
+						this.$refs.paging.complete(false);
+						this.showMessage('未查找到器具【' + this.containerNumber + '】的库存信息');
+					}
+				}).catch(error => {
+					this.$refs.paging.complete(false);
+					uni.hideLoading();
+					this.showMessage(error);
+				})
+			},
+
+			setShowList(list) {
+				var resultlist = [];
+				list.forEach(res => {
+					var temp = resultlist.find(res1 =>
+						res1.itemCode == res.itemCode)
+
+					if (temp == undefined) {
+						var data = {
+							itemCode: res.itemCode,
+							qty: Number(res.qty),
+							uom: res.uom,
+							list: []
+						}
+						var item = {
+							packingNumber: res.packingNumber,
+							batch: res.batch,
+							uom: res.uom,
+							qty: Number(res.qty),
+							inventoryStatus: res.inventoryStatus,
+						}
+						data.list.push(item)
+						resultlist.push(data)
+					} else {
+						temp.qty = calc.add(temp.qty,res.qty)
+						var item = {
+							packingNumber: res.packingNumber,
+							batch: res.batch,
+							uom: res.uom,
+							qty: Number(res.qty),
+							inventoryStatus: res.inventoryStatus,
+						}
+						temp.list.push(item)
+					}
+				})
+				return resultlist;
+			},
+
+			getContentByTab(index, pageNo, pageSize) {
+				if (index === 0) {
+					this.getSummary(pageNo, pageSize);
+				} else if (index === 1) this.getDetailList(pageNo, pageSize)
+
+			},
+
+			upper: function(e) {},
+			lower: function(e) {},
+			tabChange(index) {
+				this.tabIndex = index;
+				this.$refs.paging.reload(true);
+			},
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			afterCloseMessage() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+			queryList(pageNo, pageSize) {
+				console.log("加载", pageNo)
+				if (this.containerNumber != "") {
+					this.getContentByTab(this.tabIndex, pageNo, pageSize)
+				}
+
+			},
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	page {
+		height: 100%;
+	}
+</style>
diff --git a/pages/query/item.vue b/pages/query/item.vue
new file mode 100644
index 0000000..d2036a1
--- /dev/null
+++ b/pages/query/item.vue
@@ -0,0 +1,302 @@
+<!-- 基于z-paging封装个性化分页组件演示(vue) -->
+<template>
+	<view class="">
+		<com-blank-view @goScan='openScanPopup' v-if="itemCode==''"></com-blank-view>
+		<!-- 这里就很整洁了，只要设置ref，绑定query事件，绑定list就可以了 -->
+		<my-paging v-show="itemCode!=''" ref="paging" v-model="dataList" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<template #top>
+				<view v-if="itemDetail!=undefined">
+					<item-info :itemdetail='itemDetail'></item-info>
+					<u-line />
+					<z-tabs :list="tabList" @change="tabChange" />
+				</view>
+
+			</template>
+			<view class="" style="padding-bottom: 50rpx;">
+				<comItemDetailCard v-if="tabIndex == 0" :itemList="dataList" :isShowPack="false" style='margin: 10rpx;'>
+				</comItemDetailCard>
+				<comItemDetailCard v-if="tabIndex == 1" :itemList="dataList" style='margin: 10rpx;'>
+				</comItemDetailCard>
+				<comItemDetailCard v-if="tabIndex == 2" :itemList="dataList" :isShowLocation="false"
+					:isShowBusiness="true"></comItemDetailCard>
+				<comItemDetailCard v-if="tabIndex == 3" :itemList="dataList" :isShowLocation="false"
+					:isShowBusiness="true">
+				</comItemDetailCard>
+			</view>
+
+		</my-paging>
+		<win-scan-button @goScan='openScanPopup' v-if="itemCode!=''"></win-scan-button>
+		<win-scan-item ref="scanPopup" title='物料代码' @getScanResult='getScanCode'>
+		</win-scan-item>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getExpectoutByItemcode,
+		getExpectinByItemcode,
+		getBalanceByItemCode,
+		getBasicItemByCode,
+		getBalanceSummary
+	} from '@/api/request2.js';
+	import {
+		goHome
+	} from '@/common/basic.js';
+	import itemInfo from '@/mycomponents/item/itemInfo.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comItemDetailCard from '@/pages/query/coms/comItemDetailCard.vue'
+	export default {
+		components: {
+			itemInfo,
+			comBlankView,
+			winScanItem,
+			winScanButton,
+			comItemDetailCard,
+		},
+		data() {
+			return {
+				//v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
+				dataList: [],
+				tabList: ['汇总', '明细', '预计入', '预计出'],
+				tabIndex: 0,
+				itemDetail: undefined,
+				itemCode: '',
+				balances: [],
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		mounted() {
+			this.openScanPopup();
+		},
+		methods: {
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+			getScanCode(code) {
+				if (code == "") {
+					this.showMessage('物料号不能为空')
+					return;
+				}
+				this.itemCode = '';
+				this.getItemInfo(code);
+			},
+			getItemInfo(code) {
+				uni.showLoading({
+					title: "正在查询物料信息...",
+					mask: true
+				});
+
+				getBasicItemByCode(code).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length > 0) {
+						this.closeScanPopup();
+						this.itemCode = res.data.list[0].code;
+						this.itemDetail = res.data.list[0];
+						this.tabChange(0)
+					} else {
+						this.showMessage('未查找到物料【' + code + '】');
+					}
+
+				}).catch(error => {
+					uni.hideLoading();
+					this.itemCode = "";
+					this.showMessage(error);
+				})
+			},
+
+			// 汇总
+			getSummary(pageNo, pageSize) {
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+				var params = {
+					itemCode: this.itemCode,
+					pageNo: pageNo,
+					pageSize: pageSize
+				}
+				console.log("getSummary", pageNo)
+				getBalanceSummary(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length > 0) {
+						this.$refs.paging.complete(res.data.list);
+					} else {
+						this.$refs.paging.complete(false);
+						this.showMessage('未查找到物料【' + this.itemCode + '】');
+					}
+				}).catch(error => {
+					this.$refs.paging.complete(false);
+					uni.hideLoading();
+					this.showMessage(error);
+				})
+			},
+			//明细
+			getDetailList(pageNo, pageSize) {
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+				var params = {
+					itemCode: this.itemCode,
+					pageNo: pageNo,
+					pageSize: pageSize
+				}
+				getBalanceByItemCode(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length > 0) {
+						this.$refs.paging.complete(res.data.list);
+					} else {
+						this.$refs.paging.complete(false);
+						this.showMessage('未查找到物料【' + this.itemCode + '】');
+					}
+				}).catch(error => {
+					this.$refs.paging.complete(false);
+					uni.hideLoading();
+					this.showMessage(error);
+				})
+
+			},
+			ontabtap(e) {
+				let index = e.target.dataset.current || e.currentTarget.dataset.current;
+				this.tabIndex = index;
+				this.getContentByTab(index);
+			},
+
+			getContentByTab(index, pageNo, pageSize) {
+				if (index === 0) this.getSummary(pageNo, pageSize);
+				else if (index === 1) this.getDetailList(pageNo, pageSize);
+				else if (index === 2) {
+					this.getExpectin(pageNo, pageSize);
+				} else if (index == 3) {
+					this.getExpectout(pageNo, pageSize);
+				}
+			},
+			//预计入
+			getExpectin(pageNo, pageSize) {
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+				var params = {
+					itemCode: this.itemCode,
+					pageNo: pageNo,
+					pageSize: pageSize
+				}
+				getExpectinByItemcode(params).then(res => {
+					uni.hideLoading();
+					if (res.data.total > 0) {
+						this.$refs.paging.complete(res.data.list);
+					} else {
+						this.showMessage('未查找到物料【' + this.itemCode + '】');
+					}
+				}).catch(error => {
+					this.$refs.paging.complete(false);
+					uni.hideLoading();
+					this.showMessage(error);
+				})
+			},
+
+			//预计出
+			getExpectout(pageNo, pageSize) {
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+				var params = {
+					itemCode: this.itemCode,
+					pageNo: pageNo,
+					pageSize: pageSize
+				}
+				getExpectoutByItemcode(params).then(res => {
+					uni.hideLoading();
+					if (res.data.total > 0) {
+						this.$refs.paging.complete(res.data.list);
+					} else {
+						this.$refs.paging.complete(false);
+						this.showMessage('未查找到物料【' + this.itemCode + '】');
+					}
+				}).catch(error => {
+					this.$refs.paging.complete(false);
+					uni.hideLoading();
+					this.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			afterCloseMessage() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+			tabChange(index) {
+				this.tabIndex = index;
+				this.$refs.paging.reload(true);
+			},
+			queryList(pageNo, pageSize) {
+				console.log("加载", pageNo)
+				if (this.itemCode != "") {
+					this.getContentByTab(this.tabIndex, pageNo, pageSize)
+				}
+
+			},
+			itemClick(item) {
+				console.log('点击了', item.title);
+			}
+		}
+	}
+</script>
+
+<style>
+	.notice {
+		background-color: red;
+		color: white;
+		display: flex;
+		flex-direction: column;
+		padding: 12rpx 20rpx;
+		font-size: 24rpx;
+	}
+
+	.item {
+		position: relative;
+		height: 150rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0rpx 30rpx;
+	}
+
+	.item-detail {
+		padding: 5rpx 15rpx;
+		border-radius: 10rpx;
+		font-size: 28rpx;
+		color: white;
+		background-color: #007AFF;
+	}
+
+	.item-line {
+		position: absolute;
+		bottom: 0rpx;
+		left: 0rpx;
+		height: 1px;
+		width: 100%;
+		background-color: #eeeeee;
+	}
+</style>
diff --git a/pages/query/item_copy.vue b/pages/query/item_copy.vue
new file mode 100644
index 0000000..310f738
--- /dev/null
+++ b/pages/query/item_copy.vue
@@ -0,0 +1,313 @@
+<template>
+	<view class="">
+		<com-blank-view @goScan='openScanPopup' v-if="itemCode==''"></com-blank-view>
+		<view class="" v-if="itemCode!=''">
+			<item-info :itemdetail='itemDetail'></item-info>
+		</view>
+		<view class="tabs" v-if="itemCode!=''">
+			<scroll-view id="tab-bar" class="scroll-h" :scroll-x="true" :show-scrollbar="false">
+				<view class="title_tab">
+					<view v-for="(tab, index) in tabBars" :key="tab.id" class="uni-tab-item" :id="tab.id"
+						:data-current="index" @click="ontabtap">
+						<text class="uni-tab-item-title"
+							:class="tabIndex == index ? 'uni-tab-item-title-active' : ''">{{ tab.name }}</text>
+					</view>
+				</view>
+			</scroll-view>
+			<scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower"
+				@scroll="scroll">
+				<!-- 汇总 -->
+				<comItemDetailCard v-if="tabIndex == 0" :itemList="summarys" :isShowPack="false" style='margin: 10rpx;'>
+				</comItemDetailCard>
+			</scroll-view>
+			<!-- 明细 -->
+			<scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower"
+				@scroll="scroll">
+				<comItemDetailCard v-if="tabIndex == 1" :itemList="balances" style='margin: 10rpx;'>
+				</comItemDetailCard>
+			</scroll-view>
+			<!-- 预计入 -->
+			<scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower"
+				@scroll="scroll">
+				<comItemDetailCard v-if="tabIndex == 2" :itemList="dataIn" :isShowLocation="false"
+					:isShowBusiness="true"></comItemDetailCard>
+			</scroll-view>
+			<!-- 预计出 -->
+			<scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower"
+				@scroll="scroll">
+				<comItemDetailCard v-if="tabIndex == 3" :itemList="dataOut" :isShowLocation="false"
+					:isShowBusiness="true">
+				</comItemDetailCard>
+			</scroll-view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup' v-if="itemCode!=''"></win-scan-button>
+		<win-scan-item ref="scanPopup" title='物料代码' @getScanResult='getScanCode'>
+		</win-scan-item>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getExpectoutByItemcode,
+		getExpectinByItemcode,
+		getBalanceByItemCode,
+		getBasicItemByCode,
+		getBalanceByCodeGroup
+	} from '@/api/request2.js';
+	import {
+		goHome
+	} from '@/common/basic.js';
+	import itemInfo from '@/mycomponents/item/itemInfo.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comItemDetailCard from '@/pages/query/coms/comItemDetailCard.vue'
+
+	export default {
+		name: 'parts',
+		components: {
+			itemInfo,
+			comBlankView,
+			winScanItem,
+			winScanButton,
+			comItemDetailCard,
+		},
+		data() {
+			return {
+				// 每页数据量
+				pageSize: 1000,
+				// 当前页
+				pageCurrent: 1,
+				tabIndex: 0,
+				tabBars: [{
+						name: '汇总',
+						id: 'huizong'
+					},
+					{
+						name: '明细',
+						id: 'mingxi'
+					},
+					{
+						name: '预计入',
+						id: 'in'
+					},
+					{
+						name: '预计出',
+						id: 'out'
+					}
+				],
+				itemDetail: {},
+				itemCode: '',
+				summarys: [],
+				balances: [],
+				dataIn: [],
+				dataOut: [],
+				occupieds: [],
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
+			};
+		},
+		onLoad() {
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		mounted() {
+			this.openScanPopup();
+		},
+		methods: {
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+			getScanCode(code) {
+				if (code == "") {
+					this.showMessage('物料号不能为空')
+					return;
+				}
+				this.itemCode = '';
+				this.summarys = [];
+				this.balances = [];
+				this.occupieds = [];
+				this.getItemInfo(code);
+			},
+			getItemInfo(code) {
+				uni.showLoading({
+					title: "正在查询物料信息...",
+					mask: true
+				});
+
+				getBasicItemByCode(code).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length > 0) {
+						this.closeScanPopup();
+						this.itemCode = res.data.list[0].code;
+						this.itemDetail = res.data.list[0];
+						this.getContentByTab(this.tabIndex);
+					} else {
+						this.showMessage('未查找到物料【' + code + '】');
+					}
+
+				}).catch(error => {
+					uni.hideLoading();
+					this.itemCode = "";
+					this.showMessage(error);
+				})
+			},
+
+			// 汇总
+			getSummary() {
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+
+				getBalanceByCodeGroup(this.itemCode).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length > 0) {
+						this.summarys = res.data.list;
+					} else {
+						this.showMessage('未查找到物料【' + this.itemCode + '】');
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					this.summarys = "";
+					this.showMessage(error);
+				})
+			},
+			//明细
+			getDetailList() {
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+				getBalanceByItemCode(this.itemCode).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length > 0) {
+						this.balances = res.data.list;
+					} else {
+						this.showMessage('未查找到物料【' + this.itemCode + '】');
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					this.balances = "";
+					this.showMessage(error);
+
+				})
+
+			},
+			//占用
+			getoccupied() {
+				let that = this;
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+				let params = {
+					pageSize: that.pageSize,
+					pageIndex: that.pageCurrent,
+					itemCode: that.itemCode, //按物料号查询库存列表
+				};
+				expectIn(params).then(res => {
+					this.occupieds = res.items;
+					uni.hideLoading();
+				}).catch(error => {
+					uni.hideLoading();
+					this.dataIn = "";
+					this.showMessage(error);
+				});
+			},
+			ontabtap(e) {
+				let index = e.target.dataset.current || e.currentTarget.dataset.current;
+				this.tabIndex = index;
+				this.getContentByTab(index);
+			},
+
+			getContentByTab(index) {
+				if (index === 0) this.getSummary();
+				else if (index === 1) this.getDetailList();
+				else if (index === 2) {
+					this.getExpectin();
+				} else if (index == 3) {
+					this.getExpectout();
+				}
+			},
+			//预计入
+			getExpectin() {
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+				getExpectinByItemcode(this.itemCode).then(res => {
+					uni.hideLoading();
+					if (res.data.total > 0) {
+						this.dataIn = res.data.list;
+					} else {
+						this.showMessage('未查找到物料【' + this.itemCode + '】');
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					this.dataIn = "";
+					this.showMessage(error);
+				})
+			},
+
+			//预计出
+			getExpectout() {
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+				getExpectoutByItemcode(this.itemCode).then(res => {
+					uni.hideLoading();
+					if (res.data.total > 0) {
+						this.dataOut = res.data.list;
+					} else {
+						this.showMessage('未查找到物料【' + this.itemCode + '】');
+					}
+				}).catch(error => {
+					this.dataOut = "";
+					uni.hideLoading();
+					this.showMessage(error);
+				})
+			},
+
+
+			upper: function(e) {
+				// console.log(e)
+			},
+			lower: function(e) {
+				// console.log(e)
+			},
+			scroll: function(e) {
+				// console.log(e)
+				this.old.scrollTop = e.detail.scrollTop;
+			},
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			afterCloseMessage() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/pages/query/location.vue b/pages/query/location.vue
new file mode 100644
index 0000000..cb61e4e
--- /dev/null
+++ b/pages/query/location.vue
@@ -0,0 +1,257 @@
+<template>
+	<!-- <page-meta root-font-size="18px"></page-meta> -->
+	<view class="">
+		<com-blank-view @goScan='openScanPopup' v-if="locationCode==''"></com-blank-view>
+
+		<my-paging v-show="locationCode!=''" ref="paging" v-model="dataList" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<template #top>
+				<view v-if="locationCode!=''">
+					<location-info :locationDetail='locationDetail' v-if="locationCode"></location-info>
+					<z-tabs :list="tabList" @change="tabChange" />
+				</view>
+
+			</template>
+			<view class="" style="padding-bottom: 50rpx;">
+				<view v-if="tabIndex == 0" v-for="(item, index) in dataList">
+					<comLocationDetailCard :isShowPack="false" :dataContent="item" style='margin: 10rpx;'>
+					</comLocationDetailCard>
+				</view>
+				<view v-if="tabIndex == 1" v-for="(item, index) in dataList">
+					<comLocationDetailCard :dataContent="item" style='margin: 10rpx;'></comLocationDetailCard>
+				</view>
+			</view>
+
+		</my-paging>
+
+		<win-scan-button @goScan='openScanPopup' v-if="locationCode!=''"></win-scan-button>
+		<winScanLocation ref="scanPopup" title="库位代码" @getLocation='getScanCode'></winScanLocation>
+
+		<show-modal ref="modal"></show-modal>
+		<comMessage ref="comMessage"></comMessage>
+
+	</view>
+</template>
+
+<script>
+	import {
+		getBalanceByLocationcode,
+		getBalanceByLocationcodeGroup
+	} from '@/api/request2.js';
+
+	import {
+		maxPageSize,
+		goHome
+	} from '@/common/basic.js';
+	
+	import {
+			calc
+		} from '@/common/calc.js';
+
+	import locationInfo from '@/mycomponents/location/locationInfo.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comLocationDetailCard from '@/pages/query/coms/comLocationDetailCard.vue'
+	import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
+
+
+	export default {
+		name: 'location',
+		components: {
+			locationInfo,
+			comBlankView,
+			winScanButton,
+			comLocationDetailCard,
+			winScanLocation
+		},
+		data() {
+			return {
+				locationDetail: {},
+				locationCode: '',
+				summarys: [],
+				balances: [],
+				dataIn: [],
+				dataOut: [],
+				// 每页数据量
+				pageSize: 1000,
+				// 当前页
+				pageCurrent: 1,
+				// 数据总量
+
+				dataList: [],
+				tabList: ['汇总', '明细'],
+				tabIndex: 0,
+			};
+		},
+		onLoad() {},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		filters: {
+
+		},
+		mounted() {
+			this.openScanPopup()
+		},
+		methods: {
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+			getScanCode(location, code) {
+				this.locationCode = '';
+				this.summarys = [];
+				this.balances = [];
+				this.locationCode = code;
+				this.locationDetail = location
+				this.tabChange(0)
+				// this.getContentByTab(this.tabIndex);
+			},
+
+			getSummary(pageNo, pageSize) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+				var params = {
+					itemCode: this.itemCode,
+					pageNo: pageNo,
+					pageSize: pageSize
+				}
+
+				getBalanceByLocationcodeGroup(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length > 0) {
+						this.summarysList = this.setShowList(res.data.list)
+						this.$refs.paging.complete(this.summarysList);
+
+					} else {
+						this.$refs.paging.complete(false);
+						this.showMessage('未查找到库位【' + this.locationCode + '】');
+					}
+				}).catch(error => {
+					this.$refs.paging.complete(false);
+					uni.hideLoading();
+					this.showMessage(error);
+				})
+
+			},
+
+			getDetailList(pageNo, pageSize) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+
+				var params = {
+					locationCode: this.locationCode,
+					pageNo: pageNo,
+					pageSize: pageSize
+				}
+				getBalanceByLocationcode(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length > 0) {
+						this.detailList = this.setShowList(res.data.list)
+						this.$refs.paging.complete(this.detailList);
+					} else {
+						this.$refs.paging.complete(false);
+						this.showMessage('未查找到库位w【' + this.locationCode + '】');
+					}
+				}).catch(error => {
+					this.$refs.paging.complete(false);
+					uni.hideLoading();
+					this.showMessage(error);
+				})
+			},
+
+			setShowList(list) {
+				var resultlist = [];
+				list.forEach(res => {
+					var temp = resultlist.find(res1 =>
+						res1.itemCode == res.itemCode)
+
+					if (temp == undefined) {
+						var data = {
+							itemCode: res.itemCode,
+							qty: Number(res.qty),
+							uom: res.uom,
+							list: []
+						}
+						var item = {
+							packingNumber: res.packingNumber,
+							batch: res.batch,
+							uom: res.uom,
+							qty: Number(res.qty),
+							inventoryStatus: res.inventoryStatus,
+						}
+						data.list.push(item)
+						resultlist.push(data)
+					} else {
+						temp.qty = calc.add(temp.qty,res.qty)
+						var item = {
+							packingNumber: res.packingNumber,
+							batch: res.batch,
+							uom: res.uom,
+							qty: Number(res.qty),
+							inventoryStatus: res.inventoryStatus,
+						}
+						temp.list.push(item)
+					}
+				})
+				return resultlist;
+			},
+			ontabtap(e) {
+				let index = e.target.dataset.current || e.currentTarget.dataset.current;
+				this.tabIndex = index;
+				this.getContentByTab(this.tabIndex);
+			},
+
+			getContentByTab(index, pageNo, pageSize) {
+				if (index === 0) {
+					this.getSummary(pageNo, pageSize);
+				} else if (index === 1) this.getDetailList(pageNo, pageSize)
+				else if (index === 2) {
+					this.dataIn = this.balances;
+				} else if (index == 3) {
+					this.dataOut = this.balances;
+				}
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showWarningMessage(message, res => {
+					if (res) {
+						// this.afterCloseMessage()
+					}
+				});
+			},
+			afterCloseMessage() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+			tabChange(index) {
+				this.tabIndex = index;
+				this.$refs.paging.reload(true);
+			},
+			queryList(pageNo, pageSize) {
+				console.log("加载", pageNo)
+				if (this.locationCode != "") {
+					this.getContentByTab(this.tabIndex, pageNo, pageSize)
+				}
+
+			},
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	page {
+		height: 100%;
+	}
+</style>
diff --git a/pages/query/location_copy.vue b/pages/query/location_copy.vue
new file mode 100644
index 0000000..a31f1f1
--- /dev/null
+++ b/pages/query/location_copy.vue
@@ -0,0 +1,279 @@
+<template>
+	<!-- <page-meta root-font-size="18px"></page-meta> -->
+	<view class="">
+		<com-blank-view @goScan='openScanPopup' v-if="locationCode==''"></com-blank-view>
+		<view class="top_card">
+			<location-info :locationDetail='locationDetail' v-if="locationCode"></location-info>
+		</view>
+
+		<view class="tabs" v-if="locationCode" style="height: 100%;">
+			<u-line></u-line>
+			<scroll-view id="tab-bar" class="scroll-h" :scroll-x="true" :show-scrollbar="false">
+				<view class="title_tab">
+					<view v-for="(tab, index) in tabBars" :key="tab.id" class="uni-tab-item" :id="tab.id"
+						:data-current="index" @click="ontabtap">
+						<text class="uni-tab-item-title"
+							:class="tabIndex == index ? 'uni-tab-item-title-active' : ''">{{ tab.name }}</text>
+					</view>
+				</view>
+			</scroll-view>
+			<scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower"
+				@scroll="scroll">
+				<view v-if="tabIndex == 0" v-for="(item, index) in summarysList">
+					<comLocationDetailCard :isShowPack="false" :dataContent="item" style='margin: 10rpx;'>
+					</comLocationDetailCard>
+				</view>
+			</scroll-view>
+			<scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower"
+				@scroll="scroll">
+				<view v-if="tabIndex == 1" v-for="(item, index) in detailList">
+					<comLocationDetailCard :dataContent="item" style='margin: 10rpx;'></comLocationDetailCard>
+				</view>
+			</scroll-view>
+			<!-- 预计入 -->
+			<scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower"
+				@scroll="scroll">
+
+				<view v-if="tabIndex == 2" v-for="(item, index) in detailList">
+					<comLocationDetailCard :dataContent="item" style='margin: 10rpx;'></comLocationDetailCard>
+				</view>
+			</scroll-view>
+			<!-- 预计出 -->
+			<scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower"
+				@scroll="scroll">
+				<view v-if="tabIndex == 3" v-for="(item, index) in detailList">
+					<comLocationDetailCard :dataContent="item" style='margin: 10rpx;'></comLocationDetailCard>
+				</view>
+			</scroll-view>
+		</view>
+		<win-scan-button @goScan='openScanPopup' v-if="locationCode!=''"></win-scan-button>
+		<winScanLocation ref="scanPopup" title="库位代码" @getLocation='getScanCode'></winScanLocation>
+
+		<show-modal ref="modal"></show-modal>
+		<comMessage ref="comMessage"></comMessage>
+
+	</view>
+</template>
+
+<script>
+	import {
+		getBalanceByLocationcode,
+		getBalanceByLocationcodeGroup
+	} from '@/api/request2.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		maxPageSize,
+		goHome
+	} from '@/common/basic.js';
+
+	import locationInfo from '@/mycomponents/location/locationInfo.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+
+	import comLocationDetailCard from '@/pages/query/coms/comLocationDetailCard.vue'
+	import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
+
+
+	export default {
+		name: 'location',
+		components: {
+			locationInfo,
+			comBlankView,
+			winScanButton,
+			comLocationDetailCard,
+			winScanLocation
+		},
+		data() {
+			return {
+				locationDetail: {},
+				locationCode: '',
+				summarys: [],
+				balances: [],
+				dataIn: [],
+				dataOut: [],
+				// 每页数据量
+				pageSize: 1000,
+				// 当前页
+				pageCurrent: 1,
+				// 数据总量
+				tabIndex: 0,
+				tabBars: [{
+						name: '汇总',
+						id: 'huizong'
+					},
+					{
+						name: '明细',
+						id: 'mingxi'
+					},
+					// {
+					// 	name: '预计入',
+					// 	id: 'in'
+					// },
+					// {
+					// 	name: '预计出',
+					// 	id: 'out'
+					// }
+				],
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
+				detailList: [],
+				summarysList: []
+			};
+		},
+		onLoad() {},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		filters: {
+
+		},
+		mounted() {
+			this.openScanPopup()
+		},
+		methods: {
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+			getScanCode(location, code) {
+				this.locationCode = '';
+				this.summarys = [];
+				this.balances = [];
+				this.locationCode = code;
+				this.locationDetail = location
+				this.getContentByTab(this.tabIndex);
+			},
+
+			getSummary() {
+				let that = this;
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+				getBalanceByLocationcodeGroup(this.locationCode).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length > 0) {
+						this.summarysList = this.setShowList(res.data.list)
+					} else {
+						this.showMessage('未查找到库位【' + this.locationCode + '】');
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					this.showMessage(error);
+				})
+
+			},
+
+			getDetailList() {
+				let that = this;
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+				getBalanceByLocationcode(this.locationCode).then(res => {
+					uni.hideLoading();
+					if (res.data.total > 0) {
+						this.detailList = this.setShowList(res.data.list)
+					} else {
+						this.showMessage('未查找到库位【' + this.locationCode + '】');
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					this.showMessage(error);
+				})
+			},
+
+			setShowList(list) {
+				var resultlist = [];
+				list.forEach(res => {
+					var temp = resultlist.find(res1 =>
+						res1.itemCode == res.itemCode)
+
+					if (temp == undefined) {
+						var data = {
+							itemCode: res.itemCode,
+							qty: Number(res.qty),
+							uom: res.uom,
+							list: []
+						}
+						var item = {
+							packingNumber: res.packingNumber,
+							batch: res.batch,
+							uom: res.uom,
+							qty: Number(res.qty),
+							inventoryStatus: res.inventoryStatus,
+						}
+						data.list.push(item)
+						resultlist.push(data)
+					} else {
+						temp.qty = calc.add(temp.qty,res.qty)
+						var item = {
+							packingNumber: res.packingNumber,
+							batch: res.batch,
+							uom: res.uom,
+							qty: Number(res.qty),
+							inventoryStatus: res.inventoryStatus,
+						}
+						temp.list.push(item)
+					}
+				})
+				return resultlist;
+			},
+			ontabtap(e) {
+				let index = e.target.dataset.current || e.currentTarget.dataset.current;
+				this.tabIndex = index;
+				this.getContentByTab(this.tabIndex);
+			},
+
+			getContentByTab(index) {
+				if (index === 0) {
+					this.getSummary();
+				} else if (index === 1) this.getDetailList()
+				else if (index === 2) {
+					this.dataIn = this.balances;
+				} else if (index == 3) {
+					this.dataOut = this.balances;
+				}
+			},
+
+			upper: function(e) {
+				// console.log(e)
+			},
+			lower: function(e) {
+				// console.log(e)
+			},
+			scroll: function(e) {
+				// console.log(e)
+				this.old.scrollTop = e.detail.scrollTop;
+			},
+			showMessage(message) {
+				this.$refs.comMessage.showWarningMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			afterCloseMessage() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	page {
+		height: 100%;
+	}
+</style>
diff --git a/pages/repleinsh/coms/comRepleinshJobCard.vue b/pages/repleinsh/coms/comRepleinshJobCard.vue
new file mode 100644
index 0000000..42adb98
--- /dev/null
+++ b/pages/repleinsh/coms/comRepleinshJobCard.vue
@@ -0,0 +1,40 @@
+<template>
+	<job-com-main-card :dataContent="dataContent">
+		<view class="task_item">
+			<view class="task_item">
+				<view class="task_text">
+					<view class="">
+						申请单号 : {{dataContent.requestNumber}}
+					</view>
+				</view>
+			</view>
+		</view>
+	</job-com-main-card>
+</template>
+
+<script>
+	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+	export default {
+		components: {
+			jobComMainCard,
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/repleinsh/coms/comRepleinshRequestCard.vue b/pages/repleinsh/coms/comRepleinshRequestCard.vue
new file mode 100644
index 0000000..e142866
--- /dev/null
+++ b/pages/repleinsh/coms/comRepleinshRequestCard.vue
@@ -0,0 +1,36 @@
+<template>
+ 	<request-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				供应商代码 : {{dataContent.supplierCode}}
+ 			</view>
+ 		</view>
+ 	</request-com-main-card>
+ </template>
+
+ <script>
+ 	import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			requestComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/repleinsh/coms/comRepleinshRequestPopup.vue b/pages/repleinsh/coms/comRepleinshRequestPopup.vue
new file mode 100644
index 0000000..b3a21ed
--- /dev/null
+++ b/pages/repleinsh/coms/comRepleinshRequestPopup.vue
@@ -0,0 +1,320 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup" :maskClick="false">
+			<view class="uni-flex uni-column pop_customer">
+				<view class="" style="padding:10rpx">
+					<view class="uni-flex u-col-center uni-row space-between" style="padding: 10rpx 10rpx 20rpx 10rpx">
+						<view class="" style="font-size: 35rpx;">
+							{{title}}
+						</view>
+						<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
+							@click="closeRequestPopup()"></image>
+					</view>
+					<u-line />
+					<view class="uni-flex uni-column" style="background-color: white; ">
+						<view class="uni-flex uni-column  ">
+							<view class="uni-flex uni-row padding title u-col-center">
+								<text style="width: 80px;">目标库位：</text>
+								<view class="" style="width: 70% ;">
+									{{toLocationCode}}
+								</view>
+								<view class="">
+									<image src="/static/search.svg" mode=""
+										style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;"
+										@click="locationCodeClick">
+									</image>
+								</view>
+							</view>
+							<u-line />
+
+							<view class="title padding" style="display: flex;">
+								<text style=" flex-shrink: 0;">物料：</text>
+								<view class="" style="width: 100% ;">
+									{{itemCode}}
+								</view>
+								<view class="">
+									<image src="/static/search.svg" mode=""
+										style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;" @click="itemCodeClick">
+									</image>
+								</view>
+							</view>
+							<u-line />
+
+							<view class="uni-flex uni-row  padding title u-col-center">
+								<text>数量： </text>
+								<view class="uni-flex uni-row uni-center"
+									style="align-items: center;margin-left: 20rpx;">
+									<input style="text-align: center;" class="qty_input" v-model="counQty" type="number"
+										@confirm="confirm()" :focus="numberFocus"  @input="checkNum" :maxlength="maxlength" />
+									
+									<uom :uom="uom"></uom>
+									<view class="" v-if="stdPackInfo!=undefined" style="display: flex;flex-direction: row;margin-left: 10rpx;">
+										(<stdPackQty :dataContent="stdPackInfo"></stdPackQty>)
+									</view>
+									
+								</view>
+							</view>
+							<u-line />
+						</view>
+					</view>
+				</view>
+				<view class="uni-flex uni-row hide_border">
+					<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button>
+					<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button>
+				</view>
+			</view>
+		</uni-popup>
+		<win-scan-item ref="scanPopup" title='物料代码' @getScanResult='getItemScanResult' :itemCodeTypeList="itemCodeTypeList">
+		</win-scan-item>
+
+		<win-scan-location ref="scanLocationPopup" title='目标库位' @getLocation='getLocationCode'
+			:locationTypeList="toLocationTypeList">
+		</win-scan-location>
+
+		<comMessage ref="comMessage">
+		</comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getBasicLocationByCode,
+		getBasicItemByCode,
+		getProductionlineItem,
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+	import {
+		getLocationTypeName,
+		getListLocationTypeDesc,
+		checkDirectoryItemExist
+	} from '@/common/directory.js';
+	import uom from '@/mycomponents/qty/uom.vue'
+	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
+	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
+	import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
+	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+
+	export default {
+		components: {
+			uom,
+			stdPackQty,
+			balanceStatus,
+			winScanItem,
+			winScanLocation
+			
+		},
+		data() {
+			return {
+				itemCode: '请扫描物料信息',
+				toLocation: {},
+				toLocationCode: '请扫目标库位',
+				itemName: "",
+				qty: 0,
+				rawLocationCode: "",
+				fgLocationCode: "",
+				itemCodeFocus: false,
+				counQty: undefined,
+				editPosition: true,
+				numberFocus: false,
+				uom: "",
+				show: false,
+				isModifiedPosition: true,
+				positionList: [],
+				maxlength:10,
+				stdPackInfo:undefined
+			}
+		},
+		props: {
+			title: {
+				type: String,
+				default: '补料需求信息'
+			},
+			toLocationTypeList: {
+				type: Array,
+				default: []
+			},
+			itemCodeTypeList: {
+				type: Array,
+				default: []
+			},
+			
+		},
+		mounted() {
+
+		},
+		methods: {
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //包含小数点
+				let reg = /^[0-9]+$/; //正整数
+				if (dot > -1) {
+					this.maxlength = dot + 7; //长度是小数点后两位
+					if (value.length > dot + 7) {
+			
+					}
+				}
+				if (reg.test(value)) { //如果是正整数不包含小数点
+					this.maxlength = 10;
+				}
+				this.change(value)
+			},
+			openRequestPopup(editPosition) {
+				// this.editPosition = editPosition;
+				// if (this.isModifiedPosition) {
+				// 	this.isModifiedPosition = false
+				// } else {
+				// 	this.itemCode = "";
+				// 	this.uom = ""
+				// 	this.qty = 0
+				// 	this.itemCodeGetFocus();
+				// }
+				this.qty = 0;
+				this.itemCode = '请扫描物料信息'
+				this.toLocationCode = '请扫目标库位'
+				this.counQty =undefined;
+				this.numberFocus = false
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+				// this.showScanLocation();
+			},
+			closeRequestPopup() {
+				this.$refs.popup.close()
+			},
+
+			locationCodeClick() {
+				this.showScanLocation();
+			},
+
+			showScanLocation() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationPopup.openScanPopup();
+				})
+			},
+
+			itemCodeClick() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			showScanItem() {
+				this.$nextTick(() => {
+					this.$refs.scanPopup.openScanPopup();
+				})
+			},
+
+			itemCodeGetFocus() {
+				this.itemCodeFocus = true;
+			},
+			itemCodeLoseFocus() {
+				this.itemCodeFocus = false;
+			},
+			selectedItem(item) {
+				this.itemCode = item.itemCode;
+				this.checkItemCode();
+			},
+
+			confirm() {
+				if (this.toLocationCode == "请扫目标库位") {
+					this.showErrorMessage("请输入目标库位")
+					return
+				}
+				
+				if (this.itemCode == "请扫描物料信息") {
+					this.showErrorMessage("请输入物料", "itemCode")
+					return
+				}
+				if (this.counQty == undefined) {
+					this.showErrorMessage("请输入数量")
+					return
+				}
+				
+				
+				if (this.qty == 0) {
+					this.showErrorMessage("数量必须大于0")
+					return
+				}
+
+				this.callback('add');
+			},
+
+			checkItemCode(itemCode) {
+				//校验物料
+				getBasicItemByCode(itemCode).then(res => {
+					uni.hideLoading();
+					this.$refs.scanPopup.closeScanPopup();
+					if (res.data != null && res.data.list.length > 0) {
+						this.itemCode = res.data.list[0].code;
+						this.itemName = res.data.list[0].name
+						this.numberFocus = true
+						this.uom = res.data.list[0].uom
+					} else {
+						this.showErrorMessage('未查找到物料【' + itemCode + '】', "itemCode");
+					}
+
+				}).catch(error => {
+					uni.hideLoading();
+					this.showErrorMessage(error, "itemCode");
+				})
+			},
+
+			callback(action) {
+				let item = {
+					toLocation: this.toLocation,
+					itemCode: this.itemCode,
+					itemName: this.itemName,
+					uom: this.uom,
+					qty: this.qty
+				};
+				this.closeRequestPopup();
+				this.$emit("confirm", action, item);
+			},
+
+
+			change(value) {
+				this.qty = value;
+			},
+
+			cancel(e) {
+				this.closeRequestPopup();
+			},
+
+			getItemScanResult(code, scanResult) {
+				this.itemCode = code;
+				this.itemName = scanResult.name
+				this.uom =scanResult.uom
+				this.stdPackInfo = scanResult.package;
+				this.numberFocus = true
+			},
+
+			getLocationCode(location, code) {
+				if (location != null) {
+					this.toLocation = location;
+					this.toLocationCode = code;
+					this.showScanItem();
+				}
+			},
+			
+			showErrorMessage(message, type) {
+				setTimeout(r => {
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (type == "itemCode") {
+							this.itemCodeGetFocus();
+						} else {
+							this.numberFocus = true;
+						}
+					})
+					if (type == "itemCode") {
+						this.itemCode = "请扫描物料信息"
+					}
+				})
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.title {
+		font-size: 30rpx;
+	}
+</style>
diff --git a/pages/repleinsh/coms/comRepleishDetailCard.vue b/pages/repleinsh/coms/comRepleishDetailCard.vue
new file mode 100644
index 0000000..8aa9bec
--- /dev/null
+++ b/pages/repleinsh/coms/comRepleishDetailCard.vue
@@ -0,0 +1,170 @@
+<template>
+	<view>
+		<!-- <requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode"
+			:isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation> -->
+
+		<view v-for="(item,index) in dataContent.Items">
+			<uni-collapse ref="collapse">
+				<uni-collapse-item :open="true" :show-animation="true">
+					<template v-slot:title>
+						<!-- 物品 -->
+						<item-qty :dataContent="item" :handleQty="item.handleQty" :isShowBalanceQty="false" ></item-qty>
+					</template>
+					<u-line />
+					<view v-for="(loacation,index) in item.Locations">
+						<view>
+							<view class="uni-flex uni-row space-between">
+								<!-- 推荐库位 -->
+								<location :locationCode="loacation.fromLocationCode">
+								</location>
+							</view>
+							<view v-for="(batch,index) in loacation.Batchs">
+								<recommend-balance style='margin-left: 20px;' :detail="batch" :isShowLocation="false"
+									:isShowPack="batch.packingNumber!=null && batch.packingNumber!=''">
+								</recommend-balance>
+								<view class="uni-flex uni-row" v-if='batch.Records.length>0'>
+									<view class="center " style=" width: 20px;background-color: #0CC2B6; color: #fff; margin-left: 40px; padding: 0px 2px;">
+										实际
+									</view>
+									<view class="uni-flex uni-column scan_view" style="width: 100%;">
+										<view v-for="(record,index) in batch.Records">
+											<uni-swipe-action ref="swipeAction">
+												<uni-swipe-action-item @click="swipeClick($event,batch,record,index)"
+													:right-options="scanOptions">
+													<handle-balance :detail="record" :isShowLocation="false"
+														:isShowBatch="batch.packingNumber!=null">
+													</handle-balance>
+												</uni-swipe-action-item>
+											</uni-swipe-action>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</uni-collapse-item>
+			</uni-collapse>
+		</view>
+	</view>
+	<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+	<comMessage ref="message"></comMessage>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
+	import handleBalance from '@/mycomponents/balance/handleBalance.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
+
+	import {
+		getDetailOption,
+		getEditRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		emits: ['updateData'],
+		components: {
+			itemQty,
+			recommend,
+			recommendBalance,
+			handleBalance,
+			recommendQtyEdit,
+			requiredLocation,
+			balanceQtyEdit,
+			location,
+			detailInfoPopup
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				option: [],
+				showItem: {},
+				editItem: {},
+				batchItem: {},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getEditRemoveOption();
+		},
+
+		methods: {
+			resizeCollapse() {
+				this.$nextTick(() => {
+					this.$refs.collapse.forEach(r => {
+						r.childrens.forEach(i => {
+							i.init();
+						})
+						r.resize();
+					})
+				});
+			},
+
+			swipeClick(e, batch, record, index) {
+				if (e.content.text == "编辑") {
+					this.edit(batch, record)
+				} else if (e.content.text == "移除") {
+					this.remove(batch, record, index)
+				}
+			},
+
+			edit(batch, record) {
+				let that = this;
+				that.editItem = record;
+				that.batchItem = batch;
+				record.balance.balanceQty = record.balance.qty;
+				that.$refs.balanceQtyEdit.openEditPopup(record.balance, record.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(batch, record, index) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							batch.Records.splice(index, 1);
+							this.resizeCollapse();
+							this.$emit('updateData', record)
+						}
+					});
+			},
+			confirm(val) {
+				this.editItem.qty = val;
+				this.$emit('updateData', this.editItem)
+				// let qty = 0;
+				// this.batchItem.Records.forEach(r => {
+				// 	qty += Number(r.qty);
+				// })
+				// this.batchItem.handleQty = qty;
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/repleinsh/coms/comScanReplishPack.vue b/pages/repleinsh/coms/comScanReplishPack.vue
new file mode 100644
index 0000000..2568434
--- /dev/null
+++ b/pages/repleinsh/coms/comScanReplishPack.vue
@@ -0,0 +1,531 @@
+<template>
+	<view>
+		<uni-popup ref="popup" :maskClick='false'>
+			<view class="">
+				<view class="popup_box">
+					<view class="pop_title">
+						扫描箱码
+						<text class="fr" @click="closeScanPopup()">关闭</text>
+					</view>
+					<!-- 	<view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						padding:20rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center">
+							位置 :
+						</view>
+						<view class="" style="width: 75%;padding: 0rpx">
+							<view class="uni-flex u-col-center uni-row" @click="showSelect">
+								<view class="" style="margin-left: 15rpx;font-size: 30rpx;">
+									{{positionInfo}}
+								</view>
+								<u-select v-model="show" mode="mutil-column-auto" :list="positionList" :defaultValue="defaultValueList"
+									@confirm="confirmSelect"></u-select>
+							</view>
+						</view>
+					</view> -->
+					<!-- <u-line class='line_color'></u-line> -->
+
+					<view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						margin-top: 8rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center" style="width: 25%; ">
+							来源库位
+						</view>
+						<view class="" style="width: 75%; padding: 8rpx;">
+							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请选择库位"
+								@confirm="fromLocationUpdate"></uni-combox>
+						</view>
+					</view>
+
+					<view class="">
+						<view class="">
+							<win-com-scan ref="comscan" placeholder="箱标签" @getResult="onScan" :clearResult="true"
+								:isShowHistory="false">
+							</win-com-scan>
+
+							<view style="width: 100%;">
+								<view style="width: 100%;" v-if="issueRecord.length>0">
+									<view class="uni-flex uni-row space-between u-col-center">
+										<view class="" style="padding: 10rpx;">
+											历史记录
+										</view>
+										<view class="" style="padding-right: 10rpx;">
+											<u-icon :name="expendIcon" size="35rpx" @click="expands()"></u-icon>
+										</view>
+									</view>
+									<u-line class='line_color' style='padding-top: 10rpx;padding-bottom: 20rpx;'>
+									</u-line>
+									<scroll-view scroll-y="true" class="scroll-view"
+										v-if="expand&&issueRecord.length>0">
+										<view class="uni-flex u-col" v-for="(record,index) in issueRecord">
+											<view style="width: 100%;">
+												<uni-swipe-action ref="swipeAction">
+													<uni-swipe-action-item @click="swipeClick($event,record,index)"
+														:right-options="scanOptions">
+														<view style="padding: 0px 10px">
+															<balance :dataContent="record" :isShowFromLocation="false"
+																:isShowStdPack="false"></balance>
+														</view>
+													</uni-swipe-action-item>
+												</uni-swipe-action>
+												<u-line class='line_color'></u-line>
+											</view>
+										</view>
+									</scroll-view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+		<comMessage ref="comMessage"></comMessage>
+		<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	</view>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+	import {
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+	
+	import {
+			calc
+		} from '@/common/calc.js';
+
+	import {
+		getBalanceByManagementPrecision
+	} from '@/common/balance.js';
+
+	export default {
+		name: 'winScanPack',
+		components: {
+			winComScan,
+			balance,
+			balanceQtyEdit,
+			balanceSelect
+		},
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+
+		},
+		data() {
+			return {
+				dataContent: {},
+				jobContent: {},
+				expendIcon: 'arrow-down',
+				show: false,
+				scanList: [],
+				toLocation: null,
+				toLocationCode: '',
+				fromLocationList: [],
+				fromLocationCode: '',
+				fromLocation: null,
+				issueRecord: [], //发料历史
+				expand: true,
+				scanOptions: {},
+				editItem: {},
+				positionInfo: "请选择位置",
+				positionList: [],
+				defaultValueList: [],
+				label: {},
+				fromInventoryStatuses: "",
+			}
+		},
+		created() {
+
+		},
+		watch: {},
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+		},
+		methods: {
+			openScanPopup(content, jobcontent) {
+				this.issueRecord = [];
+				this.dataContent = content;
+				this.jobContent = jobcontent;
+				this.initData();
+				this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
+					"-" + this.jobContent.subList[0].workStationCode
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+
+			closeScanPopup() {
+				this.$refs.popup.close();
+				this.$emit("closeScan")
+				//清除数据，恢复默认值
+				// Object.assign(this.$data, this.$options.data());
+			},
+
+			initData() {
+				let that = this;
+				that.fromLocationList = [];
+				if (that.dataContent != null) {
+					that.fromInventoryStatuses = this.jobContent.outInventoryStatuses
+					that.toLocation = that.dataContent[0];
+					that.toLocationCode = that.dataContent[0].toLocationCode;
+					that.fromLocationList = that.getFromLocationList();
+				}
+			},
+
+			showBalanceSelect(items) {
+				this.$refs.balanceSelect.openPopup(items);
+			},
+
+			getFromLocationList() {
+				let list = [];
+				let location = this.dataContent.find(r => r.toLocationCode == this.toLocationCode);
+				if (location != undefined) {
+					location.Items.forEach(item => {
+						item.Locations.forEach(f => {
+							list.push(f.fromLocationCode)
+						})
+					})
+					this.fromLocationCode = list[0];
+					return list;
+				} else {
+					this.$refs.comMessage.showErrorMessages('需求库位【' + this.toLocationCode + '】不存在', res => {
+						this.toLocationCode = '';
+					});
+				}
+			},
+
+			fromLocationUpdate(fromlocation) {
+				let location = this.fromLocationList.find(r => r == fromlocation)
+				if (location == undefined) {
+					this.fromLocationCode = ''
+					this.showErrorMessage('发料库位【' + fromlocation + '】不存在')
+				}
+			},
+			onScan(result) {
+				try {
+					let that = this;
+
+					if (that.fromLocationCode == '') {
+						that.showErrorMessage('请选择来源库位', res => {
+							that.$refs.toLocationCombox.onFocus();
+						});
+						return;
+					}
+					let packageInfo = result.package;
+					let itemCode = result.label.itemCode;
+					let packingCode = result.label.packingNumber;
+					let lot = result.label.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+					if (item == undefined) {
+						that.showErrorMessage('未查找到物料【' + itemCode + '】的发料明细',
+							res => {
+								that.getfocus();
+							}
+						)
+						return;
+					} else {
+						//查找库存信息
+						uni.showLoading({
+							title: '加载中',
+							mask: true
+						})
+						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
+							balanceRes => {
+								if (balanceRes.success) {
+									if (balanceRes.data.list.length == 0) {
+										this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
+											res => {
+												this.packGetFocus();
+											})
+									} else if (balanceRes.data.list.length == 1) {
+										let balance = balanceRes.data.list[0];
+										this.afterGetBalance(result.label, balance, packageInfo);
+									} else {
+										this.showBalanceSelect(balanceRes.data.list);
+									}
+								} else {
+									this.showErrorMessage(balanceRes.message.message);
+								}
+								uni.hideLoading();
+							});
+					}
+				} catch (e) {
+					this.showErrorMessage(e.stack)
+					uni.hideLoading();
+				}
+			},
+			selectBalanceItem(balance) {
+				this.afterGetBalance(this.label, balance);
+			},
+
+			afterGetBalance(label, balance, packageInfo) {
+				try {
+					let that = this;
+					let itemCode = label.itemCode;
+					let packingCode = label.packingNumber;
+					let lot = label.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+					let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode);
+					if (fromLocation != undefined) {
+						let batch = fromLocation.Batchs.find(r => r.batch == lot);
+						if (batch != undefined) {
+							if (batch.Records == undefined) {
+								batch.Records = [];
+							}
+
+							let record = batch.Records.find(r => r.packingNumber == packingCode);
+							if (record == undefined) {
+								//如果有推荐箱码
+								if (batch.Recommends.length > 0) {
+									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
+									if (recommend != undefined) {
+										that.addRecord(batch, label, balance, packageInfo)
+									} else {
+										//允许修改箱码
+										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
+											that.addRecord(batch, label, balance, packageInfo);
+										} else {
+											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
+												res => {
+													that.getfocus();
+												}
+											)
+										}
+									}
+								} else {
+									that.addRecord(batch, label, balance, packageInfo)
+								}
+							} else {
+								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
+									res => {
+										that.getfocus();
+									}
+								)
+							}
+						} else {
+							if (this.jobContent.allowModifyBatch == "TRUE") {
+								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
+									'】的发料明细,是否要继续发料?', res => {
+										if (res) {
+											let batch = that.createBatchInfo(label, balance,packageInfo);
+											if(fromLocation.Batchs.length>0){
+												batch.detail = fromLocation.Batchs[0].detail;
+											}
+											fromLocation.Batchs.unshift(batch);
+										}
+									})
+							} else {
+								that.showErrorMessage('未查找到批次【' + lot + '】的发料明细',
+									res => {
+										that.getfocus();
+									});
+							}
+						}
+					} else {
+						that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发料明细',
+							res => {
+								that.getfocus();
+							}
+						)
+					}
+				} catch (e) {
+					that.showErrorMessage(e.stack,
+						res => {
+							that.getfocus();
+						}
+					)
+				}
+			},
+
+			createBatchInfo(data, balance,packageInfo) {
+				let batch = {
+					batch: data.batch,
+					qty: 0,
+					uom: data.uom,
+					handleQty: Number(data.qty),
+					Records: []
+				}
+				let record = this.creatRecord(data, balance,packageInfo);
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				return batch;
+			},
+
+			creatRecord(label, balance, packageInfo) {
+				balance.stdPackQty = packageInfo.stdPackQty
+				balance.stdPackUnit = packageInfo.stdPackUnit
+				let record = {
+					scaned: true,
+					itemCode: label.itemCode,
+					packingNumber: label.packingNumber,
+					batch: label.batch,
+					qty: Number(balance.qty),
+					// qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
+					uom: balance.uom,
+					inventoryStatus: balance.inventoryStatus,
+					balance: balance,
+					toLocationCode: this.toLocationCode,
+					supplierCode: label.supplierCode
+				}
+				return record;
+			},
+
+			calcBatchHandleQty(batch) {
+				let handleQty = 0;
+				batch.Records.forEach(res => {
+					handleQty = calc.add(handleQty,res.qty)
+				})
+				batch.handleQty = handleQty;
+				
+				this.dataContent.forEach(toLocationCode=>{
+					toLocationCode.Items.forEach(item=>{
+						var itemCodeHandleQty =0;
+						item.Locations.forEach(batch=>{
+							batch.Batchs.forEach(batchHandleQty=>{
+							itemCodeHandleQty=calc.add(itemCodeHandleQty,batchHandleQty.handleQty)
+							})
+						})
+						item.handleQty=itemCodeHandleQty;
+					})
+					
+				})
+			},
+
+			addRecord(batch, label, balance, packageInfo) {
+				let record = this.creatRecord(label, balance, packageInfo);
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				this.calcBatchHandleQty(batch);
+				this.getfocus();
+			},
+
+			getfocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			losefocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+
+			expands() {
+				this.expand = !this.expand;
+				this.expendIcon = this.expand == true ? "arrow-down" : "arrow-up"
+			},
+
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				// item.balance.balanceQty = item.balance.qty;
+				item.balance.balanceQty = item.balance.qty;
+				this.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(record, index) {
+				this.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							record.qty = 0;
+							this.issueRecord.splice(index, 1)
+
+							let item = this.toLocation.Items.find(r => r.itemCode == record.itemCode);
+							if (item != undefined) {
+								item.Locations.forEach(l => {
+									let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b
+										.batch == record.batch);
+									let rIndex = batch.Records.findIndex(r => r.packingNumber == record
+										.packingNumber && r
+										.batch == record.batch);
+									batch.Records.splice(rIndex, 1);
+								})
+							}
+							this.$emit('updateData', item);
+						}
+					});
+			},
+
+			packGetFocus() {
+				this.$refs.comscan.getfocus();
+			},
+			packLoseFocus() {
+				this.$refs.comscan.losefocus();
+			},
+			showMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showMessage(message, callback);
+				})
+			},
+			showErrorMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, callback);
+
+				})
+			},
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, callback);
+				})
+			},
+			confirm(val) {
+				this.editItem.qty = Number(val);
+				this.$emit('updateData', this.editItem)
+			},
+			cancle() {
+				this.closeScanPopup()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	button {
+		border: none;
+	}
+
+	button::after {
+		border: none
+	}
+
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+		padding: 10rpx;
+	}
+</style>
diff --git a/pages/repleinsh/coms/repleinshDetailInfoPopup.vue b/pages/repleinsh/coms/repleinshDetailInfoPopup.vue
new file mode 100644
index 0000000..eef803f
--- /dev/null
+++ b/pages/repleinsh/coms/repleinshDetailInfoPopup.vue
@@ -0,0 +1,57 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.poNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.poLine}} </text>
+						</view>
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/repleinsh/coms/repleinshInfoPopup.vue b/pages/repleinsh/coms/repleinshInfoPopup.vue
new file mode 100644
index 0000000..88b2e0f
--- /dev/null
+++ b/pages/repleinsh/coms/repleinshInfoPopup.vue
@@ -0,0 +1,80 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">从库位类型范围 : </text>
+							<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.fromLocationTypes))}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到库位类型范围 : </text>
+							<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.toLocationTypes))}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从库区代码范围 : </text>
+							<text class="text_wrap">{{dataContent.fromAreaCodes}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到库区代码范围 : </text>
+							<text class="text_wrap">{{dataContent.toAreaCodes}} </text>
+						</view>
+					</view>
+				</view>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat,
+		getDirectoryItemArray,
+	} from '@/common/basic.js';
+	import {
+		getInventoryStatusDesc,
+		getLocationTypeNameList
+	} from '@/common/directory.js';
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			getDirectoryItemArray(value){
+				return getDirectoryItemArray(value)
+			},
+			
+			getLocationTypeNameList(value){
+				return getLocationTypeNameList(value)
+			}
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/repleinsh/coms/repleinshJobListPopup.vue b/pages/repleinsh/coms/repleinshJobListPopup.vue
new file mode 100644
index 0000000..9a17ec1
--- /dev/null
+++ b/pages/repleinsh/coms/repleinshJobListPopup.vue
@@ -0,0 +1,47 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-return-job-card :dataContent="item" @click='selectItem(item)'></com-return-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	import comReturnJobCard from '@/pages/purchaseReturn/coms/comReturnJobCard.vue'
+	
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comReturnJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/repleinsh/coms/requestDetailInfoPopup.vue b/pages/repleinsh/coms/requestDetailInfoPopup.vue
new file mode 100644
index 0000000..21a597b
--- /dev/null
+++ b/pages/repleinsh/coms/requestDetailInfoPopup.vue
@@ -0,0 +1,86 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<requestDetailCommonInfo :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">包装号 : </text>
+							<text class="text_wrap">{{dataContent.packingNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">器具号 : </text>
+							<text class="text_wrap">{{dataContent.containerNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">批次 : </text>
+							<text class="text_wrap">{{dataContent.batch}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">库存状态 : </text>
+							<text class="text_wrap">{{dataContent.inventoryStatus}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.poNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.poLine}} </text>
+						</view>
+						
+						<view class="item">
+							<text class="item_title">从库位代码 : </text>
+							<text class="text_wrap">{{dataContent.fromLocationCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从货主代码 : </text>
+							<text class="text_wrap">{{dataContent.fromOwnerCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到货主代码 : </text>
+							<text class="text_wrap">{{dataContent.toOwnerCode}} </text>
+						</view>
+					</view>
+				</view>
+			</requestDetailCommonInfo>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue'
+	export default {
+		components: {
+			requestDetailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/repleinsh/coms/requestInfoPopup.vue b/pages/repleinsh/coms/requestInfoPopup.vue
new file mode 100644
index 0000000..14f9d09
--- /dev/null
+++ b/pages/repleinsh/coms/requestInfoPopup.vue
@@ -0,0 +1,97 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<request-common-info :dataContent="dataContent"  @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">从仓库代码 : </text>
+							<text class="text_wrap">{{dataContent.fromWarehouseCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到仓库代码 : </text>
+							<text class="text_wrap">{{dataContent.toWarehouseCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从库位类型范围 : </text>
+							<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.fromLocationTypes))}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到库位类型范围 : </text>
+							<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.toLocationTypes))}} </text>
+						</view>
+						
+						<view class="item">
+							<text class="item_title">从库区代码范围 : </text>
+							<text class="text_wrap">{{dataContent.fromAreaCodes}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到库区代码范围 : </text>
+							<text class="text_wrap">{{dataContent.toAreaCodes}} </text>
+						</view>
+						
+						<view class="item">
+							<text class="item_title">供应商代码 : </text>
+							<text class="text_wrap">{{dataContent.supplierCode}} </text>
+						</view>
+						
+					</view>
+				</view>
+				<u-line></u-line>
+			</request-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat,
+		getDirectoryItemArray,
+	} from '@/common/basic.js';
+	
+	import {
+		getInventoryStatusDesc,
+		getLocationTypeNameList
+	} from '@/common/directory.js';
+	import requestCommonInfo from '@/mycomponents/request/requestCommonInfo.vue'
+	export default {
+		components: {
+			requestCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				},
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			getDirectoryItemArray(value){
+				return getDirectoryItemArray(value)
+			},
+			
+			getLocationTypeNameList(value){
+				return getLocationTypeNameList(value)
+			}
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/repleinsh/job/repleinshDetail.vue b/pages/repleinsh/job/repleinshDetail.vue
new file mode 100644
index 0000000..9f0cd00
--- /dev/null
+++ b/pages/repleinsh/job/repleinshDetail.vue
@@ -0,0 +1,499 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+			<u-line color="#D8D8D8"></u-line>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view v-for="(toLocation, index) in detailSource">
+					<com-repleish-detail-card ref='comIssueDetailCard' :dataContent="toLocation"
+						@updateData='updateData'>
+					</com-repleish-detail-card>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
+		<com-scan-replish-pack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
+		</com-scan-replish-pack>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		takeRepleinshJob,
+		cancleTakeRepleinshJob,
+		getRepleinshJobDetail,
+		repleinshJobSubmit
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle,
+		navigateBack,
+		getRemoveOption,
+		getCurrDateTime,
+		getDirectoryItemArray,
+		getPackingNumberAndBatch,
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource
+	} from '@/pages/issue/js/issue.js';
+	
+	import {
+			calc
+		} from '@/common/calc.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comRepleishDetailCard from '@/pages/repleinsh/coms/comRepleishDetailCard.vue'
+	import comScanReplishPack from '@/pages/repleinsh/coms/comScanReplishPack.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+
+	export default {
+		name: 'issueDetail',
+		components: {
+			jobDetailPopup,
+			winScanButton,
+			comRepleishDetailCard,
+			comScanReplishPack,
+			requiredLocation,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				toLocationCode: '',
+				tolocationTypeList: [],
+				jobStatus:""
+			};
+		},
+
+		props: {
+
+		},
+
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from === 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务	
+					cancleTakeRepleinshJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+			
+				return true;
+			}
+			
+		},
+
+		watch: {
+			locationTypes(newVal) {
+				let value = newVal;
+			},
+		},
+		mounted: function() {
+
+		},
+
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeRepleinshJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getRepleinshJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status
+							that.subList = res.data.subList;
+							that.toLocationCode = that.subList[0].toLocationCode
+							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
+							that.detailSource = getDataSource(that.detailSource, that.subList)
+							that.resizeCollapse();
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			closeScan() {
+				this.resizeCollapse();
+			},
+
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.comIssueDetailCard.forEach(r => {
+						r.resizeCollapse();
+					})
+				});
+			},
+
+
+			submit() {
+				var scanCount = this.getScanCount(this.subList);
+				
+				//允许部分提交
+				if(this.jobContent.allowPartialComplete=="TRUE"){
+				// 如果扫描数是0，提示扫描数为0，是否提交，点击确定提交，取消提示消失
+					if(scanCount == 0){
+						this.$refs.comMessage.showQuestionMessage("扫描数为0,是否提交?",res=>{
+							if(res){
+								this.setSubmitParamsAndSubmit();
+							}
+						})
+					}else {
+						this.setSubmitParamsAndSubmit();
+					}
+				}else {
+				//不允许部分提交，扫描数必须等于任务数量才可以提交
+					if(scanCount == 0){
+						this.showErrorMessage("扫描数为0,当前补料任务不允许部分提交,请先扫描")
+					}else {
+						this.setSubmitParamsAndSubmit();
+					}
+				}
+			},
+			
+			setSubmitParamsAndSubmit(){
+				//目前任务只到一个库位
+				var itemCodes = []
+				let locationCode = this.toLocationCode
+				this.detailSource.forEach(toLocation => {
+					toLocation.Items.forEach(item => {
+						itemCodes.push(item.itemCode)
+					})
+				})
+				
+				//使用在途库，不查询管理模式
+				if (this.jobContent.useOnTheWayLocation == 'TRUE') {
+					this.submitJob();
+				} else {
+					//获取管理模式，封装参数
+					getManagementPrecisions(itemCodes, locationCode, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							this.submitJob();
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+					});
+				}
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+
+				repleinshJobSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成补料记录<br>" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			setParams() {
+				var commitSubList = []
+				var createTime = getCurrDateTime();
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						item.Locations.forEach(fromLocation => {
+							fromLocation.Batchs.forEach(batch => {
+								let subItem = batch.detail;
+
+								if (subItem != undefined) {
+									if (batch.Records.length > 0) {
+										subItem.recordList = [];
+										batch.Records.forEach(r => {
+											let record = {};
+											record.handleQty = r.qty;
+
+											record.fromPackingNumber = r
+												.packingNumber;
+											record.fromBatch = r.batch;
+											record.fromContainerNumber = r
+												.ContainerNumber;
+
+											record.toContainerNumber = r
+												.ContainerNumber;
+											record.toInventoryStatus = r
+												.inventoryStatus;
+											record.toLocationCode = this
+												.toLocationCode;
+											record.supplierCode = r.supplierCode;
+
+											//使用在途库不改变管理模式
+											if (this.jobContent
+												.useOnTheWayLocation ==
+												'TRUE') {
+												record.toPackingNumber = r
+													.packingNumber;
+												record.toBatch = r.batch;
+											} else {
+												var info =
+													getPackingNumberAndBatch(
+														this.managementList, r
+														.itemCode,
+														r.packingNumber, r
+														.batch);
+												record.toPackingNumber = info
+													.packingNumber;
+												record.toBatch = info.batch;
+											}
+											subItem.recordList.push(record);
+										})
+										commitSubList.push(subItem);
+									}
+								}
+							})
+						})
+					})
+				})
+
+				this.jobContent.subList = commitSubList
+				this.jobContent.createTime = createTime;
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			cancel() {
+				let that = this;
+				this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => {
+					if (res) {
+						that.clearInfo();
+					}
+				});
+			},
+
+			clearInfo() {
+				this.dataContent.itemCodeList.forEach(res => {
+					if (res.recommendList != null) {
+						res.recommendList.forEach(res1 => {
+							if (res1.locationCodeList != null) {
+								res1.locationCodeList.forEach(res2 => {
+									if (res2.packingCodeList != null) {
+										res2.packingCodeList.forEach(res3 => {
+											res3.itemCode = "";
+											res3.qty = 0;
+										})
+									}
+								})
+							}
+
+						})
+					}
+
+				})
+			},
+
+			updateData(record) {
+				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
+				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
+				let itemHandleQty = 0;
+				if (item != undefined) {
+					item.Locations.forEach(l => {
+						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
+								.packingNumber == null || b.packingNumber == '') && b.batch ==
+							record.batch);
+						let handleQty = 0;
+						if (batch != undefined) {
+							batch.Records.forEach(res => {
+								handleQty = calc.add(handleQty,res.qty)
+							})
+							batch.handleQty = handleQty;
+							itemHandleQty = calc.add(itemHandleQty,handleQty)
+						}
+					})
+				}
+
+				// item.handleQty=itemHandleQty;
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			showCommitSuccess() {
+				this.$refs.comMessage.showCommitSuccess();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+
+			showRescanMessage(message) {
+				this.$refs.comMessage.showRescanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			confirm(data) {
+				this.dataContent = data;
+			},
+			confirmResult(result) {
+				this.dataContent = result;
+				this.$forceUpdate();
+			},
+			openScanDetailPopup() {
+				var datacontent = {}
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				// Object.assign(datacontent, this.detailSource);
+				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
+			},
+			closeScanPopup() {
+				this.updateCommitBtn();
+			},
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+
+				})
+			},
+			getScanCount(subList) {
+				var scanCount = 0;
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						item.Locations.forEach(fromLocation => {
+							fromLocation.Batchs.forEach(batch => {
+								let subItem = batch.detail;
+								if (batch.Records.length > 0) {
+									scanCount = calc.add(scanCount,batch.Records.length)
+								}
+							})
+						})
+					})
+				})
+				return scanCount;
+			}
+
+
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/repleinsh/job/repleinshJob.vue b/pages/repleinsh/job/repleinshJob.vue
new file mode 100644
index 0000000..b5084a2
--- /dev/null
+++ b/pages/repleinsh/job/repleinshJob.vue
@@ -0,0 +1,286 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-repleinsh-job-card :dataContent="item" @click='openJobDetail(item)'></com-repleinsh-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<repleinsh-info-popup ref='jobInfoPopup'></repleinsh-info-popup>
+			<repleinsh-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></repleinsh-job-list-popup>
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+			
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	
+	import {
+		getRepleinshJobList,
+		cancleTakeRepleinshJob
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+
+	import comRepleinshJobCard from '@/pages/repleinsh/coms/comRepleinshJobCard.vue'
+	import repleinshJobListPopup from '@/pages/repleinsh/coms/repleinshJobListPopup.vue'
+	import repleinshInfoPopup from '@/pages/repleinsh/coms/repleinshInfoPopup.vue'
+
+	export default {
+		name: 'repleinsh',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comRepleinshJobCard,
+			repleinshJobListPopup,
+			repleinshInfoPopup,
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+				
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+
+				getRepleinshJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("补料(" + this.totalCount + ")");
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					this.loadingType = "";
+					updateTitle("补料");
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './repleinshDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.scanList.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeRepleinshJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getRepleinshJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/repleinsh/record/repleinshRecord.vue b/pages/repleinsh/record/repleinshRecord.vue
new file mode 100644
index 0000000..9c2b8c9
--- /dev/null
+++ b/pages/repleinsh/record/repleinshRecord.vue
@@ -0,0 +1,566 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showRequestPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(toLocation, index) in detailSource" :key="index">
+						<view class="">
+							<view class="page-header">
+								<view class="text_lightblue fontsize-16">目标库位:{{toLocation.toLocationCode}}</view>
+							</view>
+							<com-issue-detail-card ref='comRepleinshDetailCard' :dataContent="toLocation"
+								@updateData='updateData'>
+							</com-issue-detail-card>
+						</view>
+						<!-- <u-line /> -->
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<com-repleinsh-request-popup ref="comRepleinshRequestPopup" :toLocationTypeList="tolocationTypeList"
+			@confirm='requestConfirm'
+			:itemCodeTypeList="itemCodeTypeList">
+		</com-repleinsh-request-popup>
+		<win-scan-button v-if='detailSource.length>0' @goScan='openScanDetailPopup'></win-scan-button>
+		<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
+		</com-scan-issue-pack>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		repleinshRecordSubmit,
+		getBalanceByBatchOffShelf
+	} from '@/api/request2.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		goHome,
+		updateTitle,
+		getCurrDateTime,
+		getPackingNumberAndBatch
+	} from '@/common/basic.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getDetailOption,
+		getDetailRemoveOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+
+	import {
+		getBusinessType,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import {
+		getDataSource
+	} from '@/pages/issue/js/issue.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import comRepleinshRequestPopup from '@/pages/repleinsh/coms/comRepleinshRequestPopup.vue'
+	import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
+	import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard,
+			comRepleinshRequestPopup,
+			comIssueDetailCard,
+			comScanIssuePack
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				businessTypeInfo: {},
+				fromLocationCode: "",
+				toLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				allowModifyLocation: false,
+				businessType: {},
+				requestList: [],
+				managementList: [],
+				dataContent: {},
+				itemCodeTypeList:[]
+			};
+		},
+		onLoad(option) {
+			var typeCode = "Repleinment"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.itemCodeTypeList = res.itemCodeTypeList;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showRequestPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+		methods: {
+			closeScan() {
+				this.resizeCollapse();
+			},
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.comRepleinshDetailCard.forEach(r => {
+						r.resizeCollapse();
+					})
+				});
+			},
+			showRequestPopup() {
+				this.$refs.comRepleinshRequestPopup.openRequestPopup();
+			},
+
+			//确定需求信息
+			requestConfirm(action, item) {
+				if (item.itemCode == '' || item.itemCode == null) return;
+				let that = this;
+				let request = that.requestList.find(r => r.itemCode == item.itemCode);
+				if (request == undefined) {
+					that.requestList.push(item);
+					this.getRecommendInfo(item);
+
+				} else {
+					this.$refs.comMessage.showQuestionMessage('已经存在物料[' + item.itemCode + ']的需求信息,是否要修改?', res => {
+						if (res) {
+							request.qty = item.qty;
+							that.detailSource.forEach(detail => {
+								let index = detail.Items.findIndex(r => {
+									r.itemCode == item.itemCode
+								})
+								detail.Items.splice(index, 1);
+							})
+							this.getRecommendInfo(item);
+						}
+					});
+				}
+			},
+
+			getRecommendInfo(item) {
+				let that = this;
+				uni.showLoading({
+					title: '加载中...',
+					mask: true
+				})
+				getBalanceByBatchOffShelf(item.itemCode, item.qty).then(res => {
+					if (res.data == null) {
+						that.showMessage('未获取到推荐信息');
+					} else {
+						if (res.data.length > 0) {
+							res.data.forEach(r => {
+								r.toLocationCode = item.toLocation.code;
+								r.itemName = item.itemName
+								r.uom = item.uom;
+								that.subList.push(r);
+							})
+
+							that.detailSource = getDataSource(that.detailSource, that.subList)
+							//要修改一下数量
+							that.detailSource.forEach(detail => {
+								detail.Items.forEach(i => {
+									let request = that.requestList.find(r => r
+										.itemCode == i
+										.itemCode);
+									i.qty = request.qty;
+								})
+							})
+							// that.resizeCollapse();
+						} else {
+							that.showMessage('列表数据为0');
+						}
+						uni.hideLoading();
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					that.showErrorMessage(error)
+				})
+			},
+
+
+			caclcQty() {
+				var totalQty = 0;
+				this.detailSource.subList.forEach(res => {
+					totalQty = calc.add(totalQty, res.qty)
+				})
+				this.detailSource.totalQty = totalQty;
+			},
+
+			openScanDetailPopup() {
+				var datacontent = {}
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				// Object.assign(datacontent, this.detailSource);
+				var dataContent = {
+					allowModifyPackingNumber: "FALSE",
+					outInventoryStatuses: this.fromInventoryStatuses
+				}
+				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, dataContent);
+			},
+
+			closeScanPopup() {
+				this.updateCommitBtn();
+			},
+
+			updateData(record) {
+				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
+				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
+				let itemHandleQty = 0;
+				if (item != undefined) {
+					item.Locations.forEach(l => {
+						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
+								.packingNumber == null || b.packingNumber == '') && b.batch ==
+							record.batch);
+						let handleQty = 0;
+						if (batch != undefined) {
+							batch.Records.forEach(res => {
+								handleQty = calc.add(handleQty, res.qty)
+							})
+							batch.handleQty = handleQty;
+							itemHandleQty = calc.add(itemHandleQty, handleQty)
+						}
+					})
+				}
+				this.resizeCollapse();
+				// item.handleQty=itemHandleQty;
+				// this.closeScan();
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			calcHandleQty() {
+				for (let item of this.detailSource) {
+					item.qty = 0;
+					for (let detail of item.subList) {
+						if (detail != undefined) {
+							item.qty = calc.add(item.qty,detail.qty)
+						}
+					}
+				}
+				this.$forceUpdate();
+			},
+
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			submit() {
+				if(this.getScanCount()==0){
+					this.showErrorMessage("当前扫描数为0,请先扫描在提交");
+					return 
+				}
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				//目前任务只到一个库位
+				var itemCodes = []
+				let locationCode = this.detailSource[0].toLocationCode
+				this.detailSource.forEach(toLocation => {
+					toLocation.Items.forEach(item => {
+						itemCodes.push(item.itemCode)
+					})
+				})
+
+				//获取管理模式，封装参数
+				getManagementPrecisions(itemCodes, locationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						this.submitJob();
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+
+			},
+
+			submitJob() {
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+				repleinshRecordSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成补料记录<br>" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg+"]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+			setParams() {
+				var subList = []
+				var createTime = getCurrDateTime();
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						item.Locations.forEach(fromLocation => {
+							fromLocation.Batchs.forEach(batch => {
+								let subItem = batch.detail;
+								subItem.recordList = [];
+
+								if (batch.Records.length > 0) {
+									batch.Records.forEach(r => {
+										let record = {};
+										record.handleQty = r.qty;
+
+										record.fromPackingNumber = r
+											.packingNumber;
+										record.fromBatch = r.batch;
+										record.fromContainerNumber = r
+											.ContainerNumber;
+
+										record.toContainerNumber = r
+											.ContainerNumber;
+										record.toInventoryStatus = r
+											.inventoryStatus;
+										record.toLocationCode = subItem
+											.toLocationCode;
+										record.fromLocationCode = fromLocation
+											.fromLocationCode
+										record.supplierCode = r.supplierCode;
+
+										//使用在途库不改变管理模式
+										var info = getPackingNumberAndBatch(
+											this.managementList, r
+											.itemCode,
+											r.packingNumber, r
+											.batch);
+										record.toPackingNumber = info
+											.packingNumber;
+										record.toBatch = info.batch;
+										subItem.recordList.push(record);
+									})
+									subList.push(subItem);
+								}
+							})
+						})
+					})
+				})
+
+				this.dataContent.subList = subList
+				this.dataContent.createTime = createTime;
+				this.dataContent.creator = creator;
+				return this.dataContent;
+			},
+			
+			getScanCount(){
+				var scanCount = 0;
+				var subList = []
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						item.Locations.forEach(fromLocation => {
+							fromLocation.Batchs.forEach(batch => {
+								let subItem = batch.detail;
+								subItem.recordList = [];
+				
+								if (batch.Records.length > 0) {
+									batch.Records.forEach(r => {
+										let record = {};
+										record.handleQty = r.qty;
+										subItem.recordList.push(record);
+									})
+									subList.push(subItem);
+								}
+							})
+						})
+					})
+				})
+				return scanCount =subList.length;
+			},
+			
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getToLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				// if (this.fromLocationCode == code) {
+				// 	uni.showToast({
+				// 		title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+				// 		duration: 2000
+				// 	})
+				// 	return
+				// }
+				this.ToLocationCodeInfo = location;
+				this.toLocationCode = code;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
+			},
+			clearData() {
+				this.fromLocationCode = '';
+				this.detailSource = [];
+				this.requestList = [];
+				this.dataContent = {}
+				this.managementList = []
+			},
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/repleinsh/request/repleinshRequest.vue b/pages/repleinsh/request/repleinshRequest.vue
new file mode 100644
index 0000000..3af80d3
--- /dev/null
+++ b/pages/repleinsh/request/repleinshRequest.vue
@@ -0,0 +1,224 @@
+<template>
+	<view class="">
+		<view class="" v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item :right-options="item.options" @click="swipeClick($event,item)">
+						<com-repleinsh-request-card :dataContent="item" @click='openRequestDetail(item)'>
+						</com-repleinsh-request-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+			<uni-load-more :status="loadingType" />
+
+			<request-info-popup ref='requestInfoPopup'></request-info-popup>
+		</view>
+		<requestButton @goScan='openScanDetailPopup' ></requestButton>
+	</view>
+	<comMessage ref="comMessage"></comMessage>
+</template>
+
+<script>
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comRepleinshRequestCard from '@/pages/repleinsh/coms/comRepleinshRequestCard.vue'
+	import requestInfoPopup from '@/pages/repleinsh/coms/requestInfoPopup.vue'
+	import requestButton from '@/mycomponents/button/requestButton.vue'
+
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getRepleinshRequestList,
+	} from '@/api/request2.js';
+	import {
+		getDetailOption,
+		getDetailAndApproveOption,
+		getDetailAndApprovePassAndApproveNoOption,
+		getDetailAndHandleOption,
+		getDetailAndAddAndCloseOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			requiredLocation,
+			comRepleinshRequestCard,
+			requestInfoPopup,
+			requestButton,
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				businessType: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				toLocationCode: '',
+				status: [],
+				creationTimeStart: "",
+				creationTimeEnd: "",
+				totalCount: 0,
+				detailOptions: [],
+				detailAndApproveOptions: [],
+				detailAndApprovePassAndApproveNoOption: [],
+				detailAndHandleOption: [],
+				detailAndAddAndCloseOption: [],
+				showOptions: [],
+				fromType: "requestType",
+				loadingType: "nomore",
+			};
+		},
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailAndApproveOptions = getDetailAndApproveOption()
+			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
+			this.detailAndHandleOption = getDetailAndHandleOption()
+			this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
+
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+		onShow() {
+			this.getList('refresh');
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+
+		mounted() {
+
+		},
+		methods: {
+
+			openRequestDetail(item) {
+				uni.navigateTo({
+					url: './repleinshRequestDetail?id=' + item.id
+				});
+			},
+			openRequestInfoPopup(item) {
+				this.$refs.requestInfoPopup.openPopup(item)
+			},
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var params = {
+					// filters: [{
+					// 	column: "status",
+					// 	action: "in",
+					// 	value: "1,2"
+					// }],
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getRepleinshRequestList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					list.forEach(res => {
+						var options = this.updateOptions(res.status);
+						res.options = options;
+					})
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+
+					this.pageNo++;
+					updateTitle("采购上架申请(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("采购上架申请");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+			updateOptions(status) {
+				if (status == "1") {
+					this.showOptions = this.detailAndApproveOptions;
+				} else if (status == "2") {
+					this.showOptions = this.detailAndApprovePassAndApproveNoOption;
+				} else if (status == "3") {
+					this.showOptions = this.detailAndHandleOption;
+				} else if (status == "4") {
+					this.showOptions = this.detailAndAddAndCloseOption;
+				} else {
+					this.showOptions = this.detailOptions;
+				}
+				return this.showOptions
+			},
+
+			openScanDetailPopup() {
+				uni.navigateTo({
+					url: "../record/repleinshRecord?fromType=" + this.fromType
+				})
+			},
+
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					console.log("详情", dataContent.id)
+					this.openRequestInfoPopup(dataContent);
+				} else if (e.content.text == "处理") {
+					console.log("处理")
+				} else if (e.content.text == "审批") {
+					console.log("审批")
+				} else if (e.content.text == "审批通过") {
+					console.log("审批通过")
+				} else if (e.content.text == "审批驳回") {
+					console.log("审批驳回")
+				} else if (e.content.text == "关闭") {
+					console.log("关闭")
+				}
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/repleinsh/request/repleinshRequestDetail.vue b/pages/repleinsh/request/repleinshRequestDetail.vue
new file mode 100644
index 0000000..2555013
--- /dev/null
+++ b/pages/repleinsh/request/repleinshRequestDetail.vue
@@ -0,0 +1,113 @@
+<template>
+	<view class="page-wraper">
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comRequestDetailCard :dataContent="item" 
+							 @openDetail="openDetail">
+						</comRequestDetailCard>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<requestDetailInfoPopup ref="jobDetailPopup"></requestDetailInfoPopup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getPutawayRequestDetail,
+	} from '@/api/request.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/directory.js';
+
+	import {
+		getDataSource,
+	} from '@/common/detail.js';
+
+
+	import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
+	import requestDetailInfoPopup from '@/pages/putaway/coms/requestDetailInfoPopup.vue'
+
+	export default {
+		components: {
+			comRequestDetailCard,
+			requestDetailInfoPopup,
+		},
+		data() {
+			return {
+				id: '',
+				requestContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			this.getDetail();
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getPutawayRequestDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data[0].subList.length > 0) {
+						that.requestContent = res.data[0];
+						that.subList = res.data[0].subList;
+						that.detailSource = getDataSource(that.subList);
+						updateTitle(this.requestContent.Number);
+					} else {
+						that.showMessage('列表数据为0');
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+			},
+			
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+					}
+				});
+			},
+
+			openDetail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/scrap/coms/comScrapDetailCard.vue b/pages/scrap/coms/comScrapDetailCard.vue
new file mode 100644
index 0000000..38f3944
--- /dev/null
+++ b/pages/scrap/coms/comScrapDetailCard.vue
@@ -0,0 +1,127 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend :detail="item"  ></recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<u-line color="#D8D8D8"></u-line>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+
+		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>
+		<scrap-detail-info-popup ref="jobDetailPopup" :dataContent="showItem"></scrap-detail-info-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue'
+	import scrapDetailInfoPopup from '@/pages/scrap/coms/scrapDetailInfoPopup.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	
+	import {
+		getDetailOption,
+		getDetailRemoveOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			jobDetailPopup,
+			scrapDetailInfoPopup,
+			balanceQtyEdit
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				if (this.settingParam.allowModifyQty == "TRUE") {
+					this.scanOptions = getDetailEditRemoveOption();
+				} else {
+					this.scanOptions = getDetailRemoveOption();
+				}
+			}
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.qtyEdit.openEditPopup(item.balance, item.handleQty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				console.log("提交参数", JSON.stringify(item));
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.handleQty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/scrap/coms/comScrapJobCard.vue b/pages/scrap/coms/comScrapJobCard.vue
new file mode 100644
index 0000000..037ee32
--- /dev/null
+++ b/pages/scrap/coms/comScrapJobCard.vue
@@ -0,0 +1,38 @@
+<template>
+	<job-com-main-card :dataContent="dataContent">
+		<view class="task_item">
+			<view class="task_text">
+				<view class="">
+					申请单号 : {{dataContent.requestNumber}}
+				</view>
+			</view>
+		</view>
+	</job-com-main-card>
+</template>
+
+<script>
+	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+	export default {
+		components: {
+			jobComMainCard,
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/scrap/coms/comScrapRequestCard.vue b/pages/scrap/coms/comScrapRequestCard.vue
new file mode 100644
index 0000000..23d744a
--- /dev/null
+++ b/pages/scrap/coms/comScrapRequestCard.vue
@@ -0,0 +1,36 @@
+<template>
+ 	<request-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				从仓库代码 : {{dataContent.fromWarehouseCode}}
+ 			</view>
+ 		</view>
+ 	</request-com-main-card>
+ </template>
+
+ <script>
+ 	import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			requestComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/scrap/coms/requestDetailInfoPopup.vue b/pages/scrap/coms/requestDetailInfoPopup.vue
new file mode 100644
index 0000000..4c965d1
--- /dev/null
+++ b/pages/scrap/coms/requestDetailInfoPopup.vue
@@ -0,0 +1,78 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<requestDetailCommonInfo :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">包装号 : </text>
+							<text class="text_wrap">{{dataContent.packingNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">器具号 : </text>
+							<text class="text_wrap">{{dataContent.containerNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">批次 : </text>
+							<text class="text_wrap">{{dataContent.batch}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从库位代码 : </text>
+							<text class="text_wrap">{{dataContent.fromLocationCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">库存状态 : </text>
+							<text class="text_wrap">{{dataContent.inventoryStatus}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">原因 : </text>
+							<text class="text_wrap">{{dataContent.reason}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从货主代码 : </text>
+							<text class="text_wrap">{{dataContent.fromOwnerCode}} </text>
+						</view>
+						
+					</view>
+				</view>
+			</requestDetailCommonInfo>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue'
+	export default {
+		components: {
+			requestDetailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/scrap/coms/requestInfoPopup.vue b/pages/scrap/coms/requestInfoPopup.vue
new file mode 100644
index 0000000..871a73f
--- /dev/null
+++ b/pages/scrap/coms/requestInfoPopup.vue
@@ -0,0 +1,60 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<request-common-info :dataContent="dataContent"  @onClose="closePopup">
+				<view class="">
+					<comListItem :dataList="dataList"></comListItem>
+				</view>
+				<u-line></u-line>
+			</request-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestCommonInfo from '@/mycomponents/request/requestCommonInfo.vue'
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+		components: {
+			requestCommonInfo,
+			comListItem
+		},
+		data() {
+			return {
+			dataContent:{},
+			dataList:[]
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				this.dataList=[{
+						title: '从仓库代码',
+						content: this.dataContent.fromWarehouseCode
+					}, {
+						title: '从库位类型范围',
+						content: this.dataContent.fromLocationTypes,
+						type:"locationType"
+					},{
+						title: '从库区代码范围',
+						content: this.dataContent.fromAreaCodes,
+					}];
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/scrap/coms/scrapDetailInfoPopup.vue b/pages/scrap/coms/scrapDetailInfoPopup.vue
new file mode 100644
index 0000000..7a5ba51
--- /dev/null
+++ b/pages/scrap/coms/scrapDetailInfoPopup.vue
@@ -0,0 +1,99 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">标包数量 : </text>
+							<text class="text_wrap">{{dataContent.stdPackQty}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">标包单位 : </text>
+							<text class="text_wrap">{{dataContent.stdPackUnit}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">供应商计量数量 : </text>
+							<text class="text_wrap">{{dataContent.supplierQty}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">供应商计量单位 : </text>
+							<text class="text_wrap">{{dataContent.supplierUom}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">转换率 : </text>
+							<text class="text_wrap">{{dataContent.convertRate}} </text>
+						</view>
+
+					</view>
+				</view>
+				<u-line></u-line>
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.poNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.poLine}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">项目代码 : </text>
+							<text class="text_wrap">{{dataContent.projectCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到货日期 : </text>
+							<text class="text_wrap">{{dataContent.arriveDate}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">生产日期 : </text>
+							<text class="text_wrap">{{dataContent.produceDate}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">过期日期 : </text>
+							<text class="text_wrap">{{dataContent.expireDate}} </text>
+						</view>
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/scrap/coms/scrapInfoPopup.vue b/pages/scrap/coms/scrapInfoPopup.vue
new file mode 100644
index 0000000..8bb7ec3
--- /dev/null
+++ b/pages/scrap/coms/scrapInfoPopup.vue
@@ -0,0 +1,74 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">发货单号 : </text>
+							<text class="text_wrap">{{dataContent.asnNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">要货计划单号 : </text>
+							<text class="text_wrap">{{dataContent.ppNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">供应商代码 : </text>
+							<text class="text_wrap">{{dataContent.carrierCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">承运商 : </text>
+							<text class="text_wrap">{{dataContent.carrierCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">运输方式 : </text>
+							<text class="text_wrap">{{dataContent.transferMode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">车牌号 : </text>
+							<text class="text_wrap">{{dataContent.vehiclePlateNumber}} </text>
+						</view>
+					</view>
+				</view>
+				<u-line></u-line>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/scrap/coms/scrapJobListPopup.vue b/pages/scrap/coms/scrapJobListPopup.vue
new file mode 100644
index 0000000..66af3f1
--- /dev/null
+++ b/pages/scrap/coms/scrapJobListPopup.vue
@@ -0,0 +1,46 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in scrapList" :key="index">
+				<com-scrap-job-card :dataContent="item" @click='selectItem(item)'></com-scrap-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comScrapJobCard from '@/pages/scrap/coms/comScrapJobCard.vue'
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comScrapJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				scrapList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.scrapList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/scrap/job/scrapJob.vue b/pages/scrap/job/scrapJob.vue
new file mode 100644
index 0000000..7648546
--- /dev/null
+++ b/pages/scrap/job/scrapJob.vue
@@ -0,0 +1,283 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-scrap-job-card :dataContent="item" @click='openJobDetail(item)'></com-scrap-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+			<scrap-info-popup ref='jobInfoPopup'></scrap-info-popup>
+			<scrap-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></scrap-job-list-popup>
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		cancleTakeScrapJob,
+		getScrapJobList,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import comScrapJobCard from '@/pages/scrap/coms/comScrapJobCard.vue'
+	import scrapJobListPopup from '@/pages/scrap/coms/scrapJobListPopup.vue'
+	import scrapInfoPopup from '@/pages/scrap/coms/scrapInfoPopup.vue'
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comScrapJobCard,
+			scrapInfoPopup,
+			scrapJobListPopup,
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+				
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getScrapJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("报废出库(" + this.totalCount + ")");
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("报废出库");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+					
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './scrapJobDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.jobListPopup.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeScrapJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getScrapJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/scrap/job/scrapJobDetail.vue b/pages/scrap/job/scrapJobDetail.vue
new file mode 100644
index 0000000..6574746
--- /dev/null
+++ b/pages/scrap/job/scrapJobDetail.vue
@@ -0,0 +1,449 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+			<u-line color="#D8D8D8"></u-line>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<com-scrap-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
+							@remove="updateData" @updateData="updateData">
+						</com-scrap-detail-card>
+					</view>
+					<u-line />
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getScrapJobDetail,
+		takeScrapJob,
+		cancleTakeScrapJob,
+		scrapJobSubmit
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		navigateBack,
+		getPackingNumberAndBatch,
+		getDirectoryItemArray,
+		getInventoryStatusName,
+	} from '@/common/basic.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import {
+		getDataSource,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import comScrapDetailCard from '@/pages/scrap/coms/comScrapDetailCard.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+
+	export default {
+		name: 'receipt_detail',
+		components: {
+			winScanButton,
+			winScanPack,
+			comScrapDetailCard,
+			winScanPackAndLocation,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				toLocationInfo: {},
+				businessTypeInfo: {},
+				managementList: [],
+				jobStatus:""
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务	
+					cancleTakeScrapJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+				return true;
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				if (this.id != null) {
+					takeScrapJob(this.id).then(res => {
+						uni.hideLoading();
+						callback();
+					}).catch(error => {
+						uni.hideLoading();
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getScrapJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status
+							that.subList = res.data.subList;
+							that.detailSource = getDataSource(that.subList)
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.balance.packingNumber;
+					var batch = result.balance.batch;
+					var qty = result.balance.qty;
+					var itemCode = result.balance.itemCode;
+					var locationCode = result.balance.locationCode;
+					var inventoryStatus = result.balance.inventoryStatus;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch
+						})
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
+							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,是否继续出库?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty);
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty);
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									} else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.handleQty = Number(result.balance.qty);
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+									itemDetail.balance = result.balance;
+									itemDetail.balance.balanceQty = Number(result.balance.qty);
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+				} catch (e) {
+					this.showMessage(e.message)
+				}
+			},
+
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+
+			updateData() {
+				calcHandleQty(this.detailSource);
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.continueScan()
+				this.$forceUpdate();
+			},
+
+
+			commit() {
+
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this
+							.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				//没有目标库位，不查询管理模式
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+				scrapJobSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成报废出库记录<br>" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toPackingNumber = detail.packingNumber;
+							detail.toContainerNumber = "";
+							detail.toInventoryStatus = "";
+							detail.toLocationCode = "";
+							detail.toBatch = detail.batch;
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus()
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus()
+						}
+					});
+				})
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/scrap/record/scrapRecord.vue b/pages/scrap/record/scrapRecord.vue
new file mode 100644
index 0000000..a5de67d
--- /dev/null
+++ b/pages/scrap/record/scrapRecord.vue
@@ -0,0 +1,396 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='getLocation' v-if="fromLocationCode==''"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="fromLocationCode!=''">
+			<view class="uni-flex uni-row u-col-center" style="width: 100%;" v-if="detailSource.length>0">
+				<view class="" style=" text-align: center;font-size: 32rpx;font-weight: 700;margin-left: 20rpx;">
+					报废原因 :
+				</view>
+				<uni-data-picker v-if="detailSource.length>0" style="padding: 20rpx; background-color:#fff;"
+					class='uni-data-picker' placeholder="请选择原因" popup-title="选择报废原因" :localdata="reasonList"
+					@change="reasonChange">
+				</uni-data-picker>
+			</view>
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
+								:isShowFromLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
+								:isShowToLocation="false"
+								@removePack="removePack">
+							</record-com-detail-card>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+	</view>
+
+</template>
+
+<script>
+	import {
+		scrapRecordSubmit
+	} from '@/api/request2.js';
+	
+	import {
+		goHome,
+		deepCopyData
+	} from '@/common/basic.js';
+	
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray,
+		getScarpReasonList
+	} from '@/common/directory.js';
+	
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				dataContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				fromLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				reasonList: [],
+				reasonText: "",
+				reasonCode:"",
+			};
+		},
+		onLoad(option) {
+			this.reasonList = getScarpReasonList();
+			var typeCode = "Scrap"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {
+			
+		},
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.$forceUpdate();
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+			},
+
+			closeScanPopup() {
+				if(this.$refs.scanPopup!=undefined){
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if(this.$refs.scanPopup!=undefined){
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			commit() {
+				if(this.reasonText==""){
+					this.showErrorMessage("请先选择报废原因")
+					return;
+				}
+				//允许部分提交
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+				scrapRecordSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成报废出库记录<br>" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var submitItem = deepCopyData(detail)
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+							
+							submitItem.inventoryStatus = detail.inventoryStatus;
+							
+							detail.fromPackingNumber = detail.packingNumber;
+							detail.toPackingNumber = detail.packingNumber;
+							
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+							
+							submitItem.fromBatch = detail.batch;
+							submitItem.toBatch = detail.batch;
+							
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = "";
+							
+							submitItem.reason = this.reasonCode;
+							submitItem.qty = detail.handleQty;
+							submitItem.package ="";
+							subList.push(submitItem)
+						}
+					})
+				})
+				
+				this.dataContent.subList =subList
+				this.dataContent.creator = creator;
+				return this.dataContent;
+				
+			},
+			
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
+			},
+			clearData(){
+				this.reasonCode = "";
+				this.fromLocationCode = "";
+				this.reasonText = "";
+				this.detailSource = [];
+				this.subList = [];
+				this.managementList = [];
+				this.dataContent = {}
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+			reasonChange(e) {
+				if (e.detail.value.length == 0) {
+					this.reasonCode = ""
+					this.reasonText = ""
+				} else {
+					this.reasonCode = e.detail.value[0].value
+					this.reasonText = e.detail.value[0].text
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/scrap/request/scrapRequestCreate.vue b/pages/scrap/request/scrapRequestCreate.vue
new file mode 100644
index 0000000..1fb3df4
--- /dev/null
+++ b/pages/scrap/request/scrapRequestCreate.vue
@@ -0,0 +1,390 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="flex u-col-center" style="width: 100%;background-color:#fff;">
+				<view class="" style="margin-left: 20rpx;  font-size: 30rpx;flex-shrink: 0;">报废原因：</view>
+				<view style="width: 100%">
+					<uni-data-picker style="background-color:#fff;margin-right: 20rpx;" class='uni-data-picker'
+						placeholder="请选择报废原因" popup-title="报废原因" :localdata="reasonList" @change="reasonChange">
+					</uni-data-picker>
+				</view>
+			</view>
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
+								:isShowFromLocation="true"
+								:isShowToLocation="false"
+								 @removeItem="removeItem(index,item)" @updateData="updateData"
+								@removePack="removePack">
+							</record-com-detail-card>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+	</view>
+
+</template>
+
+<script>
+	import {
+		scrapRequestCreate,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle,
+		getCurrDateOneMonthsTimes,
+		navigateBack
+	} from '@/common/basic.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray,
+		getScarpReasonList
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	
+	
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				received: false,
+				isShowPackingCode: true,
+				scanCount: 0,
+				dataContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				fromLocationInfo: {},
+				fromLocationCode: "",
+				isShowLocation: false,
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				allowModifyLocation: false,
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				reasonList: [],
+				reasonText: "",
+			};
+
+		},
+
+		onLoad(option) {
+			this.reasonList = getScarpReasonList();
+			var typeCode = "Scrap"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {
+
+		},
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+
+			},
+
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.$forceUpdate();
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+
+			commit() {
+				if (this.reasonText == "") {
+					this.showMessage("请先选择报废原因")
+					return;
+				}
+				if (this.detailSource.length == 0) {
+					this.showErrorMessage("请先扫描数据")
+					return;
+				}
+				//允许部分提交
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var params = this.setRequestParams();
+				console.log("提交" + JSON.stringify(params))
+				scrapRequestCreate(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成报废出库申请<br>" + res.data, )
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+
+			setRequestParams() {
+				var subList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.fromLocationCode = detail.locationCode
+							subList.push(detail)
+						}
+					})
+				})
+
+				this.dataContent.subList = subList
+				this.dataContent.status = 1;
+				this.dataContent.fromWarehouseCode = "W1";
+				this.dataContent.dueTime = getCurrDateOneMonthsTimes();
+				return this.dataContent;
+			},
+
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationInfo = location;
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+			reasonChange(e) {
+				if (e.detail.value.length == 0) {
+					this.reasonCode = ""
+					this.reasonText = ""
+				} else {
+					this.reasonCode = e.detail.value[0].value
+					this.reasonText = e.detail.value[0].text
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/scrap/request/scrapRequestDetail.vue b/pages/scrap/request/scrapRequestDetail.vue
new file mode 100644
index 0000000..4ba2c28
--- /dev/null
+++ b/pages/scrap/request/scrapRequestDetail.vue
@@ -0,0 +1,123 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<request-top :dataContent="requestContent"></request-top>
+			</view>
+			<view class="header_item">
+				从仓库代码 : {{requestContent.fromWarehouseCode}}
+			</view>
+			<u-line color="#D8D8D8" />
+		</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comRequestDetailCard :dataContent="item" 
+							 @openDetail="openDetail">
+						</comRequestDetailCard>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<requestDetailInfoPopup ref="jobDetailPopup"></requestDetailInfoPopup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getScrapRequestDetail,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource,
+	} from '@/common/detail.js';
+
+	import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
+	import requestDetailInfoPopup from '@/pages/scrap/coms/requestDetailInfoPopup.vue'
+	import requestTop from "@/mycomponents/request/requestTop.vue"
+	
+	export default {
+		components: {
+			comRequestDetailCard,
+			requestDetailInfoPopup,
+			requestTop
+		},
+		data() {
+			return {
+				id: '',
+				requestContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			this.getDetail();
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getScrapRequestDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+					if (res.data.subList.length > 0) {
+						that.requestContent = res.data;
+						that.subList = res.data.subList;
+						that.detailSource = getDataSource(that.subList);
+					} else {
+						that.showMessage('列表数据为0');
+					}}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+			},
+			
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+					}
+				});
+			},
+
+			openDetail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/scrap/request/scrapRrequest.vue b/pages/scrap/request/scrapRrequest.vue
new file mode 100644
index 0000000..25a10de
--- /dev/null
+++ b/pages/scrap/request/scrapRrequest.vue
@@ -0,0 +1,390 @@
+<template>
+	<view>
+		<com-empty-view v-if="requestList.length==0"></com-empty-view>
+		<request-filter ref="filter" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
+			:checkedWaitTask="checkedWaitTask">
+		</request-filter>
+		<view v-if="requestList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in requestList" :key="index">
+					<uni-swipe-action-item :right-options="item.options" @click="swipeClick($event,item)">
+						<com-scrap-request-card :dataContent="item" @click='openRequestDetail(item)'>
+						</com-scrap-request-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+			<uni-load-more :status="loadingType" />
+
+			<request-info-popup ref='requestInfoPopup'></request-info-popup>
+		</view>
+		<requestButton @goScan='openScanDetailPopup'></requestButton>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import requestFilter from '@/mycomponents/request/requestFilter.vue'
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import comScrapRequestCard from '@/pages/scrap/coms/comScrapRequestCard.vue'
+	import requestInfoPopup from '@/pages/scrap/coms/requestInfoPopup.vue'
+	import requestButton from '@/mycomponents/button/requestButton.vue'
+	import {
+		goHome,
+		updateTitle,
+		clearTirmAndWrap
+	} from '@/common/basic.js';
+
+	import {
+		getScrapRequestList,
+		scrapRequestApprove,
+		scrapRequestClose,
+		scrapRequestApproveAgree,
+		scrapRequestApproveRefused,
+		scrapRequestHandle,
+		scrapRequestAddAgain
+	} from '@/api/request2.js';
+	import {
+		getDetailOption,
+		getDetailAndApproveOption,
+		getDetailAndApprovePassAndApproveNoOption,
+		getDetailAndHandleOption,
+		getDetailAndAddAndCloseOption,
+		getAddAgainOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			requestFilter,
+			comScrapRequestCard,
+			requestInfoPopup,
+			requestButton,
+		},
+		data() {
+			return {
+				requestList: [],
+				pageNo: 1,
+				pageSize: 10,
+				status: "1,2,3,4,5,6",
+				totalCount: 0,
+				checkedWaitTask: false,
+				detailOptions: [],
+				detailAndApproveOptions: [],
+				detailAndApprovePassAndApproveNoOption: [],
+				detailAndHandleOption: [],
+				detailAndAddAndCloseOption: [],
+				addAgainOption: [],
+				showOptions: [],
+				fromType: "requestType",
+				loadingType: "nomore",
+
+			};
+		},
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.addAgainOption = getAddAgainOption();
+			this.detailAndApproveOptions = getDetailAndApproveOption()
+			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
+			this.detailAndHandleOption = getDetailAndHandleOption()
+			this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
+
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+		onShow() {
+			this.getList('refresh');
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+
+		mounted() {
+
+		},
+		methods: {
+
+			openRequestInfoPopup(item) {
+				this.$refs.requestInfoPopup.openPopup(item)
+			},
+			openRequestDetail(item) {
+				uni.navigateTo({
+					url: './scrapRequestDetail?id=' + item.id
+				});
+			},
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.requestList = [];
+				}
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getScrapRequestList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					list.forEach(res => {
+						var options = this.updateOptions(res.status);
+						res.options = options;
+					})
+					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
+					this.pageNo++;
+					updateTitle("报废出库申请(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("报废出库申请");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			updateOptions(status) {
+				if (status == "1") {
+					this.showOptions = this.detailAndApproveOptions;
+				} else if (status == "2") {
+					this.showOptions = this.detailAndApprovePassAndApproveNoOption;
+				} else if (status == "3") {
+					this.showOptions = this.detailAndHandleOption;
+				} else if (status == "4") {
+					this.showOptions = this.detailAndAddAndCloseOption;
+				} else if (status == "5") {
+					this.showOptions = this.addAgainOption;
+				} else {
+					this.showOptions = this.detailOptions;
+				}
+				return this.showOptions
+			},
+
+			openScanDetailPopup() {
+				uni.navigateTo({
+					url: "./scrapRequestCreate"
+				})
+			},
+
+			swipeClick(e, dataContent) {
+				var text = clearTirmAndWrap(e.content.text)
+				if (text == "详情") {
+					this.openRequestInfoPopup(dataContent);
+				} else if (text == "处理") {
+					this.showQuestionMessage("确定要处理当前申请吗?", res => {
+						this.scrapRequestHandle(dataContent.id)
+					})
+				} else if (text == "提交审批") {
+					this.showQuestionMessage("确定要审批当前申请吗?", res => {
+						this.scrapRequestApprove(dataContent.id)
+					})
+				} else if (text == "审批通过") {
+					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
+						this.scrapRequestApproveAgree(dataContent.id)
+					})
+				} else if (text == "审批驳回") {
+					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
+						this.scrapRequestApproveRefused(dataContent.id)
+					})
+				} else if (text == "关闭") {
+					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
+						this.scrapRequestClose(dataContent.id)
+					})
+				} else if (text == "重新添加") {
+					this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
+						this.scrapRequestAddAgain(dataContent.id)
+					})
+				}
+			},
+			showQuestionMessage(hint, callBack) {
+				this.$refs.comMessage.showQuestionMessage(hint,
+					res => {
+						if (res) {
+							callBack()
+						}
+					});
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getScrapRequestList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openRequestDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			scrapRequestApprove(id) {
+				scrapRequestApprove(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请提交审批成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请提交审批失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+
+			},
+
+			scrapRequestClose(id) {
+				scrapRequestClose(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请关闭成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请关闭失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			scrapRequestApproveAgree(id) {
+				scrapRequestApproveAgree(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批通过成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批通过失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			scrapRequestApproveRefused(id) {
+				scrapRequestApproveRefused(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批驳回成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批驳回失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			scrapRequestHandle(id) {
+				scrapRequestHandle(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请处理成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请处理失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			scrapRequestAddAgain(id) {
+				scrapRequestAddAgain(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请重新添加成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请重新添加失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/setter/index.vue b/pages/setter/index.vue
new file mode 100644
index 0000000..9b616cf
--- /dev/null
+++ b/pages/setter/index.vue
@@ -0,0 +1,166 @@
+<template>
+	<view class="personal">
+		<view class="txbox">
+			<image src="/static/avatar.png" class="tx"></image>
+			<!-- 	<view class="text">admin</view> -->
+		</view>
+		<view class="">
+			<u-cell-group >
+				<u-cell-item  icon="account-fill" title="姓名" :arrow="false">{{userName}}</u-cell-item>
+				<u-cell-item v-if="userInfo!=null" icon="file-text" title="部门" :arrow="false">{{userInfo.dept.name}}</u-cell-item>
+				<u-cell-item v-if="userInfo!=null" icon="photo" title="岗位" :arrow="false">{{(userInfo.posts || []).map(post => post.name).join(',')}}</u-cell-item>
+				<u-cell-item icon="level" v-if="userInfo!=null" title="角色" :arrow="false">{{(userInfo.roles || []).map(role => role.name).join(',')}}</u-cell-item>
+				<u-cell-item icon="trash" title="清除缓存" @click="clear()" ></u-cell-item>
+				<u-cell-item icon="edit-pen" title="修改密码" @click="modifiedPassWord()" ></u-cell-item>
+				<u-cell-item icon="order" title="版本号" :arrow="false">{{version}}</u-cell-item>
+				<!-- #ifdef APP -->
+				<u-cell-item icon="reload" title="检查更新" @click="update">{{version}}</u-cell-item>
+				<!-- #endif -->
+				
+			</u-cell-group>
+		</view>
+		
+		<view>
+			<button class="footbtn" @click="handlerlogout">退出登录</button>
+		</view>
+
+	</view>
+</template>
+
+<script setup>
+	import {
+		logout,
+		getUserProfile
+	} from '@/api/request2.js';
+	import store from '@/store'
+	import {
+		clearCacheData
+	} from '@/common/directory.js';
+	import {
+		removeToken
+	} from '@/common/utils/auth'
+	
+	// #ifdef APP-PLUS
+	import {
+		appUpdate
+	} from "@/common/appUpdate.js"
+	// #endif
+	import {
+		ref,
+		reactive,
+		nextTick,
+		createApp
+	} from "vue";
+	import {
+		onLoad
+	} from "@dcloudio/uni-app";
+	const app = createApp({});
+	// app.component({
+	// });
+
+	const userName = ref(store.state.user.name);
+	let test = ref("123");
+	let version = ref();
+	let userInfo = ref(null);
+	onLoad(() => {
+		getAppVersion()
+		getUserProfile().then(res => {
+			userInfo.value = res.data
+			// nextTick(()=>{
+			// 	const userInfo = res.data.nickname
+			// 	 console.log("打印",userInfo)
+			// 	})
+
+		})
+	});
+
+
+	function handlerlogout() {
+		store.dispatch('LogOut', {}).then(() => {
+			clearStorage();
+			// #ifdef H5
+			uni.reLaunch({
+				url: '../login/index'
+			})
+			// #endif
+			
+			// #ifdef APP
+			 plus.runtime.quit()
+			// #endif
+			
+		})
+	};
+
+	function clearStorage() {
+		uni.clearStorageSync()
+		removeToken();
+
+	};
+
+	function clear() {
+		clearCacheData()
+		uni.showToast({
+			title: "清理缓存成功"
+		})
+	}
+
+	function getAppVersion() {
+		const systemInfo = uni.getSystemInfoSync();
+		// #ifdef H5
+		version.value = systemInfo.appVersion;
+		console.log(systemInfo.appVersion, '版本号');
+		// #endif
+
+		// #ifdef APP
+		version.value = systemInfo.appWgtVersion;
+		// #endif
+
+	}
+
+	function update() {
+		console.log("update");
+		appUpdate()
+	}
+	function modifiedPassWord() {
+		uni.navigateTo({
+			url:"./passwordpage"
+		})
+	}
+
+</script>
+
+<style>
+	.txbox {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.tx {
+		width: 200rpx;
+		height: 200rpx;
+		margin: 30rpx 0 30rpx;
+		border-radius: 150upx;
+	}
+
+	.text {
+		font-size: 20upx;
+		text-align: center;
+	}
+
+	.footbox {
+		display: flex;
+		align-items: center;
+
+	}
+
+	.footbtn {
+		margin-top: 120rpx;
+		width: 300rpx;
+		border-radius: 50rpx;
+		background-color: #fff;
+		font-size: .825rem;
+		color: #333;
+		line-height: 90rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/setter/passwordpage.vue b/pages/setter/passwordpage.vue
new file mode 100644
index 0000000..72434c6
--- /dev/null
+++ b/pages/setter/passwordpage.vue
@@ -0,0 +1,108 @@
+<template>
+    <view class="content passwordpage">
+        <uni-forms ref="form" :modelValue="formData" :rules="rules">
+            <uni-forms-item label="原密码" name="oldpassword" style="margin: 20rpx 0;">
+                <uni-easyinput type="password" v-model="formData.oldpassword" placeholder="请输入原来的密码" />
+            </uni-forms-item>
+			<uni-forms-item label="新密码" name="newpassword" style="border-bottom: 1px solid #eee;">
+			    <uni-easyinput type="password" v-model="formData.newpassword" placeholder="请输入新密码" />
+			</uni-forms-item>
+			<uni-forms-item label="确认新密码" name="newpassword2">
+			    <uni-easyinput type="password" v-model="formData.newpassword2" placeholder="请再次输入密码" />
+			</uni-forms-item>
+        </uni-forms>
+		<view class="new_btn_bot">
+			<button class="new_save_btn" @click="submit">确认修改</button>
+		</view>
+    </view>
+</template>
+
+<script>
+	import { updateUserPwd } from '@/api/request2.js';
+	export default {
+	    data() {
+	        return {
+	            // 表单数据
+	            formData: {
+	                oldpassword: '',
+	                newpassword: '',
+					newpassword2:''
+	            },
+	            rules: {
+					oldpassword: {
+					    rules: [{
+					            required: true,
+					            errorMessage: '请输入密码',
+					        }
+					    ]
+					},
+	                // 对name字段进行必填验证
+	                newpassword: {
+	                    rules: [{
+	                            required: true,
+	                            errorMessage: '请输入密码',
+	                        },
+	                        {
+	                            minLength: 6,
+	                            maxLength: 20,
+	                            errorMessage: '密码长度在 {minLength} 到 {maxLength} 个字符',
+	                        }
+	                    ]
+	                },
+	                // 对email字段进行必填验证
+	                newpassword2: {
+	                    rules: [{
+	                            required: true,
+	                            errorMessage: '请输入密码',
+	                        },
+	                        {
+	                            minLength: 6,
+	                            maxLength: 20,
+	                            errorMessage: '密码长度在 {minLength} 到 {maxLength} 个字符',
+	                        },
+							{
+								validateFunction:function(rule,value,data,callback){
+									console.log(value !== data.newpassword)
+									if (value !== data.newpassword) {
+										callback('两次输入不同')
+									}
+									return true
+								}
+							}
+	                    ]
+	                }
+	            }
+	        }
+	    },
+	    methods: {
+	        /**
+	         * 复写 binddata 方法，如果只是为了校验，无复杂自定义操作，可忽略此方法
+	         * @param {String} name 字段名称
+	         * @param {String} value 表单域的值
+	         */
+	        // binddata(name,value){
+	        // 通过 input 事件设置表单指定 name 的值
+	        //   this.$refs.form.setValue(name, value)
+	        // },
+	        // 触发提交表单
+	        submit() {
+	            this.$refs.form.validate().then(res=>{
+					console.log(res)
+					updateUserPwd(res.oldpassword,res.newpassword).then((ress)=>{
+						console.log('返回结果：', ress);
+					})
+	            }).catch(err =>{
+	                console.log('表单错误信息：', err);
+	            })
+	        }
+	    }
+	}
+</script>
+
+<style>
+	.content{
+		/* padding: 20rpx; */
+		/* background-color: #fff; */
+	}
+	
+</style>
diff --git a/pages/setter/setterDetail.vue b/pages/setter/setterDetail.vue
new file mode 100644
index 0000000..708e6d0
--- /dev/null
+++ b/pages/setter/setterDetail.vue
@@ -0,0 +1,58 @@
+<template>
+	<!-- <page-meta root-font-size="18px"></page-meta> -->
+	<view class="content">
+	<uni-list>
+	  <uni-list-item :title="baseInfo.companyCode.desc" :rightText="baseInfo.companyCode.value" />
+	</uni-list>
+	<uni-list>
+		<uni-list-item :title="baseInfo.warehouseCode.desc" :rightText="baseInfo.warehouseCode.value" />
+	</uni-list>
+	<uni-list>
+		<uni-list-item :title="baseInfo.dev.desc" :rightText="baseInfo.dev.value" />
+	</uni-list>
+	<uni-list v-for="item in configList">
+		<uni-list-item :title="item.desc" :rightText="item.value?'是':'否'" />
+	</uni-list>
+	</view>
+</template>
+
+<script>
+	import {
+		goHome,
+	} from '@/common/basic.js';
+	export default {
+		data() {
+			return {
+				configList: [],
+				baseInfo: {}
+			}
+		},
+		onShow() {
+			this.baseInfo = this.$baseInfo;
+			this.configList = this.$recepit_configList;
+			console.log(this.configList)
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped>
+	.item {
+		display: flex;
+		justify-content: space-between;
+		flex-direction: row;
+	}
+
+	.uni-list-item__content-title {
+		font-size: 50rpx;
+		color: #3b4144;
+		overflow: hidden;
+	}
+</style>
diff --git a/pages/supplierDeliver/coms/comRecordCard.vue b/pages/supplierDeliver/coms/comRecordCard.vue
new file mode 100644
index 0000000..1c6e0c4
--- /dev/null
+++ b/pages/supplierDeliver/coms/comRecordCard.vue
@@ -0,0 +1,43 @@
+<template>
+	<job-com-main-card :dataContent="dataContent">
+		<view class="task_item">
+			<view class="task_text">
+				<view class="">
+					发货单号 : {{dataContent.asnNumber}}
+				</view>
+			</view>
+			<view class="task_text">
+				<view class="">
+					供应商代码 : {{dataContent.supplierCode}}
+				</view>
+			</view>
+		</view>
+	</job-com-main-card>
+</template>
+
+<script>
+	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+	export default {
+		components: {
+			jobComMainCard,
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/supplierDeliver/coms/comRecordDetailCard.vue b/pages/supplierDeliver/coms/comRecordDetailCard.vue
new file mode 100644
index 0000000..0802152
--- /dev/null
+++ b/pages/supplierDeliver/coms/comRecordDetailCard.vue
@@ -0,0 +1,98 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="detailOptions">
+							<recommend :detail="item"  :isShowToLocation="true" 
+							:isShowFromLocation="false" 
+							:isShowStatus="false"
+							:isShowPack="false"
+							></recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<u-line color="#D8D8D8"></u-line>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue'
+	
+	import {
+		getDetailOption,
+		getDetailRemoveOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			recommendQtyEdit,
+			jobDetailPopup,
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				}  
+			},
+			
+
+			detail(item) {
+				this.$emit('openDetail', item);
+			},
+			
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/supplierDeliver/coms/recordDetailInfoPopup.vue b/pages/supplierDeliver/coms/recordDetailInfoPopup.vue
new file mode 100644
index 0000000..7ef4023
--- /dev/null
+++ b/pages/supplierDeliver/coms/recordDetailInfoPopup.vue
@@ -0,0 +1,163 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<recordDetailCommonInfo :dataContent="dataContent" @onClose="closePopup">
+				<view class="" v-if="dataList.length>0">
+					<comListItem :dataList="dataList"></comListItem>
+				</view>
+				<u-line></u-line>
+			</recordDetailCommonInfo>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+	import recordDetailCommonInfo from '@/mycomponents/detail/recordDetailCommonInfo.vue'
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+		components: {
+			recordDetailCommonInfo,
+			comListItem
+		},
+		data() {
+			return {
+				dataContent: {},
+				dataList: []
+			}
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		mounted() {},
+		props: {
+
+		},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				this.dataList = [{
+						title: '从包装号',
+						content: this.dataContent.fromPackingNumber
+					},
+					{
+						title: '到包装号',
+						content: this.dataContent.toPackingNumber
+					}, {
+						title: '从器具号',
+						content: this.dataContent.fromContainerNumber
+					},
+					{
+						title: '从批次',
+						content: this.dataContent.fromBatch
+					},
+					{
+						title: '到批次',
+						content: this.dataContent.toBatch
+					},
+					{
+						title: '替代批次',
+						content: this.dataContent.altBatch
+					},
+					{
+						title: '到货日期',
+						content: this.dataContent.arriveDate,
+						type:"dateTime"
+					},
+					{
+						title: '生产日期',
+						content: this.dataContent.produceDate,
+						type:"dateTime"
+					},
+					{
+						title: '过期日期',
+						content: this.dataContent.expireDate,
+						type:"dateTime"
+					},
+					{
+						title: '订单号',
+						content: this.dataContent.poNumber
+					},
+					{
+						title: '订单行',
+						content: this.dataContent.PoLine
+					},
+					{
+						title: '标包数量',
+						content: this.dataContent.stdPackQty
+					},
+					{
+						title: '标包单位',
+						content: this.dataContent.stdPackUnit
+					},{
+						title: '供应商计量数量',
+						content: this.dataContent.supplierQty
+					},
+					{
+						title: '供应商计量单位',
+						content: this.dataContent.supplierUom
+					},
+					
+					{
+						title: '转换率',
+						content: this.dataContent.convertRate
+					},
+					
+					{
+						title: '从库位代码',
+						content: this.dataContent.fromLocationCode
+					},
+					{
+						title: '从库位组代码',
+						content: this.dataContent.fromLocationGroupCode
+					},
+					{
+						title: '从库区代码',
+						content: this.dataContent.fromAreaCode
+					},
+					{
+						title: '到库位代码',
+						content: this.dataContent.toLocationCode
+					},
+					{
+						title: '到库位组代码',
+						content: this.dataContent.toLocationGroupCode
+					},
+					{
+						title: '到库区代码',
+						content: this.dataContent.toAreaCode
+					},
+					{
+						title: '从货主代码',
+						content: this.dataContent.fromOwnerCode
+					},
+					{
+						title: '到货主代码',
+						content: this.dataContent.toOwnerCode
+					}
+				]
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/supplierDeliver/coms/recordInfoPopup.vue b/pages/supplierDeliver/coms/recordInfoPopup.vue
new file mode 100644
index 0000000..8eadb47
--- /dev/null
+++ b/pages/supplierDeliver/coms/recordInfoPopup.vue
@@ -0,0 +1,116 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<record-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<comListItem :dataList="dataList"></comListItem>
+				</view>
+				<u-line></u-line>
+			</record-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+	import recordCommonInfo from '@/mycomponents/record/recordCommonInfo.vue'
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+		components: {
+			recordCommonInfo,
+			comListItem
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				},
+				dataList:[]
+			}
+		},
+		watch:{
+			dataContent: {
+				handler(newName, oldName) {
+					this.dataList=[{
+							title: '申请单号',
+							content: this.dataContent.requestNumber
+						}, {
+							title: '要货计划单号',
+							content: this.dataContent.ppNumber
+						},{
+							title: '供应商代码',
+							content: this.dataContent.supplierCode
+						},{
+							title: '联系人姓名',
+							content: this.dataContent.contactName
+						},{
+							title: '联系人电话',
+							content: this.dataContent.contactPhone
+						},{
+							title: '联系人电子邮件',
+							content: this.dataContent.contactEmail
+						},{
+							title: '从仓库代码',
+							content: this.dataContent.fromWarehouseCode
+						},{
+							title: '到仓库代码',
+							content: this.dataContent.toWarehouseCode
+						},{
+							title: '到月台代码',
+							content: this.dataContent.toDockCode
+						},{
+							title: '时间窗口',
+							content: this.dataContent.timeWindow,
+							type:"dateTime"
+						},{
+							title: '计划到货时间',
+							content: this.dataContent.planArriveTime,
+							type:"dateTime"
+						},
+						{
+							title: '承运商',
+							content: this.dataContent.carrierCode
+						},{
+							title: '运输方式',
+							content: this.dataContent.transferMode,
+							type:"transferMode"
+						},{
+							title: '车牌号',
+							content: this.dataContent.vehiclePlateNumber
+						}];
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			avaliable(value) {
+				return value =="TRUE"?"可用":"不可用"
+			},
+			formatDate(val) {
+				return dateFormat(val)
+			}
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/supplierDeliver/coms/recordListDetailPop.vue b/pages/supplierDeliver/coms/recordListDetailPop.vue
new file mode 100644
index 0000000..a8dae9b
--- /dev/null
+++ b/pages/supplierDeliver/coms/recordListDetailPop.vue
@@ -0,0 +1,95 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<recordListCommonInfo :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">出库事务类型 : </text>
+							<text class="text_wrap">{{dataContent.outTransaction}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">入库事务类型 : </text>
+							<text class="text_wrap">{{dataContent.inTransaction}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">执行时间 : </text>
+							<text class="text_wrap">{{formatDate(dataContent.executeTime)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">生效日期 : </text>
+							<text class="text_wrap">{{formatDate(dataContent.activeDate)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">申请时间 : </text>
+							<text class="text_wrap">{{formatDate(dataContent.requestTime)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">截止时间 : </text>
+							<text class="text_wrap">{{formatDate(dataContent.dueTime)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">部门 : </text>
+							<text class="text_wrap">{{dataContent.departmentCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">岗位 : 数据库中没有该字段，设计中有 </text>
+							<text class="text_wrap">{{dataContent.userPositionCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">是否可用 : </text>
+							<text class="text_wrap">{{avaliable(dataContent.available)}} </text>
+						</view>
+					</view>
+				</view>
+				<u-line></u-line>
+			</recordListCommonInfo>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+	import recordListCommonInfo from '@/mycomponents/record/recordListCommonInfo.vue'
+	export default {
+		components: {
+			recordListCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			avaliable(value) {
+				return value =="TRUE"?"可用":"不可用"
+			},
+			formatDate(val) {
+				return dateFormat(val)
+			}
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/supplierDeliver/coms/recordListPopup.vue b/pages/supplierDeliver/coms/recordListPopup.vue
new file mode 100644
index 0000000..88edbd1
--- /dev/null
+++ b/pages/supplierDeliver/coms/recordListPopup.vue
@@ -0,0 +1,46 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<comRecordCard :dataContent="item" @click='selectItem(item)'></comRecordCard>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comRecordCard from '@/pages/supplierDeliver/coms/comRecordCard.vue'
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comRecordCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/supplierDeliver/coms/recordtDetailInfoPopup.vue b/pages/supplierDeliver/coms/recordtDetailInfoPopup.vue
new file mode 100644
index 0000000..7a5ba51
--- /dev/null
+++ b/pages/supplierDeliver/coms/recordtDetailInfoPopup.vue
@@ -0,0 +1,99 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">标包数量 : </text>
+							<text class="text_wrap">{{dataContent.stdPackQty}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">标包单位 : </text>
+							<text class="text_wrap">{{dataContent.stdPackUnit}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">供应商计量数量 : </text>
+							<text class="text_wrap">{{dataContent.supplierQty}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">供应商计量单位 : </text>
+							<text class="text_wrap">{{dataContent.supplierUom}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">转换率 : </text>
+							<text class="text_wrap">{{dataContent.convertRate}} </text>
+						</view>
+
+					</view>
+				</view>
+				<u-line></u-line>
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.poNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.poLine}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">项目代码 : </text>
+							<text class="text_wrap">{{dataContent.projectCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到货日期 : </text>
+							<text class="text_wrap">{{dataContent.arriveDate}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">生产日期 : </text>
+							<text class="text_wrap">{{dataContent.produceDate}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">过期日期 : </text>
+							<text class="text_wrap">{{dataContent.expireDate}} </text>
+						</view>
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/supplierDeliver/record/supplierDeliverRecord.vue b/pages/supplierDeliver/record/supplierDeliverRecord.vue
new file mode 100644
index 0000000..16313ac
--- /dev/null
+++ b/pages/supplierDeliver/record/supplierDeliverRecord.vue
@@ -0,0 +1,248 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="recordList.length==0"></com-empty-view>
+		<record-filter ref="filter" @switchChangeToday="switchChangeToday" @onScanNumber="getScanNumber"
+			 :checkedToday="checkedToday">
+		</record-filter>
+		<view v-if="recordList.length>0">
+
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in recordList" :key="index">
+					<uni-swipe-action-item :right-options="detailOptions" @click="swipeClick($event,item)">
+						<comRecordCard :dataContent="item" @click='openJobDetail(item)'></comRecordCard>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<uni-load-more :status="loadingType" v-if="recordList.length>0" />
+			<recordInfoPopup ref='recordInfoPopup'></recordInfoPopup>
+			<recordListPopup ref="recordListPopup" @selectedItem="selectedItem"></recordListPopup>
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getSupplierDeliverRecordList,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		getCurrDate,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import recordFilter from '@/mycomponents/record/recordFilter.vue'
+
+	import comRecordCard from '@/pages/supplierDeliver/coms/comRecordCard.vue'
+	import recordListPopup from '@/pages/supplierDeliver/coms/recordListPopup.vue'
+	import recordInfoPopup from '@/pages/supplierDeliver/coms/recordInfoPopup.vue'
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			recordFilter,
+			comRecordCard,
+			recordInfoPopup,
+			recordListPopup,
+		},
+		data() {
+			return {
+				recordList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				todayTime: "",
+				detailOptions: [],
+				detailGiveupOptions: [],
+				currentItem: {}
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.recordList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+
+				getSupplierDeliverRecordList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.recordList = type === "refresh" ? list : this.recordList.concat(list);
+					this.pageNo++;
+					updateTitle("供应商发货记录(" + this.totalCount + ")");
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("供应商发货记录");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+
+				})
+			},
+
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './supplierDeliverRecordDetail?id=' + item.id
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.recordListPopup.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openrecordInfoPopup(dataContent);
+				}
+			},
+
+			openrecordInfoPopup(item) {
+				this.$refs.recordInfoPopup.openPopup(item)
+			},
+			
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getSupplierDeliverRecordList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					} else {
+						if (type == "asnNumber") {
+							that.showItemList(res.data.list);
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue b/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
new file mode 100644
index 0000000..6e5a72e
--- /dev/null
+++ b/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
@@ -0,0 +1,247 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class=""
+					style="padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx;">
+					<view class="" style="font-size: 35rpx;">
+						发货单号 :{{dataContent.asnNumber}}
+					</view>
+					<view class="" style="font-size: 35rpx;">
+						供应商代码 :{{dataContent.supplierCode}}
+					</view>
+				</view>
+				<u-line />
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comRecordDetailCard :dataContent="item" :index="index"
+							@remove="updateData" @updateData="updateData" @openDetail="openDetail">
+						</comRecordDetailCard>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+				</view>
+			</view>
+		</view>
+
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult'></win-scan-pack>
+		<recordDetailInfoPopup ref="recordDetailPopup"></recordDetailInfoPopup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getSupplierDeliverRecordDetail,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		getCurrDateTime,
+		getPackingNumberAndBatch,
+		getDirectoryItemArray,
+	} from '@/common/basic.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty
+	} from '@/common/detail.js';
+
+
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comRecordDetailCard from '@/pages/supplierDeliver/coms/comRecordDetailCard.vue'
+	import recordDetailInfoPopup from '@/pages/supplierDeliver/coms/recordDetailInfoPopup.vue'
+
+	export default {
+		name: 'receipt_detail',
+		components: {
+			winScanPack,
+			comRecordDetailCard,
+			requiredLocation,
+			recordDetailInfoPopup
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				received: false,
+				scanCount: 0,
+				dataContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				toLocationCode: '',
+				toLocationInfo: {},
+				businessTypeInfo: {},
+				managementList: []
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			this.getDetail();
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		mounted() {
+
+		},
+		methods: {
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getSupplierDeliverRecordDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.dataContent = res.data;
+							that.subList = res.data.subList;
+							that.subList.forEach(res => {
+								res.packingNumber = res.toPackingNumber
+								res.batch = res.fromBatch
+							})
+							that.detailSource = getDataSource(that.subList)
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch);
+						if (itemDetail == undefined) {
+							this.showMessage("箱码【" + packingNumber + "】、批次【" + batch + "】不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showMessage("箱码【" + packingNumber + "】已经扫描")
+							} else {
+								itemDetail.scaned = true;
+								calcHandleQty(this.detailSource);
+							}
+						}
+					}
+
+				} catch (e) {
+					this.showErrorMessage(e.message)
+				}
+			},
+
+			getScanCount(closeScan) {
+				let items = this.subList.filter(r => {
+					if (r.scaned) {
+						return r;
+					}
+				})
+				let scanCount = items != null ? items.length : 0;
+				return scanCount;
+			},
+
+			updateData() {
+				calcHandleQty(this.detailSource);
+			},
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {}
+					});
+				})
+			},
+
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+
+			openDetail(item) {
+				this.$refs.recordDetailPopup.openPopup(item)
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/transfer/coms/comReceiptDetailCard.vue b/pages/transfer/coms/comReceiptDetailCard.vue
new file mode 100644
index 0000000..3ffa47a
--- /dev/null
+++ b/pages/transfer/coms/comReceiptDetailCard.vue
@@ -0,0 +1,146 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty" :showBalanceQty ="false"></item-qty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend :detail="item"  :isShowFromLocation="false" :isShowToLocation="true">
+							</recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<u-line color="#D8D8D8"></u-line>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam"
+			 @confirm="confirm">
+		</recommend-qty-edit>
+		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
+			:locationTypeList="locationTypeList"></win-scan-location>
+		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import detailInfoPopup from '@/pages/unPlanned/coms/detailInfoPopup.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+
+	import {
+		getDetailOption,
+		getPurchaseReceiptOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			recommendQtyEdit,
+			detailInfoPopup,
+			winScanLocation
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: false
+			},
+			locationTypeList: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty,this.settingParam.allowModifyLocation)
+			}
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				}  else if (e.content.text == "库位") {
+					this.showLocation(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+					this.editItem = item;
+					this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty,item.labelQty);
+				},
+				showLocation(item) {
+					this.locatonItem =item;
+					this.$refs.scanLocationCode.openScanPopup();
+				},
+				//扫描源库位
+				getLocation(location, code) {
+					this.locatonItem.toLocationCode =code;
+					this.$emit('updateData')
+				},
+			
+				detail(item) {
+					this.showItem = item;
+					this.$refs.detailInfoPopup.openPopup(item)
+				},
+				remove(item) {
+					this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+						res => {
+							if (res) {
+								item.scaned = false
+								item.handleQty = null
+								this.$forceUpdate()
+								this.$emit('remove', item)
+							}
+						});
+				},
+				confirm(qty) {
+					this.editItem.handleQty = qty;
+					this.$emit('updateData')
+				}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/transfer/coms/comTransferJobCard.vue b/pages/transfer/coms/comTransferJobCard.vue
new file mode 100644
index 0000000..98946e3
--- /dev/null
+++ b/pages/transfer/coms/comTransferJobCard.vue
@@ -0,0 +1,38 @@
+<template>
+ 	<job-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				<view class="">
+ 					申请单号 : {{dataContent.requestNumber}}
+ 				</view>
+ 			</view>
+ 		</view>
+ 	</job-com-main-card>
+ </template>
+
+ <script>
+ 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			jobComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/transfer/coms/comTransferRecord.vue b/pages/transfer/coms/comTransferRecord.vue
new file mode 100644
index 0000000..cf58ebc
--- /dev/null
+++ b/pages/transfer/coms/comTransferRecord.vue
@@ -0,0 +1,487 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="fromLocationCode==''"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="fromLocationCode!=''">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :isShowLocation="true"
+								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
+							:locationTypeList="tolocationTypeList"></requiredLocation>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+	</view>
+
+</template>
+
+<script>
+	import {
+		transferIssueRecordSubmit,
+		transferReceiptRecordSubmit
+	} from '@/api/request2.js';
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+
+	import {
+		goHome,
+		deepCopyData,
+		getPackingNumberAndBatchByList
+	} from '@/common/basic.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		props: {
+			transferType: {
+				type: String,
+				default: ""
+			},
+		},
+		data() {
+			return {
+				id: '',
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				fromLocationCode: "",
+				toLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				managementList: [],
+				dataContent: {},
+				toWarehouseCode: ''
+
+			};
+		},
+		mounted(option) {
+			var typeCode = ""
+			if (this.transferType == "TransferDeliver") {
+				typeCode = "TransferDeliver"
+			} else if (this.transferType == "TransferReceipt") {
+				typeCode = "TransferReceipt"
+			}
+
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					newDetail.inventoryStatus = "OK"
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.$forceUpdate();
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+
+			},
+
+			commit() {
+
+				if (this.toLocationCode == "") {
+					this.showMessage("请先选择目标库位")
+					return;
+				}
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					this.managementList = [];
+					var precisionStrategParams = this.setPrecisionStrategParams()
+
+					getPrecisionStrategyList(precisionStrategParams, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							var params = this.setParams()
+							console.log("提交" + JSON.stringify(params))
+							if (this.transferType == "TransferDeliver") {
+								transferIssueRecordSubmit(params).then(res => {
+									uni.hideLoading()
+									if (res.data) {
+										this.showCommitSuccessMessage("提交成功<br>生成调拨出库记录<br>" + res.data)
+									} else {
+										this.showErrorMessage("提交失败[" + res.msg + "]")
+									}
+								}).catch(error => {
+									uni.hideLoading()
+									this.showErrorMessage(error)
+								})
+							} else if (this.transferType == "TransferReceipt") {
+								transferReceiptRecordSubmit(params).then(res => {
+									uni.hideLoading()
+									if (res.data) {
+										this.showCommitSuccessMessage("提交成功<br>生成调拨入库记录<br>" + res.data)
+									} else {
+										this.showErrorMessage("提交失败[" + res.msg + "]")
+									}
+								}).catch(error => {
+									uni.hideLoading()
+									this.showErrorMessage(error)
+								})
+							}
+
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+
+					})
+
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+
+
+			},
+
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.toLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setParams() {
+
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var submitItem = deepCopyData(detail)
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+
+							submitItem.inventoryStatus = detail.inventoryStatus;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.toPackingNumber = info.packingNumber;
+
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+
+							submitItem.fromBatch = info.batch;
+							submitItem.toBatch = info.batch;
+
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+							
+							submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
+							submitItem.package ="";
+							
+							subList.push(submitItem)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.fromWarehouseCode = this.detailSource[0].subList[0].warehouseCode;
+				this.dataContent.toWarehouseCode = this.toWarehouseCode;
+				return this.dataContent;
+			},
+
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				this.toWarehouseCode = location.warehouseCode
+				// if (this.fromLocationCode == code) {
+				// 	uni.showToast({
+				// 		title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+				// 		duration: 2000
+				// 	})
+				// 	return
+				// }
+				this.toLocationCode = code;
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						detail.toLocationCode = code
+					})
+				})
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
+			},
+			clearData(){
+				this.fromLocationCode = '';
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+				this.toWarehouseCode = ""
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/transfer/coms/detailInfoPopup.vue b/pages/transfer/coms/detailInfoPopup.vue
new file mode 100644
index 0000000..4b64c50
--- /dev/null
+++ b/pages/transfer/coms/detailInfoPopup.vue
@@ -0,0 +1,57 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<!-- <view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">生产线代码 : </text>
+							<text class="text_wrap">{{dataContent.ProductionLineCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">工位代码 : </text>
+							<text class="text_wrap">{{dataContent.WorkStationCode}} </text>
+						</view>
+					</view> -->
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/transfer/coms/jobInfoPopup.vue b/pages/transfer/coms/jobInfoPopup.vue
new file mode 100644
index 0000000..ae2a0e9
--- /dev/null
+++ b/pages/transfer/coms/jobInfoPopup.vue
@@ -0,0 +1,62 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">承运商 : </text>
+							<text class="text_wrap">{{dataContent.carrierCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">运输方式 : </text>
+							<text class="text_wrap">{{dataContent.transferMode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">车牌号 : </text>
+							<text class="text_wrap">{{dataContent.vehiclePlateNumber}} </text>
+						</view>
+					</view>
+				</view>
+				<u-line></u-line>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/transfer/coms/jobListPopup.vue b/pages/transfer/coms/jobListPopup.vue
new file mode 100644
index 0000000..4301be0
--- /dev/null
+++ b/pages/transfer/coms/jobListPopup.vue
@@ -0,0 +1,47 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-transfer-job-card :dataContent="item" @click='selectItem(item)'></com-transfer-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	import comTransferJobCard from '@/pages/transfer/coms/comTransferJobCard.vue'
+	
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comTransferJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/transfer/job/issueDetail.vue b/pages/transfer/job/issueDetail.vue
new file mode 100644
index 0000000..3f9598d
--- /dev/null
+++ b/pages/transfer/job/issueDetail.vue
@@ -0,0 +1,525 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+		</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<com-detail-card :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
+							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
+							:locationTypeList='tolocationTypeList'>
+						</com-detail-card>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+	import {
+		getTransferIssueJobDetail,
+		getBasicLocationByCode,
+		takeTransferIssueJob,
+		cancleTakeTransferIssueJob,
+		transferIssueJobSubmit
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		navigateBack,
+		getPackingNumberAndBatch,
+		getInventoryStatusName,
+		getDirectoryItemArray
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+	
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import detailInfoPopup from '@/pages/transfer/coms/detailInfoPopup.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	
+	export default {
+		name: 'returnDetail',
+		components: {
+			winScanButton,
+			requiredLocation,
+			winScanPackAndLocation,
+			comDetailCard,
+			detailInfoPopup,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				toLocationCode: "",
+				businessTypeInfo: {},
+				managementList: [],
+				tolocationTypeList:[],
+				jobStatus:""
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				// 	//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务	
+					cancleTakeTransferIssueJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				if (this.id != null) {
+					takeTransferIssueJob(this.id).then(res => {
+						uni.hideLoading();
+						callback();
+					}).catch(error => {
+						uni.hideLoading();
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getTransferIssueJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status
+							that.subList =res.data.subList
+							that.detailSource = getDataSource(that.subList)
+							that.fromLocationCode = that.subList[0].fromLocationCode
+							that.toLocationCode = that.subList[0].toLocationCode
+							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.continueScan()
+				this.$forceUpdate();
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			openDetail(item) {
+				this.$refs.detailInfoPopup.openPopup(item)
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch && r.fromLocationCode == result.fromLocationCode
+						})
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描")
+							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续出库?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty =Number(result.balance.qty) ;
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty) ;
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+									
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.handleQty =  Number(result.balance.qty) ;
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus
+									itemDetail.balance = result.balance;
+									itemDetail.balance.balanceQty =  Number(result.balance.qty) ;
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+					this.scanPopupGetFocus();
+				} catch (e) {
+					this.showErrorMessage(e.message);
+				}
+			},
+
+			 commit() {
+				 this.scanCount = getScanCount(this.subList);
+				 if (this.scanCount == 0) {
+				 	this.showErrorMessage("扫描数为0,请先扫描")
+				 	return;
+				 }
+				 //校验库位、
+				 if (!this.checkLocation()) {
+				 	return
+				 }
+				 
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this
+							.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+
+			 submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+
+				//获取管理模式，封装参数
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams()
+						console.log("提交参数", JSON.stringify(params));
+				
+						transferIssueJobSubmit(params).then(res => {
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成调拨出库记录" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+							uni.hideLoading()
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+			},
+			
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+			
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toContainerNumber = '';
+							detail.toLocationCode = this.toLocationCode;
+							detail.toBatch = info.batch;
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+			
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.showMessageHint('请扫描收货库位', callback => {
+						this.$refs.comScanLocation.showLocation();
+					})
+			
+					return isPass = false;
+				}
+				return isPass;
+			},
+			
+			showMessageHint(hint, callback) {
+				this.$refs.comMessage.showErrorMessage(hint, res => {
+					if (res) {
+						callback()
+					}
+				});
+			},
+			
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/transfer/job/issueJob.vue b/pages/transfer/job/issueJob.vue
new file mode 100644
index 0000000..674c191
--- /dev/null
+++ b/pages/transfer/job/issueJob.vue
@@ -0,0 +1,287 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-transfer-job-card :dataContent="item" @click='openJobDetail(item)'></com-transfer-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+			
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	
+	import {
+		cancleTakeTransferIssueJob,
+		getTransferIssueJobList,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+
+	import comTransferJobCard from '@/pages/transfer/coms/comTransferJobCard.vue'
+	import jobListPopup from '@/pages/transfer/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/transfer/coms/jobInfoPopup.vue'
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comTransferJobCard,
+			jobListPopup,
+			jobInfoPopup
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+		
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+				
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getTransferIssueJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("调拨出库任务(" + this.totalCount + ")");
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("调拨出库任务");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './issueDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.jobListPopup.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeTransferIssueJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getTransferIssueJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/transfer/job/receiptDetail.vue b/pages/transfer/job/receiptDetail.vue
new file mode 100644
index 0000000..72635b7
--- /dev/null
+++ b/pages/transfer/job/receiptDetail.vue
@@ -0,0 +1,563 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+			<view class="header_item">
+				来源仓库 : {{jobContent.fromWarehouseCode}}
+			</view>
+			<u-line color="#D8D8D8"></u-line>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
+							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+						</com-receipt-detail-card>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						:locationTypeList="toLocationTypeList"></requiredLocation>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult'></win-scan-pack>
+		<!-- <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> -->
+		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getTransferReceiptJobDetail,
+		getBasicLocationByCode,
+		cancleTakeTransferReceiptJob,
+		takeTransferReceiptJob,
+		transferReceiptJobSubmit
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		navigateBack,
+		getPackingNumberAndBatch,
+		getInventoryStatusName,
+		getDirectoryItemArray,
+		compareAsc
+	} from '@/common/basic.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import winScanPack from "@/mycomponents/scan/winScanPack.vue"
+	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import detailInfoPopup from '@/pages/transfer/coms/detailInfoPopup.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import comReceiptDetailCard from '@/pages/transfer/coms/comReceiptDetailCard.vue'
+
+	export default {
+		name: 'returnDetail',
+		components: {
+			winScanButton,
+			requiredLocation,
+			winScanPack,
+			comDetailCard,
+			detailInfoPopup,
+			jobTop,
+			comReceiptDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				toLocationCode: "",
+				businessTypeInfo: {},
+				managementList: [],
+				toLocationTypeList: [],
+				jobStatus:""
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				// 	//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务	
+					cancleTakeTransferReceiptJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				if (this.id != null) {
+					takeTransferReceiptJob(this.id).then(res => {
+						uni.hideLoading();
+						callback();
+					}).catch(error => {
+						uni.hideLoading();
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getTransferReceiptJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status
+							that.subList = res.data.subList;
+							that.detailSource = getDataSource(that.subList)
+							that.fromLocationCode = that.subList[0].fromLocationCode
+							that.toLocationCode = that.subList[0].toLocationCode
+							that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.continueScan()
+				this.$forceUpdate();
+			},
+
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			openDetail(item) {
+				this.$refs.detailInfoPopup.openPopup(item)
+			},
+
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch);
+						if (itemDetail == undefined) {
+							this.showMessage("箱码【" + packingNumber + "】、批次【" + batch + "】不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showMessage("箱码【" + packingNumber + "】已经扫描")
+							} else {
+								itemDetail.scaned = true;
+								this.detailSource[0].subList.sort(compareAsc('scaned')); //按扫描信息排序
+								itemDetail.handleQty = Number(result.label.qty);
+								itemDetail.toLocationCode = this.toLocationCode;
+								itemDetail.stdPackQty = result.package.stdPackQty
+								itemDetail.labelQty = Number(result.label.qty);
+								calcHandleQty(this.detailSource);
+								this.continueScan()
+							}
+						}
+					}
+
+				} catch (e) {
+					this.showErrorMessage(e.message)
+				}
+			},
+
+			getScanResult1(result) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch
+						})
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showMessage("箱码【" + packingNumber + "】已经扫描")
+							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,是否继续入库?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty);
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty);
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									} else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+
+
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.handleQty = Number(result.balance.qty);
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus
+									itemDetail.balance = result.balance;
+									itemDetail.balance.balanceQty = Number(result.balance.qty);
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+					this.scanPopupGetFocus();
+				} catch (e) {
+					this.showErrorMessage(e.message);
+				}
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//校验库位、
+				if (!this.checkLocation()) {
+					return
+				}
+
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this
+							.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+
+			},
+
+			submitJob() {
+
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+
+				var param = {
+					itemCode: itemCodes,
+					locationCode: this.toLocationCode
+				}
+
+				//获取管理模式，封装参数
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams()
+						console.log("提交参数", JSON.stringify(params));
+						transferReceiptJobSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成调拨入库记录<br>" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+
+			},
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toContainerNumber = '';
+							detail.toLocationCode = this.toLocationCode;
+							detail.toBatch = info.batch;
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.showMessageHint('请扫描收货库位', callback => {
+						this.$refs.comScanLocation.showLocation();
+					})
+
+					return isPass = false;
+				}
+				return isPass;
+			},
+
+			showMessageHint(hint, callback) {
+				this.$refs.comMessage.showErrorMessage(hint, res => {
+					if (res) {
+						callback()
+					}
+				});
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.getfocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.loseFocus();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/transfer/job/receiptJob.vue b/pages/transfer/job/receiptJob.vue
new file mode 100644
index 0000000..87c65a8
--- /dev/null
+++ b/pages/transfer/job/receiptJob.vue
@@ -0,0 +1,286 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-transfer-job-card :dataContent="item" @click='openJobDetail(item)'></com-transfer-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+
+			<uni-load-more :status="loadingType" />
+			
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	
+	import {
+		cancleTakeTransferReceiptJob,
+		getTransferReceiptJobList
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+
+	import comTransferJobCard from '@/pages/transfer/coms/comTransferJobCard.vue'
+	import jobListPopup from '@/pages/transfer/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/transfer/coms/jobInfoPopup.vue'
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comTransferJobCard,
+			jobListPopup,
+			jobInfoPopup
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+		
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+				
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getTransferReceiptJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("调拨入库任务(" + this.totalCount + ")");
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					
+					this.loadingType = "";
+					updateTitle("调拨入库任务");
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './receiptDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.jobListPopup.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeTransferReceiptJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getTransferReceiptJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/transfer/job/transferDetail.vue b/pages/transfer/job/transferDetail.vue
new file mode 100644
index 0000000..982bef9
--- /dev/null
+++ b/pages/transfer/job/transferDetail.vue
@@ -0,0 +1,584 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+			<u-line color="#D8D8D8"></u-line>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comInventoryDetailCard :dataContent="item" :settingParam="jobContent" @remove="updateData"
+							@updateData='updateData'>
+						</comInventoryDetailCard>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		takePurchasereturnJob,
+		cancleTakeTransferReceiptJob,
+		submitPurchaseReturnJob,
+		getInventoryMoveJobDetail,
+	} from '@/api/request.js';
+	import {
+		getBasicLocationByCode
+	} from '@/api/request2.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+	import {
+		goHome,
+		getCurrDateTime,
+		navigateBack,
+		getPackingNumberAndBatch,
+		getInventoryStatusName
+	} from '@/common/basic.js';
+	import {
+		getDetailOption,
+		getDetailRemoveOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comInventoryDetailCard from '@/pages/inventoryMove/coms/comInventoryDetailCard.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+
+	export default {
+		name: 'returnDetail',
+		components: {
+			winScanButton,
+			winScanPack,
+			comInventoryDetailCard,
+			requiredLocation,
+			winScanPackAndLocation,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				received: false,
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				toLocationInfo: {},
+				businessTypeInfo: {},
+				locationTypeList: [],
+				managementList: [],
+
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			// if (this.id != undefined) {
+			// 	//新建的任务自动接收
+			// 	if (option.status == "JOB_PENDING") {
+			// 		this.receive((callback => {
+			// 			this.received = true;
+			// 			this.getDetail();
+			// 		}));
+			// 	} else {
+			this.getDetail();
+			// 	}
+			// }
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.received) {
+					//取消承接任务	
+					cancleTakeTransferReceiptJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				if (this.id != null) {
+					takePurchasereturnJob(this.id).then(res => {
+						uni.hideLoading();
+						callback();
+					}).catch(error => {
+						uni.hideLoading();
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getInventoryMoveJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data[0].subList.length > 0) {
+						that.jobContent = res.data[0];
+						that.subList = res.data[0].subList;
+						that.detailSource = that.getDataSource(that.subList)
+					} else {
+						that.showMessage('列表数据为0');
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+			getDataSource(subList) {
+				let items = [];
+				subList.forEach(detail => {
+					var item = items.find(r =>
+						r.itemCode == detail.itemCode)
+					if (item == undefined) {
+						item = this.createItemInfo(detail);
+						let newDetail = this.createDetailInfo(detail); //
+						item.subList.push(newDetail);
+						items.push(item)
+					} else {
+						item.qty = calc.add(item.qty,detail.qty)
+						let newDetail = this.createDetailInfo(detail); //
+						item.subList.push(newDetail);
+					}
+				})
+				return items;
+			},
+
+			createItemInfo(res) {
+				let item = {
+					itemCode: res.itemCode,
+					itemName: res.itemName,
+					stdPackQty: res.stdPackQty,
+					stdPackUnit: res.stdPackUnit,
+					qty: res.qty,
+					handleQty: 0,
+					uom: res.uom,
+					subList: []
+				}
+				return item;
+			},
+
+			createDetailInfo(data) {
+				data.scaned = false;
+				// data.record = {};
+
+				let detail = data;
+				detail.handleQty = 0,
+					return detail;
+			},
+
+			calcScanCount(closeScan) {
+				let items = this.subList.filter(r => {
+					if (r.scaned) {
+						return r;
+					}
+				})
+				this.scanCount = items != null ? items.length : 0;
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				}
+			},
+
+			calcHandleQty() {
+				for (let item of this.detailSource) {
+					item.handleQty = new Decimal(0).toNumber();
+					for (let detail of item.subList) {
+						if (detail.record != undefined) {
+							item.handleQty = calc.add(item.handleQty,detail.record.qty)
+						}
+						
+					}
+				}
+				this.continueScan()
+				this.$forceUpdate();
+			},
+
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = this.getScanCount();
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+			getScanCount(closeScan) {
+				let items = this.subList.filter(r => {
+					if (r.scaned) {
+						return r;
+					}
+				})
+				let scanCount = items != null ? items.length : 0;
+				return scanCount;
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch
+						})
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showMessage("箱码【" + packingNumber + "】已经扫描")
+							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+										this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续上架?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.record = this.createRecordInfo(itemDetail, result
+														.balance);
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									} else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.record = this.createRecordInfo(itemDetail, result.balance);
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+					this.scanPopupGetFocus();
+				} catch (e) {
+					this.showErrorMessage(e.message);
+				}
+			},
+
+			createRecordInfo(detail, balance) {
+				var record = {}
+				detail.scaned = true;
+				detail.balance = balance;
+				detail.RecommendInventoryStatus = detail.inventoryStatus;
+				detail.inventoryStatus = balance.inventoryStatus;
+				// let record = JSON.parse(JSON.stringify(detail));
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				Object.assign(record, detail)
+				record.qty = Number(balance.qty);
+				return record;
+			},
+
+			async commit() {
+				//允许部分提交
+				if (this.jobContent.allowPartialComplete == "TRUE") {
+					this.submitJob();
+				} else {
+					this.scanCount = this.getScanCount();
+					if (this.scanCount < this.subList.length) {
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this
+							.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					} else {
+						this.submitJob();
+					}
+				}
+			},
+
+			async submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+
+				var param = {
+					itemCode: itemCodes,
+					locationCode: this.toLocationCode
+				}
+				// this.managementList = await getManagementPrecisions(param);
+
+				var params = this.setParams();
+				console.log("提交" + JSON.stringify(params))
+				submitPurchaseReturnJob(this.id, params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						var hint = res.data.Number;
+						this.showCommitSuccessMessage("提交成功" + hint, )
+
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+
+			setParams() {
+				var params = {
+					requestNumber: this.jobContent.requestNumber,
+					jobNumber: '',
+					asnNumber: this.jobContent.asnNumber,
+					ppNumber: this.jobContent.ppNumber,
+					supplierCode: this.jobContent.supplierCode,
+					carrierCode: this.jobContent.carrierCode,
+					transferMode: this.jobContent.transferMode,
+					vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
+					fromWarehouseCode: this.jobContent.fromWarehouseCode,
+					fromLocationTypes: this.jobContent.fromLocationTypes,
+					fromAreaCodes: this.jobContent.fromAreaCodes,
+					toWarehouseCode: this.jobContent.toWarehouseCode,
+					toLocationTypes: this.jobContent.toLocationTypes,
+					status: this.jobContent.status,
+					toAreaCodes: this.jobContent.toAreaCodes,
+					executeTime: getCurrDateTime(),
+					activeDate: getCurrDateTime(),
+					available: 1, //是否可用 0不可用,1可用
+					requestTime: this.jobContent.requestTime,
+					dueTime: getCurrDateTime(),
+					expiredTime: this.jobContent.expiredTime,
+					departmentCode: this.jobContent.departmentCode,
+					interfaceType: "jklxPURCHASE_RETURN", //接口类型
+					Number: this.jobContent.Number,
+					businessType: this.jobContent.businessType,
+					remark: this.jobContent.remark,
+					creationTime: this.jobContent.creationTime,
+					creatorId: this.jobContent.creatorId,
+					creatorName: this.jobContent.creatorName,
+					extraProperties: this.jobContent.extraProperties,
+					siteId: this.jobContent.siteId,
+					Code: "",
+					subList: [],
+
+				}
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.record.fromPackingNumber = detail.record.packingNumber
+							detail.record.toPackingNumber = detail.record.packingNumber
+							detail.record.fromBatch = detail.record.batch
+							detail.record.ToBatch = detail.record.batch;
+							detail.record.FromContainerNumber = detail.record.ContainerNumber
+							detail.record.ToContainerNumber = ""
+							detail.record.FromLocationGroupCode = ""
+							detail.record.FromAreaCode = ""
+							detail.record.ToLocationGroupCode = "";
+							detail.record.ToAreaCode = "";
+							detail.record.VisualInspectResult = "",
+								detail.record.VisualInspectPhotos = "",
+								detail.record.FailedReason = ""
+							detail.record.SinglePrice = "",
+								detail.record.Amount = "",
+								detail.record.JobDetailID = detail.record.id,
+								detail.record.masterID = this.jobContent.id,
+								detail.record.projectCode = "",
+								detail.record.Code = ""
+							detail.record.interfaceType = "jklxPURCHASE_RETURN"
+							params.subList.push(detail.record)
+						}
+					})
+				})
+
+				return params;
+			},
+
+			getLocationInfo(locationCode) {
+				getBasicLocationByCode(locationCode).then(res => {
+					if (res.data.list.length > 0) {
+						this.toLocationInfo = res.data.list[0]
+					}
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			/**
+			 * BlobUrl转blob数据  
+			 * @param {Object} url blob URL
+			 * @param {Object} callback 回调函数
+			 */
+			objectURLToBlob(url, callback) {
+				const http = new XMLHttpRequest();
+				http.open("GET", url, true);
+				http.responseType = "blob";
+				http.onload = function(e) {
+					if (this.status == 200 || this.status === 0) {
+						callback(this.response);
+					}
+				};
+				http.send();
+			},
+
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/pages/transfer/job/transferJob.vue b/pages/transfer/job/transferJob.vue
new file mode 100644
index 0000000..05d185a
--- /dev/null
+++ b/pages/transfer/job/transferJob.vue
@@ -0,0 +1,315 @@
+<template>
+	<view class="">
+		<job-filter ref="filter" button1Title="ASN" button2Title="任务编号" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @OnButton1Click="scanAsN" @OnButton2Click="scanAppro"
+			:checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		
+		<com-empty-view v-if="receiptList.length==0"></com-empty-view>
+
+		<uni-swipe-action ref="swipeAction">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<uni-swipe-action-item
+					:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+					@click="swipeClick($event,item)">
+					<comInventoryJobCard :dataContent="item" @click='openJobDetail(item)'></comInventoryJobCard>
+				</uni-swipe-action-item>
+			</view>
+		</uni-swipe-action>
+
+		<uni-load-more :status="loadingType" v-if="receiptList.length>0" />
+		<win-scan-asn-number ref="scanAsnNumber" title="ASN" @getScanCode='getByAsnNumber'></win-scan-asn-number>
+		<win-scan-job-number ref="scanNumber" title="任务编号" @getScanCode='getByNumber'></win-scan-job-number>
+		<job-info-popup ref='jobInfoPopup'></job-info-popup>
+		 
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getInventoryMoveJobList,
+		getPurchasereceiptByAsnNumber,
+		getPurchaseReceiptJobByNumber,
+		cancelTakeReceiptJob
+	} from '@/api/request.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+
+	import winScanJobNumber from "@/mycomponents/scan/winScanJobNumber.vue"
+	import winScanAsnNumber from "@/mycomponents/scan/winScanAsnNumber.vue"
+	import jobInfoPopup from '@/mycomponents/job/jobInfoPopup.vue'
+
+	import comInventoryJobCard from '@/pages/inventoryMove/coms/comInventoryJobCard.vue'
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comInventoryJobCard,
+			winScanJobNumber,
+			winScanAsnNumber,
+			jobInfoPopup,
+		},
+		data() {
+			return {
+				receiptList: [],
+				contentText: {
+					contentdown: '上拉加载更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				pageSize: 5,
+				pageIndex: 1,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				status: ['JOB_PENDING', '1'],
+				creationTimeStart: "",
+				creationTimeEnd: "",
+				detailOptions: [],
+				detailGiveupOptions: []
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			updateTitle() {
+				var title = ""
+				if (this.totalCount > 0) {
+					title = ;
+				} else {
+					title = "库存转移"
+				}
+				uni.setNavigationBarTitle({
+					title: title
+				})
+			},
+
+			getList() {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				var params = {
+					status: this.status,
+					CreationTimeStart: this.creationTimeStart,
+					CreationTimeEnd: this.creationTimeEnd
+				}
+				getInventoryMoveJobList(params).then(res => {
+					uni.hideLoading();
+					var list = res.data;
+					this.totalCount = res.data.length;
+					that.receiptList = list
+					updateTitle("库存转移(" + this.totalCount + ")");
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			getByAsnNumber(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getPurchasereceiptByAsnNumber(code).then(res => {
+					uni.hideLoading();
+					if (res.data.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.length == 1) {
+						this.$refs.scanAsnNumber.closeScanPopup();
+						that.openJobDetail(res.data[0]);
+					} else {
+						this.$refs.scanAsnNumber.closeScanPopup();
+						that.showItemList(res.data);
+					}
+
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			getByNumber(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getPurchaseReceiptJobByNumber(code).then(res => {
+					uni.hideLoading();
+					if (res.data.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.length == 1) {
+						this.$refs.scanNumber.closeScanPopup();
+						that.openJobDetail(res.data[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './inventoryMoveDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				// this.$refs.comReceiptJobList.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								var id = dataContent.id
+								this.cancleJob(id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				let dataList = [{
+						title: "申请单号",
+						content: item.requestNumber
+					},
+					{
+						title: "要货计划单号",
+						content: item.ppNumber
+					},
+					{
+						title: "供应商代码",
+						content: item.supplierCode
+					},
+					{
+						title: "允许修改库位",
+						content: item.allowModifyLocation == 1 ? "是" : "否"
+					},
+					{
+						title: "允许修改数量",
+						content: item.allowModifyQty == 1 ? "是" : "否"
+					},
+					{
+						title: "允许大于推荐数量",
+						content: item.allowBiggerQty == 1 ? "是" : "否"
+					},
+					{
+						title: "允许小于推荐数量",
+						content: item.allowSmallerQty == 1 ? "是" : "否"
+					},
+					{
+						title: "允许修改库存状态",
+						content: item.allowModifyInventoryStatus == 1 ? "是" : "否"
+					},
+					{
+						title: "允许连续扫描",
+						content: item.allowContinuousScanning == 1 ? "是" : "否"
+					},
+					{
+						title: "允许部分完成",
+						content: item.allowPartialComplete == 1 ? "是" : "否"
+					},
+					{
+						title: "允许修改批次",
+						content: item.allowModifyBach == 1 ? "是" : "否"
+					}
+				]
+				this.$refs.jobInfoPopup.openPopup(item, dataList)
+			},
+
+			cancleJob(id) {
+				cancelTakeReceiptJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(res => {
+					this.showMessage(res)
+				})
+			},
+			
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+			
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+		 
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/transfer/record/deliverRecord.vue b/pages/transfer/record/deliverRecord.vue
new file mode 100644
index 0000000..a99a719
--- /dev/null
+++ b/pages/transfer/record/deliverRecord.vue
@@ -0,0 +1,460 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="fromLocationCode==''"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="fromLocationCode!=''">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :isShowLocation="true"
+								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
+							:locationTypeList="tolocationTypeList"></requiredLocation>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+	</view>
+
+</template>
+
+<script>
+	import {
+		transferIssueRecordSubmit
+	} from '@/api/request2.js';
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+
+	import {
+		goHome,
+		deepCopyData,
+		getPackingNumberAndBatchByList
+	} from '@/common/basic.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				fromLocationCode: "",
+				toLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				managementList: [],
+				dataContent: {},
+				toWarehouseCode: ''
+
+			};
+		},
+		onLoad(option) {
+			var typeCode = "TransferDeliver"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					newDetail.inventoryStatus = "OK"
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.$forceUpdate();
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+
+			},
+
+			commit() {
+
+				if (this.toLocationCode == "") {
+					this.showMessage("请先选择目标库位")
+					return;
+				}
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					this.managementList = [];
+					var precisionStrategParams = this.setPrecisionStrategParams()
+
+					getPrecisionStrategyList(precisionStrategParams, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							var params = this.setParams()
+							console.log("提交" + JSON.stringify(params))
+							transferIssueRecordSubmit(params).then(res => {
+								uni.hideLoading()
+								if (res.data) {
+									this.showCommitSuccessMessage("提交成功<br>生成调拨出库记录<br>" + res.data)
+								} else {
+									this.showErrorMessage("提交失败[" + res.msg + "]")
+								}
+							}).catch(error => {
+								uni.hideLoading()
+								this.showErrorMessage(error)
+							})
+
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+
+					})
+
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+
+
+			},
+
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.toLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setParams() {
+
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var submitItem = deepCopyData(detail)
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+
+							submitItem.inventoryStatus = detail.inventoryStatus;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.toPackingNumber = info.packingNumber;
+
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+
+							submitItem.fromBatch = info.batch;
+							submitItem.toBatch = info.batch;
+
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+
+							submitItem.qty = detail.handleQty;
+							submitItem.package = "";
+
+							subList.push(submitItem)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.fromWarehouseCode = this.detailSource[0].subList[0].warehouseCode;
+				this.dataContent.toWarehouseCode = this.toWarehouseCode;
+				return this.dataContent;
+			},
+
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				this.toWarehouseCode = location.warehouseCode
+				// if (this.fromLocationCode == code) {
+				// 	uni.showToast({
+				// 		title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+				// 		duration: 2000
+				// 	})
+				// 	return
+				// }
+				this.toLocationCode = code;
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						detail.toLocationCode = code
+					})
+				})
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
+			},
+			clearData() {
+				this.fromLocationCode = '';
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+				this.toWarehouseCode = ""
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/transfer/record/receiptRecord.vue b/pages/transfer/record/receiptRecord.vue
new file mode 100644
index 0000000..51c6e5a
--- /dev/null
+++ b/pages/transfer/record/receiptRecord.vue
@@ -0,0 +1,438 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='openScanPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :isShowFromLocation="false"
+							:isShowToLocation="false"
+								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
+							:locationTypeList="tolocationTypeList"></requiredLocation>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult'></win-scan-pack>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+
+</template>
+
+<script>
+	import {
+		transferReceiptRecordSubmit
+	} from '@/api/request2.js';
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+
+	import {
+		goHome,
+		deepCopyData,
+		getPackingNumberAndBatchByList
+	} from '@/common/basic.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				toLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				managementList: [],
+				dataContent: {},
+				toWarehouseCode: ''
+
+			};
+		},
+		onLoad(option) {
+			var typeCode = "TransferReceipt"
+
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.openScanPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		methods: {
+			getScanResult(result) {
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == label.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(label, pack);
+					let newDetail = createDetailInfo(label, pack); //
+					newDetail.inventoryStatus = "OK"
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == label.packingNumber &&
+							r.batch == label.batch) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(label, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.$forceUpdate();
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+
+			},
+
+			commit() {
+
+				if (this.toLocationCode == "") {
+					this.showMessage("请先选择目标库位")
+					return;
+				}
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					this.managementList = [];
+					var precisionStrategParams = this.setPrecisionStrategParams()
+
+					getPrecisionStrategyList(precisionStrategParams, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							var params = this.setParams()
+							console.log("提交" + JSON.stringify(params))
+							transferReceiptRecordSubmit(params).then(res => {
+								uni.hideLoading()
+								if (res.data) {
+									this.showCommitSuccessMessage("提交成功<br>生成调拨入库记录<br>" + res.data)
+								} else {
+									this.showErrorMessage("提交失败[" + res.msg + "]")
+								}
+							}).catch(error => {
+								uni.hideLoading()
+								this.showErrorMessage(error)
+							})
+
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+
+					})
+
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+
+
+			},
+
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.toLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setParams() {
+
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var submitItem = deepCopyData(detail)
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+
+							submitItem.inventoryStatus = detail.inventoryStatus;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.toPackingNumber = info.packingNumber;
+
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+
+							submitItem.fromBatch = info.batch;
+							submitItem.toBatch = info.batch;
+
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+
+							submitItem.qty = detail.handleQty;
+							submitItem.package = "";
+
+							subList.push(submitItem)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.fromWarehouseCode = this.detailSource[0].subList[0].warehouseCode;
+				this.dataContent.toWarehouseCode = this.toWarehouseCode;
+				return this.dataContent;
+			},
+
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+
+			},
+			getToLocationCode(location, code) {
+				this.toWarehouseCode = location.warehouseCode
+				// if (this.fromLocationCode == code) {
+				// 	uni.showToast({
+				// 		title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+				// 		duration: 2000
+				// 	})
+				// 	return
+				// }
+				this.toLocationCode = code;
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						detail.toLocationCode = code
+					})
+				})
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
+			},
+			clearData() {
+				this.fromLocationCode = '';
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+				this.toWarehouseCode = ""
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/unPlanned/coms/comBalance.vue b/pages/unPlanned/coms/comBalance.vue
new file mode 100644
index 0000000..45e326f
--- /dev/null
+++ b/pages/unPlanned/coms/comBalance.vue
@@ -0,0 +1,103 @@
+<template>
+	<view :class="dataContent.scaned?'scan_view':''">
+		<view class="uni-flex uni-row space-between uni-inline-item">
+			<view>
+				<pack v-if="isShowPack && dataContent.packingNumber!=''" :packingCode="dataContent.packingNumber">
+				</pack>
+				<batch v-if="isShowBatch" :batch="dataContent.batch"></batch>
+				<location v-if="isShowLocation" :locationCode="dataContent.locationCode"></location>
+			</view>
+			<view>
+				<qty :isShowStatus="dataContent.inventoryStatus==dataContent.toInventoryStatus"
+					v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent"
+					:isShowStdPack="isShowStdPack"  ></qty>
+
+				<compare-qty v-else :dataContent="dataContent" :recommendQty="dataContent.qty"
+					:handleQty="dataContent.record.qty" :isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus">
+				</compare-qty>
+
+			</view>
+		</view>
+		<u-line></u-line>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import qty from '@/mycomponents/qty/qty.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+	import moveStatus from '@/mycomponents/balance/moveStatus.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			qty,
+			recommendQty,
+			compareQty,
+			moveStatus
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowStdPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBusiness: {
+				type: Boolean,
+				default: false
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: false
+			},
+			
+			scaned: {
+				type: Boolean,
+				default: true
+			},
+			fromInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			toInventoryStatus: {
+				type: String,
+				default: ""
+			},
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/unPlanned/coms/comIssueDetailCard.vue b/pages/unPlanned/coms/comIssueDetailCard.vue
new file mode 100644
index 0000000..3564b84
--- /dev/null
+++ b/pages/unPlanned/coms/comIssueDetailCard.vue
@@ -0,0 +1,136 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend :detail="item"  :isShowFromLocation="isShowLocation"></recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<u-line color="#D8D8D8"></u-line>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+
+		<balance-qty-edit ref="qtyEdit" :dataContent="editItem" :allowBiggerQty="settingParam.AllowBiggerQty==1"
+			:allowSmallerQty="settingParam.AllowSmallerQty==1" :handleQty="editItem.record.qty" @confirm="confirm">
+		</balance-qty-edit>
+		
+		<job-detail-popup ref="receiptHint" :dataContent="showItem"></job-detail-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	
+	import {
+		getDetailOption,
+		getDetailRemoveOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			recommendQtyEdit,
+			jobDetailPopup,
+			balanceQtyEdit
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			isShowLocation:{
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				if (this.settingParam.allowModifyQty == 1) {
+					this.scanOptions = getDetailEditRemoveOption();
+				} else {
+					this.scanOptions = getDetailRemoveOption();
+				}
+			}
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.qtyEdit.openEditPopup(item,item.record.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+				
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.record = {}
+							// item.record.qty = 0;
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.record.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/unPlanned/coms/comIssueJobCard.vue b/pages/unPlanned/coms/comIssueJobCard.vue
new file mode 100644
index 0000000..98946e3
--- /dev/null
+++ b/pages/unPlanned/coms/comIssueJobCard.vue
@@ -0,0 +1,38 @@
+<template>
+ 	<job-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				<view class="">
+ 					申请单号 : {{dataContent.requestNumber}}
+ 				</view>
+ 			</view>
+ 		</view>
+ 	</job-com-main-card>
+ </template>
+
+ <script>
+ 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			jobComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/unPlanned/coms/comIssueRequestCard.vue b/pages/unPlanned/coms/comIssueRequestCard.vue
new file mode 100644
index 0000000..3ca67a9
--- /dev/null
+++ b/pages/unPlanned/coms/comIssueRequestCard.vue
@@ -0,0 +1,34 @@
+<template>
+ 	<request-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			从仓库代码 : {{dataContent.fromWarehouseCode}}
+ 		</view>
+ 	</request-com-main-card>
+ </template>
+
+ <script>
+ 	import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			requestComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/unPlanned/coms/comReceiptDetailCard.vue b/pages/unPlanned/coms/comReceiptDetailCard.vue
new file mode 100644
index 0000000..6c50a26
--- /dev/null
+++ b/pages/unPlanned/coms/comReceiptDetailCard.vue
@@ -0,0 +1,147 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty" :showBalanceQty="false">
+					</item-qty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend :detail="item" :isShowFromLocation="false" :isShowToLocation="true">
+							</recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<u-line color="#D8D8D8"></u-line>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
+		</recommend-qty-edit>
+		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
+			:locationTypeList="locationTypeList"></win-scan-location>
+		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import detailInfoPopup from '@/pages/unPlanned/coms/detailInfoPopup.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+
+	import {
+		getDetailOption,
+		getPurchaseReceiptOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			recommendQtyEdit,
+			detailInfoPopup,
+			winScanLocation
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: false
+			},
+			locationTypeList: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, this.settingParam
+					.allowModifyLocation)
+			}
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "库位") {
+					this.showLocation(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty, item.labelQty);
+			},
+			showLocation(item) {
+				this.locatonItem = item;
+				this.$refs.scanLocationCode.openScanPopup();
+			},
+			//扫描源库位
+			getLocation(location, code) {
+				this.locatonItem.toLocationCode = code;
+				this.$emit('updateData')
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.detailInfoPopup.openPopup(item)
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.handleQty = null
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.handleQty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/unPlanned/coms/comReceiptJobCard.vue b/pages/unPlanned/coms/comReceiptJobCard.vue
new file mode 100644
index 0000000..98946e3
--- /dev/null
+++ b/pages/unPlanned/coms/comReceiptJobCard.vue
@@ -0,0 +1,38 @@
+<template>
+ 	<job-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				<view class="">
+ 					申请单号 : {{dataContent.requestNumber}}
+ 				</view>
+ 			</view>
+ 		</view>
+ 	</job-com-main-card>
+ </template>
+
+ <script>
+ 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			jobComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/unPlanned/coms/comReceiptRecord.vue b/pages/unPlanned/coms/comReceiptRecord.vue
new file mode 100644
index 0000000..ca3b418
--- /dev/null
+++ b/pages/unPlanned/coms/comReceiptRecord.vue
@@ -0,0 +1,172 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
+							<item-qty :dataContent="dataContent" :isShowBalanceQty="false"
+								:isShowBalance="true"></item-qty>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item,index)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<balance :dataContent="item" :isShowStdPack="false" :isShowStatus="true" :isShowPack="true"
+								:isShowFromLocation="false" :isShowToLocation="false"></balance>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<!-- <u-line color="#D8D8D8"></u-line> -->
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<recommend-qty-edit ref="qtyEdit" :dataContent="editItem" :settingParam="settingParam" :handleQty="editItem.qty"
+			@confirm="confirm">
+		</recommend-qty-edit>
+		<package-detail-popup ref='packageDetailPopup'>
+		</package-detail-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import balanceMove from '@/mycomponents/balance/balanceMove.vue'
+	import purchaseLabel from '@/mycomponents/balance/purchaseLabel.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import packageDetailPopup from '@/mycomponents/package/packageDetailPopup.vue'
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getClearOption
+	} from '@/common/array.js';
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			jobDetailPopup,
+			balance,
+			recommendQtyEdit,
+			balanceMove,
+			purchaseLabel,
+			packageDetailPopup
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			fromInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			toInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: false
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {},
+				detailOptions: [],
+				scanOptions: [],
+				removeOptions: [],
+				dataList: [],
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+			this.removeOptions = getClearOption();
+		},
+
+		methods: {
+			removeData(e, dataContent) {
+				if (e.content.text == "清空") {
+					this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
+						res => {
+							if (res) {
+								this.$emit('removeItem')
+								// this.$emit('removeItem', this.dataContent)
+							}
+						});
+				}
+			},
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item.package)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+
+			edit(item) {
+				this.editItem = item;
+				this.$refs.qtyEdit.openRecordEditPopup(item.handleQty);
+			},
+
+			detail(packageInfo) {
+				this.showItem = packageInfo;
+				this.$refs.packageDetailPopup.openPopup(packageInfo)
+			},
+			remove(item, index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							this.dataContent.subList.splice(index, 1)
+							this.$emit('removePack')
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.handleQty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/unPlanned/coms/comReceiptRequestCard.vue b/pages/unPlanned/coms/comReceiptRequestCard.vue
new file mode 100644
index 0000000..f9784b4
--- /dev/null
+++ b/pages/unPlanned/coms/comReceiptRequestCard.vue
@@ -0,0 +1,36 @@
+<template>
+ 	<request-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				到仓库代码 : {{dataContent.toWarehouseCode}}
+ 			</view>
+ 		</view>
+ 	</request-com-main-card>
+ </template>
+
+ <script>
+ 	import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			requestComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/pages/unPlanned/coms/comReceiptRequestPopup.vue b/pages/unPlanned/coms/comReceiptRequestPopup.vue
new file mode 100644
index 0000000..583541f
--- /dev/null
+++ b/pages/unPlanned/coms/comReceiptRequestPopup.vue
@@ -0,0 +1,260 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup" :maskClick="false">
+			<view class="uni-flex uni-column pop_customer">
+				<view class="" style="padding:10rpx">
+					<view class="uni-flex u-col-center uni-row space-between" style="padding: 10rpx 10rpx 20rpx 10rpx">
+						<view class="" style="font-size: 35rpx;">
+							{{title}}
+						</view>
+						<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
+							@click="closeRequestPopup()"></image>
+					</view>
+					<u-line />
+					<view class="uni-flex uni-column" style="background-color: white; ">
+						<view class="uni-flex uni-column  ">
+
+							<view class="title padding" style="display: flex;">
+								<text style=" flex-shrink: 0;">库位：</text>
+								<view class="" style="width: 100% ;">
+									{{toLocationCode}}
+								</view>
+								<view class="" v-if="editPosition">
+									<image src="/static/search.svg" mode=""
+										style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;"
+										@click="locationCodeClick">
+									</image>
+								</view>
+
+							</view>
+							<u-line />
+
+							<view class="title padding" style="display: flex;">
+								<text style=" flex-shrink: 0;">物料：</text>
+								<view class="" style="width: 100% ;">
+									{{itemCode}}
+								</view>
+								<view class="">
+									<image src="/static/search.svg" mode=""
+										style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;" @click="itemCodeClick">
+									</image>
+								</view>
+
+							</view>
+
+							<u-line />
+
+							<view class="uni-flex uni-row  padding title u-col-center">
+								<text>数量 : </text>
+								<view class="uni-flex uni-row uni-center"
+									style="align-items: center;margin-left: 20rpx;">
+									<input style="text-align: center;" class="qty_input" v-model="counQty" type="number"
+										@confirm="confirm()" :focus="numberFocus"  @input="checkNum" :maxlength="maxlength" />
+									
+									<uom :uom="uom"></uom>
+									<view class="" v-if="stdPackInfo!=undefined" style="display: flex;flex-direction: row;margin-left: 10rpx;">
+										(<stdPackQty :dataContent="stdPackInfo"></stdPackQty>)
+									</view>
+
+								</view>
+							</view>
+							<u-line />
+						</view>
+					</view>
+				</view>
+				<view class="uni-flex uni-row hide_border">
+					<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button>
+					<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button>
+				</view>
+			</view>
+		</uni-popup>
+		<win-scan-item ref="itemPopup" title='物料代码' @getScanResult='getItemScanResult' :itemCodeTypeList="itemCodeTypeList">
+		</win-scan-item>
+		<winScanLocation ref="locationPopup" title="库位代码" @getLocation='getLocationCode'></winScanLocation>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getBasicItemByCode,
+	} from '@/api/request2.js';
+	import {
+		getLocationTypeName,
+		getListLocationTypeDesc,
+		checkDirectoryItemExist
+	} from '@/common/directory.js';
+	import uom from '@/mycomponents/qty/uom.vue'
+	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
+	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
+	import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
+
+	export default {
+		components: {
+			uom,
+			stdPackQty,
+			balanceStatus,
+			winScanItem,
+			winScanLocation
+		},
+		data() {
+			return {
+				itemCode: '请扫描物料信息',
+				itemName: "",
+				qty: 0,
+				itemCodeFocus: false,
+				requestInfo: null,
+				isCheckItemCode: false,
+				counQty: undefined,
+				numberFocus: false,
+				uom: "",
+				show: false,
+				isModifiedPosition: true,
+				positionList: [],
+				toLocationCode: '请扫描库位信息',
+				isCheckLocationCode: false,
+				editPosition: true,
+				maxlength:10,
+				stdPackInfo:undefined
+			}
+		},
+		props: {
+			title: {
+				type: String,
+				default: '申请信息'
+			},
+			itemCodeTypeList: {
+				type: Array,
+				default: []
+			},
+		},
+		methods: {
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //包含小数点
+				let reg = /^[0-9]+$/; //正整数
+				if (dot > -1) {
+					this.maxlength = dot + 7; //长度是小数点后两位
+					if (value.length > dot + 7) {
+			
+					}
+				}
+				if (reg.test(value)) { //如果是正整数不包含小数点
+					this.maxlength = 10;
+				}
+				this.change(value)
+			},
+			openRequestPopup(editPosition) {
+				this.editPosition = editPosition;
+				if (!editPosition) {
+					this.itemCode = "请扫描物料信息";
+					this.uom = ""
+					this.qty = 0
+					this.counQty = undefined;
+					this.itemCodeGetFocus();
+				}
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closeRequestPopup() {
+				this.$refs.popup.close()
+			},
+			locationConfirm() {
+				//查询库位信息
+				this.checkLocatioCode();
+			},
+			itemCodeClick() {
+				this.$refs.itemPopup.openScanPopup();
+			},
+			locationCodeClick() {
+				this.$refs.locationPopup.openScanPopup();
+			},
+
+
+			itemCodeGetFocus() {
+				this.itemCodeFocus = true;
+			},
+			itemCodeLoseFocus() {
+				this.itemCodeFocus = false;
+			},
+
+			confirm() {
+				if (this.toLocationCode == "") {
+					this.showErrorMessage("请输入库位", "locationCode")
+					return
+				}
+
+				if (this.itemCode == "请扫描物料信息" ) {
+					this.showErrorMessage("请输入物料", "itemCode")
+					return
+				}
+				if (this.counQty == undefined) {
+					this.showErrorMessage("请输入数量")
+					return
+				}
+				
+				if (this.qty == 0) {
+					this.showErrorMessage("数量必须大于0")
+					return
+				}
+
+				this.callback('add');
+			},
+
+			callback(action) {
+				let item = {
+					toLocationCode: this.toLocationCode,
+					itemCode: this.itemCode,
+					itemName: this.itemName,
+					uom: this.uom,
+					qty: this.qty
+				};
+				this.closeRequestPopup();
+				this.$emit("confirm", action, item);
+			},
+
+			showErrorMessage(message, type) {
+				setTimeout(r => {
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (type == "itemCode") {
+							this.itemCodeGetFocus();
+						} else {
+							this.numberFocus = true;
+						}
+					})
+					// if (type == "itemCode") {
+					// 	this.itemCode = ""
+					// 	this.isCheckItemCode = false;
+					// }
+				})
+			},
+			change(value) {
+				this.qty = value;
+			},
+			cancel(e) {
+				this.closeRequestPopup();
+			},
+
+			getLocationCode(location, code) {
+				this.toLocationCode = code;
+			},
+			
+			getItemScanResult(code, scanResult) {
+				this.itemCode = code;
+				this.itemName = scanResult.name
+				this.uom =scanResult.uom
+				this.stdPackInfo = scanResult.package;
+				this.numberFocus = true
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.title {
+		font-size: 30rpx;
+	}
+</style>
diff --git a/pages/unPlanned/coms/detailInfoPopup.vue b/pages/unPlanned/coms/detailInfoPopup.vue
new file mode 100644
index 0000000..be4a571
--- /dev/null
+++ b/pages/unPlanned/coms/detailInfoPopup.vue
@@ -0,0 +1,53 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">原因 : </text>
+							<text class="text_wrap">{{dataContent.Reason}} </text>
+						</view>
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/unPlanned/coms/jobInfoPopup.vue b/pages/unPlanned/coms/jobInfoPopup.vue
new file mode 100644
index 0000000..f361f30
--- /dev/null
+++ b/pages/unPlanned/coms/jobInfoPopup.vue
@@ -0,0 +1,45 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/unPlanned/coms/jobListPopup.vue b/pages/unPlanned/coms/jobListPopup.vue
new file mode 100644
index 0000000..d57df20
--- /dev/null
+++ b/pages/unPlanned/coms/jobListPopup.vue
@@ -0,0 +1,51 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in list" :key="index">
+				<com-issue-job-card v-if="type=='issue'" :dataContent="item" @click='selectItem(item)'></com-issue-job-card>
+				<com-receipt-job-card v-else :dataContent="item" @click='selectItem(item)'></com-receipt-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	import comReceiptJobCard from '@/pages/unPlanned/coms/comReceiptJobCard.vue'
+	import comIssueJobCard from '@/pages/unPlanned/coms/comIssueJobCard.vue'
+
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comReceiptJobCard,
+			comIssueJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				list: [],
+				type: ''
+			}
+		},
+		methods: {
+			openPopup(items, type) {
+				this.list = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/unPlanned/coms/requestIssDetailInfoPopup.vue b/pages/unPlanned/coms/requestIssDetailInfoPopup.vue
new file mode 100644
index 0000000..0e72cf6
--- /dev/null
+++ b/pages/unPlanned/coms/requestIssDetailInfoPopup.vue
@@ -0,0 +1,78 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<requestDetailCommonInfo :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">包装号 : </text>
+							<text class="text_wrap">{{dataContent.packingNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">器具号 : </text>
+							<text class="text_wrap">{{dataContent.containerNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">批次 : </text>
+							<text class="text_wrap">{{dataContent.batch}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">库存状态 : </text>
+							<text class="text_wrap">{{dataContent.inventoryStatus}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从库位代码 : </text>
+							<text class="text_wrap">{{dataContent.fromLocationCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">从货主代码 : </text>
+							<text class="text_wrap">{{dataContent.fromOwnerCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">原因 : </text>
+							<text class="text_wrap">{{dataContent.reason}} </text>
+						</view>
+						
+					</view>
+				</view>
+			</requestDetailCommonInfo>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue'
+	export default {
+		components: {
+			requestDetailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/unPlanned/coms/requestIssInfoPopup.vue b/pages/unPlanned/coms/requestIssInfoPopup.vue
new file mode 100644
index 0000000..dc6bf5e
--- /dev/null
+++ b/pages/unPlanned/coms/requestIssInfoPopup.vue
@@ -0,0 +1,60 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<request-common-info :dataContent="dataContent"  @onClose="closePopup">
+				<view class="">
+					<comListItem :dataList="dataList"></comListItem>
+				</view>
+				<u-line></u-line>
+			</request-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestCommonInfo from '@/mycomponents/request/requestCommonInfo.vue'
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+		components: {
+			requestCommonInfo,
+			comListItem
+		},
+		data() {
+			return {
+				dataContent:{},
+				dataList:[]
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				this.dataList=[{
+						title: '从仓库代码',
+						content: this.dataContent.fromWarehouseCode
+					}, {
+						title: '从库位类型范围',
+						content: this.dataContent.fromLocationTypes,
+						type:"locationType"
+					},{
+						title: '从库区代码范围',
+						content: this.dataContent.fromAreaCodes,
+					}];
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/unPlanned/coms/requestRecDetailInfoPopup.vue b/pages/unPlanned/coms/requestRecDetailInfoPopup.vue
new file mode 100644
index 0000000..8f8d799
--- /dev/null
+++ b/pages/unPlanned/coms/requestRecDetailInfoPopup.vue
@@ -0,0 +1,95 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<requestDetailCommonInfo :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">包装号 : </text>
+							<text class="text_wrap">{{dataContent.packingNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">器具号 : </text>
+							<text class="text_wrap">{{dataContent.containerNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">批次 : </text>
+							<text class="text_wrap">{{dataContent.batch}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">替代批次 : </text>
+							<text class="text_wrap">{{dataContent.altBatch}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到库位代码 : </text>
+							<text class="text_wrap">{{dataContent.toLocationCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">库存状态 : </text>
+							<text class="text_wrap">{{dataContent.inventoryStatus}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到货日期 : </text>
+							<text class="text_wrap">{{dataContent.arriveDate}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">生产日期 : </text>
+							<text class="text_wrap">{{dataContent.produceDate}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">过期日期 : </text>
+							<text class="text_wrap">{{dataContent.expireDate}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到货主代码 : </text>
+							<text class="text_wrap">{{dataContent.toOwnerCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">原因 : </text>
+							<text class="text_wrap">{{dataContent.reason}} </text>
+						</view>
+						
+						
+					</view>
+				</view>
+			</requestDetailCommonInfo>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue'
+	export default {
+		components: {
+			requestDetailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/unPlanned/coms/requestRecInfoPopup.vue b/pages/unPlanned/coms/requestRecInfoPopup.vue
new file mode 100644
index 0000000..3d6fe23
--- /dev/null
+++ b/pages/unPlanned/coms/requestRecInfoPopup.vue
@@ -0,0 +1,60 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<request-common-info :dataContent="dataContent"  @onClose="closePopup">
+				<view class="">
+					<comListItem :dataList="dataList"></comListItem>
+				</view>
+				<u-line></u-line>
+			</request-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import requestCommonInfo from '@/mycomponents/request/requestCommonInfo.vue'
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+		components: {
+			requestCommonInfo,
+			comListItem
+		},
+		data() {
+			return {
+				dataContent:{},
+				dataList:[]
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				this.dataList=[{
+						title: '到仓库代码',
+						content: this.dataContent.toWarehouseCode
+					}, {
+						title: '到库位类型范围',
+						content: this.dataContent.toLocationTypes,
+						type:"locationType"
+					},{
+						title: '到库区代码范围',
+						content: this.dataContent.toAreaCodes,
+					}];
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/unPlanned/job/issueJob.vue b/pages/unPlanned/job/issueJob.vue
new file mode 100644
index 0000000..c5ef37f
--- /dev/null
+++ b/pages/unPlanned/job/issueJob.vue
@@ -0,0 +1,292 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-issue-job-card :dataContent="item" @click='openJobDetail(item)'></com-issue-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+			
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		cancleTakeUnPlannedIssueJob,
+		getUnPlannedIssueJobList,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+
+	import comIssueJobCard from '@/pages/unPlanned/coms/comIssueJobCard.vue'
+	import jobListPopup from '@/pages/unPlanned/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/unPlanned/coms/jobInfoPopup.vue'
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comIssueJobCard,
+			jobListPopup,
+			jobInfoPopup
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+				
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				
+				getUnPlannedIssueJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("计划外出库(" + this.totalCount + ")");
+					
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("计划外出库");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './issueJobDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.jobListPopup.openPopup(itemList,'issue');
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeUnPlannedIssueJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getUnPlannedIssueJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/unPlanned/job/issueJobDetail.vue b/pages/unPlanned/job/issueJobDetail.vue
new file mode 100644
index 0000000..44832a2
--- /dev/null
+++ b/pages/unPlanned/job/issueJobDetail.vue
@@ -0,0 +1,425 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+			<u-line color="#D8D8D8"></u-line>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
+							@remove="updateData" @updateData="updateData" @openDetail="openDetail">
+						</com-detail-card>
+					</view>
+					<u-line />
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+	import {
+		getUnPlannedIssueJobDetail,
+		takeUnPlannedIssueJob,
+		cancleTakeUnPlannedIssueJob,
+		unPlannedIssueJobSubmit
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		navigateBack,
+		getPackingNumberAndBatch,
+		getDirectoryItemArray,
+		getInventoryStatusName,
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import detailInfoPopup from '@/pages/unPlanned/coms/detailInfoPopup.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+
+	export default {
+		name: 'receipt_detail',
+		components: {
+			winScanButton,
+			winScanPackAndLocation,
+			comDetailCard,
+			detailInfoPopup,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				businessTypeInfo: {},
+				managementList: [],
+				jobStatus:""
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				// 	//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务	
+					cancleTakeUnPlannedIssueJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+				return true;
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeUnPlannedIssueJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getUnPlannedIssueJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status
+							that.subList = res.data.subList;
+							that.detailSource = getDataSource(that.subList)
+						} else {
+							that.showErrorMessage('列表数据为0');
+						}
+					}
+
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.continueScan()
+				this.$forceUpdate();
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			openDetail(item) {
+				this.$refs.detailInfoPopup.openPopup(item)
+			},
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.balance.packingNumber;
+					var batch = result.balance.batch;
+					var qty = result.balance.qty;
+					var itemCode = result.balance.itemCode;
+					var locationCode = result.balance.locationCode;
+					var inventoryStatus = result.balance.inventoryStatus;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch &&
+								r.fromLocationCode == result.fromLocationCode
+						})
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+								.fromLocationCode + "】不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+									.fromLocationCode + "】已经扫描")
+							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,是否继续出库?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty);
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty);
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									} else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.handleQty = Number(result.balance.qty);
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+									itemDetail.balance = result.balance;
+									itemDetail.balance.balanceQty = Number(result.balance.qty);
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+				} catch (e) {
+					this.showMessage(e.message)
+				}
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this
+							.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				//没有目标库位，不查询管理模式
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+				unPlannedIssueJobSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成计划外出库记录<br>" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toPackingNumber = detail.packingNumber;
+							detail.toContainerNumber = '';
+							detail.toBatch = detail.batch;
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus()
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus()
+						}
+					});
+				})
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/pages/unPlanned/job/receiptJob.vue b/pages/unPlanned/job/receiptJob.vue
new file mode 100644
index 0000000..9a9b713
--- /dev/null
+++ b/pages/unPlanned/job/receiptJob.vue
@@ -0,0 +1,277 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-receipt-job-card :dataContent="item" @click='openJobDetail(item)'></com-receipt-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+
+			<uni-load-more :status="loadingType" />
+			
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	
+	import {
+		cancleTakeUnPlannedReceiptJob,
+		getUnPlannedReceiptJobList,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+
+	import comReceiptJobCard from '@/pages/unPlanned/coms/comReceiptJobCard.vue'
+	import jobListPopup from '@/pages/unPlanned/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/unPlanned/coms/jobInfoPopup.vue'
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comReceiptJobCard,
+			jobListPopup,
+			jobInfoPopup
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+			};
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "request_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+				
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getUnPlannedReceiptJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+					updateTitle("计划外入库(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("计划外入库");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './receiptJobDetail?id=' + item.id + '&status=' + item.status
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.jobListPopup.openPopup(itemList, 'receipt');
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeUnPlannedReceiptJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getUnPlannedReceiptJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/unPlanned/job/receiptJobDetail.vue b/pages/unPlanned/job/receiptJobDetail.vue
new file mode 100644
index 0000000..d73df3c
--- /dev/null
+++ b/pages/unPlanned/job/receiptJobDetail.vue
@@ -0,0 +1,412 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+			<u-line color="#D8D8D8"></u-line>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
+							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+						</com-receipt-detail-card>
+					</view>
+					<u-line />
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<required-location ref="requiredLocation" title="目标库位" :locationCode="toLocationCode"
+						:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
+						:locationTypeList="toLocationTypeList"></required-location>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult' headerType="HPQ,HMQ"></win-scan-pack>
+
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+	import {
+		getUnPlannedReceiptJobDetail,
+		cancleTakeUnPlannedReceiptJob,
+		takeUnPlannedReceiptJob,
+		unPlannedReceiptJobSubmit
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		navigateBack,
+		getPackingNumberAndBatch,
+		getDirectoryItemArray
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comReceiptDetailCard from '@/pages/unPlanned/coms/comReceiptDetailCard.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+
+	export default {
+		name: 'receipt_detail',
+		components: {
+			winScanButton,
+			winScanPack,
+			comReceiptDetailCard,
+			requiredLocation,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				toLocationTypeList: [],
+				toLocationCode: '',
+				toLocationInfo: {},
+				businessTypeInfo: {},
+				managementList: [],
+				jobStatus:""
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				// 	//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务	
+					cancleTakeUnPlannedReceiptJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+				return true;
+			}
+		},
+
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeUnPlannedReceiptJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getUnPlannedReceiptJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status
+							that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes);
+							that.subList = res.data.subList;
+							this.toLocationCode = that.subList[0].toLocationCode
+							that.detailSource = getDataSource(that.subList)
+						} else {
+							that.showErrorMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+
+			updateData() {
+				calcHandleQty(this.detailSource);
+			},
+
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+
+						var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch &&
+							r.fromLocationCode == result.fromLocationCode);
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+								.fromLocationCode + "】不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+									.fromLocationCode + "】已经扫描")
+							} else {
+								itemDetail.scaned = true;
+								itemDetail.handleQty = Number(result.label.qty);
+								itemDetail.toLocationCode = this.toLocationCode;
+								itemDetail.stdPackQty = result.package.stdPackQty
+								itemDetail.labelQty = Number(result.label.qty);
+								calcHandleQty(this.detailSource);
+								this.continueScan()
+							}
+						}
+					}
+
+				} catch (e) {
+					this.showErrorMessage(e.message)
+				}
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//校验库位、
+				if (!this.checkLocation()) {
+					return
+				}
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this
+							.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.showMessageHint('请扫描目标库位', callback => {
+						this.$refs.comScanLocation.showLocation();
+					})
+
+					return isPass = false;
+				}
+				return isPass;
+			},
+
+			showMessageHint(hint, callback) {
+				this.$refs.comMessage.showErrorMessage(hint, res => {
+					if (res) {
+						callback()
+					}
+				});
+			},
+
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams()
+						console.log("提交参数", JSON.stringify(params));
+						unPlannedReceiptJobSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成计划外入库记录<br>" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							detail.toLocationCode = this.toLocationCode
+							detail.toContainerNumber = '';
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+
+
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus()
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus()
+						}
+					});
+				})
+			},
+
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	
+</style>
diff --git a/pages/unPlanned/record/issueRecord.vue b/pages/unPlanned/record/issueRecord.vue
new file mode 100644
index 0000000..d02d229
--- /dev/null
+++ b/pages/unPlanned/record/issueRecord.vue
@@ -0,0 +1,296 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<uni-data-picker style="padding: 20rpx; background-color:#fff;" class='uni-data-picker'
+						placeholder="请选择出库原因" popup-title="出库原因" :localdata="reasonList"  @change="reasonChange">
+					</uni-data-picker>
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index"
+								@removeItem="removeItem(index,item)" @updateData="updateData" :isShowLocation="true"
+								@removePack="removePack">
+							</record-com-detail-card>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
+		</win-scan-pack-and-location>
+		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromLocationTypeArray"></win-scan-location>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import {
+		unPlannedIssueRecordSubmit
+	} from '@/api/request2.js';
+
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+
+	import {
+		getDirectoryItemArray,
+		getUnPlannedIssuseReasonList,
+	} from '@/common/directory.js';
+
+	import {
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import {
+		goHome,
+		updateTitle,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			winScanButton,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		props: {},
+		data() {
+			return {
+				fromLocationCode: "",
+				fromLocationTypeArray: [],
+				fromInventoryStatus: [],
+				toInventoryStatus: [],
+				businessType: {}, //业务类型
+				detailSource: [], //绑定在页面上的数据源
+				reasonText: "",
+				reasonCode:"",
+				reasonList: [],
+				dataContent:{}
+			}
+		},
+
+		mounted() {
+			this.reasonList = getUnPlannedIssuseReasonList();
+			var typeCode = "UnplannedDeliver"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromLocationTypeArray = res.fromlocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+
+		onLoad(option) {
+		},
+
+		methods: {
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanFromLocationCode.openScanPopup();
+				})
+
+			},
+			getLocation(location) {
+				this.getfromLocationCode(location)
+			},
+			getfromLocationCode(location) {
+				this.fromLocationCode = location.code;
+				this.openScanPopup();
+			},
+			getScanResult(result) {
+				this.getDataSource(result)
+			},
+
+			getDataSource(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == label.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					newDetail.inventoryStatus ="OK";
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == result.packingNumber &&
+							r.batch == result.batch &&
+							r.locationCode == result.locationCode &&
+							r.inventoryStatus == result.inventoryStatus &&
+							r.scaned == true) {
+							return r;
+						}
+					})
+
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						this.showErrorMessage(result.packingNumber + "已经在列表中")
+					}
+				}
+				this.calcHandleQty();
+
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource);
+				this.$forceUpdate();
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			updateData() {
+				this.calcHandleQty();
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			commit() {
+				if (this.reasonText == '') {
+					this.showErrorMessage("请选择出库原因")
+					return;
+				}
+					var params =this.setParams()
+					console.log("提交" + JSON.stringify(params))
+					unPlannedIssueRecordSubmit(params).then(res => {
+						uni.hideLoading()
+						if (res.data) {
+							this.showCommitSuccessMessage("提交成功<br>生成采购收货记录<br>" + res.data )
+						} else {
+							this.showErrorMessage("提交失败[" + res.msg + "]")
+						}
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error)
+					})
+				
+			},
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var submitItem = deepCopyData(detail)
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+							
+							submitItem.inventoryStatus = detail.inventoryStatus;
+							
+							submitItem.fromPackingNumber = detail.packingNumber;
+							submitItem.toPackingNumber = detail.packingNumber;
+							
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+							
+							submitItem.fromBatch = detail.batch;
+							submitItem.toBatch = detail.batch;
+							
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = "";
+							
+							submitItem.reason = this.reasonCode;
+							submitItem.qty = detail.handleQty;
+							submitItem.package ="";
+							
+							subList.push(submitItem)
+						}
+					})
+				})
+				
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				return this.dataContent;
+			},
+			
+			reasonChange(e) {
+				if (e.detail.value.length == 0) {
+					this.reasonCode = ""
+					this.reasonText = ""
+				} else {
+					this.reasonCode = e.detail.value[0].value
+					this.reasonText = e.detail.value[0].text
+				}
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+						this.clearData();
+				})
+			},
+			clearData(){
+				this.reasonCode = ""
+				this.reasonText = "";
+				this.detailSource = [];
+				this.managementList =[];
+				this.dataContent ={}
+			}
+			
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/unPlanned/record/receiptRecord.vue b/pages/unPlanned/record/receiptRecord.vue
new file mode 100644
index 0000000..cec98b3
--- /dev/null
+++ b/pages/unPlanned/record/receiptRecord.vue
@@ -0,0 +1,395 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='openScanPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<u-line />
+			<view class="page-main">
+				<uni-data-picker v-if="detailSource.length>0" style="padding: 20rpx; background-color:#fff;"
+					class='uni-data-picker' placeholder="请选择入库原因" popup-title="入库原因" :localdata="reasonList"
+					@change="reasonChange">
+				</uni-data-picker>
+
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<com-receipt-record :dataContent="item" @removeItem="removeItem(index,item)"
+								@updateData="updateData" :isShowLocation="false" @removePack="removePack">
+							</com-receipt-record>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
+							:locationTypeList="tolocationTypeList"></requiredLocation>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult' :title="'箱码'" headerType="HPQ,HMQ"></win-scan-pack>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comReceiptRecord from '@/pages/unPlanned/coms/comReceiptRecord.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPack from "@/mycomponents/scan/winScanPack.vue"
+
+	import {
+		unPlannedReceiptRecordbSubmit
+	} from '@/api/request2.js';
+
+	import {
+		getDirectoryItemArray,
+		getUnPlannedReceiptReasonList
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		Decimal
+	} from 'decimal.js'; //引入
+	import {
+		goHome,
+		updateTitle,
+		deepCopyData,
+		getPackingNumberAndBatchByList
+	} from '@/common/basic.js';
+
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+
+
+	export default {
+		components: {
+			comEmptyView,
+			winScanButton,
+			requiredLocation,
+			comReceiptRecord,
+			comBlankView,
+			winScanLocation,
+			winScanPack,
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				toLocationCode: "",
+				toInventoryStatus: [],
+				businessType: {}, //业务类型
+				detailSource: [], //绑定在页面上的数据源
+				businessTypeCode: "UnplannedReceipt",
+				reasonText: "",
+				reasonCode: "",
+				reasonList: [],
+				dataContent: {},
+				managementList: []
+			}
+		},
+
+		mounted() {
+			this.reasonList = getUnPlannedReceiptReasonList();
+			getBusinessType(this.businessTypeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.openScanPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+
+		onLoad(option) {},
+
+		methods: {
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				this.toLocationCode = code;
+			},
+			getScanResult(result) {
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == label.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = this.createItemInfo(label, pack);
+					let newDetail = this.createDetailInfo(label, pack);
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == result.number &&
+							r.batch == result.batch) {
+							return r;
+						}
+					})
+
+					if (detail == undefined) {
+						let newDetail = this.createDetailInfo(label, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned) {
+							this.showErrorMessage("箱码[" + result.Number + "]批次[" + result.batch + "]已经扫描")
+						}
+
+					}
+				}
+				this.calcHandleQty();
+
+			},
+
+			createItemInfo(label, pack) {
+				let item = {
+					itemCode: pack.itemCode,
+					itemName: pack.itemName,
+					stdPackQty: pack.stdPackQty,
+					stdPackUnit: pack.stdPackUnit,
+					qty: new Decimal(label.qty).toNumber(),
+					handleQty: new Decimal(0).toNumber(),
+					uom: label.uom,
+					subList: []
+				}
+				return item;
+			},
+
+			createDetailInfo(label, pack) {
+				let detail = deepCopyData(label);
+				detail.scaned = true;
+				// Object.assign(detail, label)
+				detail.qty = new Decimal(label.qty).toNumber();
+				detail.handleQty = new Decimal(label.qty).toNumber();
+				detail.inventoryStatus = "OK"
+				detail.stdPackQty = pack.stdPackQty;
+				detail.stdPackUnit = pack.stdPackUnit;
+				label.inventoryStatus = "OK";
+				detail.package = pack;
+				detail.label = label;
+				detail.label.scaned = true
+				return detail;
+			},
+
+			calcHandleQty() {
+				for (let item of this.detailSource) {
+					item.handleQty = new Decimal(0).toNumber();
+					item.qty = new Decimal(0).toNumber();
+					for (let detail of item.subList) {
+						if (detail != undefined) {
+							item.handleQty = calc.add(item.handleQty, detail.handleQty)
+							item.qty = calc.add(item.qty, detail.qty);
+						}
+					}
+				}
+				this.$forceUpdate();
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			updateData() {
+				this.calcHandleQty();
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			commit() {
+				if (this.toLocationCode == "") {
+					this.showErrorMessage("请先选择目标库位")
+					return;
+				}
+				if (this.reasonText == '') {
+					this.showErrorMessage("请选择入库原因")
+					return;
+				}
+
+
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					this.managementList = [];
+					var precisionStrategParams = this.setPrecisionStrategParams()
+					getPrecisionStrategyList(precisionStrategParams, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							var params = this.setParams()
+							console.log("提交" + JSON.stringify(params))
+							unPlannedReceiptRecordbSubmit(params).then(res => {
+								uni.hideLoading()
+								if (res.data) {
+									this.showCommitSuccessMessage("提交成功<br>生成计划外入库记录<br>" + res.data)
+								} else {
+									this.showErrorMessage("提交失败[" + res.msg + "]")
+								}
+							}).catch(error => {
+								uni.hideLoading()
+								this.showErrorMessage(error)
+							})
+
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+
+					})
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+
+
+			},
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.toLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+			setParams() {
+
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var submitItem = deepCopyData(detail)
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.label
+								.itemCode,
+								detail.label.packingNumber, detail.toLocationCode, detail.label.batch);
+
+							submitItem.itemCode = detail.package.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+
+							submitItem.inventoryStatus = detail.inventoryStatus;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.toPackingNumber = info.packingNumber;
+
+							// detail.fromContainerNumber = detail.containerNumber;
+							// detail.toContainerNumber = detail.containerNumber
+
+							submitItem.fromBatch = info.batch;
+							submitItem.toBatch = info.batch;
+
+							submitItem.fromLocationCode = "";
+							submitItem.toLocationCode = detail.toLocationCode;
+
+							submitItem.reason = this.reasonCode;
+
+							submitItem.qty = detail.handleQty;
+							submitItem.package = "";
+
+							subList.push(submitItem)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				return this.dataContent;
+			},
+			reasonChange(e) {
+				if (e.detail.value.length == 0) {
+					this.reasonCode = ""
+					this.reasonText = ""
+				} else {
+					this.reasonCode = e.detail.value[0].value
+					this.reasonText = e.detail.value[0].text
+				}
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
+			},
+			clearData() {
+				this.reasonCode = ""
+				this.reasonText = "";
+				this.detailSource = [];
+				this.managementList = [];
+				this.dataContent = {}
+				this.toLocationCode = ""
+			}
+
+
+		}
+	}
+</script>
+
+<style>
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: relative;
+		margin-top: 2px;
+	}
+</style>
diff --git a/pages/unPlanned/request/issueRequest.vue b/pages/unPlanned/request/issueRequest.vue
new file mode 100644
index 0000000..7cec841
--- /dev/null
+++ b/pages/unPlanned/request/issueRequest.vue
@@ -0,0 +1,399 @@
+<template>
+	<view>
+		<com-empty-view v-if="requestList.length==0"></com-empty-view>
+		<request-filter ref="filter" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
+			:checkedWaitTask="checkedWaitTask">
+		</request-filter>
+		<view v-if="requestList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in requestList" :key="index">
+					<uni-swipe-action-item :right-options="item.options" @click="swipeClick($event,item)">
+						<com-issue-request-card :dataContent="item" @click='openRequestDetail(item)'>
+						</com-issue-request-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+			<uni-load-more :status="loadingType" />
+
+			<requestIssInfoPopup ref='requestInfoPopup'></requestIssInfoPopup>
+		</view>
+		<requestButton @goScan='openScanDetailPopup'></requestButton>
+	</view>
+	<comMessage ref="comMessage"></comMessage>
+</template>
+
+<script>
+	import requestFilter from '@/mycomponents/request/requestFilter.vue'
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comIssueRequestCard from '@/pages/unPlanned/coms/comIssueRequestCard.vue'
+	import requestIssInfoPopup from '@/pages/unPlanned/coms/requestIssInfoPopup.vue'
+	import requestButton from '@/mycomponents/button/requestButton.vue'
+
+	import {
+		goHome,
+		updateTitle,
+		clearTirmAndWrap
+	} from '@/common/basic.js';
+
+	import {
+		getUnPlannedIssueRequestList,
+		unPlannedIssueRequestApprove,
+		unPlannedIssueRequestClose,
+		unPlannedIssueRequestApproveAgree,
+		unPlannedIssueRequestApproveRefused,
+		unPlannedIssueRequestHandle,
+		unPlannedIssueRequestAddAgain
+	} from '@/api/request2.js';
+	import {
+		getDetailOption,
+		getDetailAndApproveOption,
+		getDetailAndApprovePassAndApproveNoOption,
+		getDetailAndHandleOption,
+		getDetailAndAddAndCloseOption,
+		getAddAgainOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			requestFilter,
+			requiredLocation,
+			comIssueRequestCard,
+			requestIssInfoPopup,
+			requestButton,
+		},
+		data() {
+			return {
+				requestList: [],
+				pageNo: 1,
+				pageSize: 10,
+				status: "1,2,3,4,5,6",
+				totalCount: 0,
+				checkedWaitTask: false,
+				detailOptions: [],
+				detailAndApproveOptions: [],
+				detailAndApprovePassAndApproveNoOption: [],
+				detailAndHandleOption: [],
+				detailAndAddAndCloseOption: [],
+				addAgainOption: [],
+				showOptions: [],
+				fromType: "requestType",
+				loadingType: "nomore",
+
+			};
+		},
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.addAgainOption = getAddAgainOption();
+			this.detailAndApproveOptions = getDetailAndApproveOption()
+			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
+			this.detailAndHandleOption = getDetailAndHandleOption()
+			this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
+
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+		onShow() {
+			this.getList('refresh');
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+
+		mounted() {
+
+		},
+		methods: {
+			requestConfirm(action, item) {},
+
+			openRequestDetail(item) {
+				uni.navigateTo({
+					url: './issueRequestDetail?id=' + item.id
+				});
+			},
+			openRequestInfoPopup(item) {
+				this.$refs.requestInfoPopup.openPopup(item)
+			},
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.requestList = [];
+				}
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+
+				getUnPlannedIssueRequestList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					list.forEach(res => {
+						var options = this.updateOptions(res.status);
+						res.options = options;
+					})
+					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
+
+					this.pageNo++;
+					updateTitle("计划外出库申请(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("计划外出库申请");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			updateOptions(status) {
+				if (status == "1") {
+					this.showOptions = this.detailAndApproveOptions;
+				} else if (status == "2") {
+					this.showOptions = this.detailAndApprovePassAndApproveNoOption;
+				} else if (status == "3") {
+					this.showOptions = this.detailAndHandleOption;
+				} else if (status == "4") {
+					this.showOptions = this.detailAndAddAndCloseOption;
+				} else if (status == "5") {
+					this.showOptions = this.addAgainOption;
+				} else {
+					this.showOptions = this.detailOptions;
+				}
+				return this.showOptions
+			},
+
+			openScanDetailPopup() {
+				uni.navigateTo({
+					url: "./issueRequestCreate?fromType=" + this.fromType
+				})
+			},
+
+			swipeClick(e, dataContent) {
+				var text = clearTirmAndWrap(e.content.text)
+				if (text == "详情") {
+					this.openRequestInfoPopup(dataContent);
+				} else if (text == "处理") {
+					this.showQuestionMessage("确定要处理当前申请吗?", res => {
+						this.unPlannedIssueRequestHandle(dataContent.id)
+					})
+				} else if (text == "提交审批") {
+					this.showQuestionMessage("确定要审批当前申请吗?", res => {
+						this.unPlannedIssueRequestApprove(dataContent.id)
+					})
+				} else if (text == "审批通过") {
+					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
+						this.unPlannedIssueRequestApproveAgree(dataContent.id)
+					})
+				} else if (text == "审批驳回") {
+					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
+						this.unPlannedIssueRequestApproveRefused(dataContent.id)
+					})
+				} else if (text == "关闭") {
+					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
+						this.unPlannedIssueRequestClose(dataContent.id)
+					})
+				} else if (text == "重新添加") {
+					this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
+						this.unPlannedIssueRequestAddAgain(dataContent.id)
+					})
+				}
+			},
+			showQuestionMessage(hint, callBack) {
+				this.$refs.comMessage.showQuestionMessage(hint,
+					res => {
+						if (res) {
+							callBack()
+						}
+					});
+			},
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getUnPlannedIssueRequestList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openRequestDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			unPlannedIssueRequestApprove(id) {
+				unPlannedIssueRequestApprove(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请提交审批成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请提交审批失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+
+			},
+
+			unPlannedIssueRequestClose(id) {
+				unPlannedIssueRequestClose(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请关闭成功"
+						})
+						this.getList("refresh")
+
+					} else {
+						this.showMessage("申请关闭失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			unPlannedIssueRequestApproveAgree(id) {
+				unPlannedIssueRequestApproveAgree(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批通过成功"
+						})
+						this.getList("refresh")
+
+					} else {
+						this.showMessage("申请审批通过失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			unPlannedIssueRequestApproveRefused(id) {
+				unPlannedIssueRequestApproveRefused(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批驳回成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批驳回失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			unPlannedIssueRequestHandle(id) {
+				unPlannedIssueRequestHandle(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请处理成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请处理失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			unPlannedIssueRequestAddAgain(id) {
+				unPlannedIssueRequestAddAgain(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请重新添加成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请重新添加失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/unPlanned/request/issueRequestCreate.vue b/pages/unPlanned/request/issueRequestCreate.vue
new file mode 100644
index 0000000..6f28beb
--- /dev/null
+++ b/pages/unPlanned/request/issueRequestCreate.vue
@@ -0,0 +1,294 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+			<view class="page-wraper" v-if="detailSource.length>0">
+					<view class="flex u-col-center" style="width: 100%;background-color:#fff;">
+							<view class="" style="margin-left: 20rpx;  font-size: 30rpx;flex-shrink: 0;">出库原因：</view>
+						<view  style="width: 100%">
+							<uni-data-picker style="background-color:#fff;margin-right: 20rpx;" class='uni-data-picker'
+								placeholder="请选择出库原因" popup-title="出库原因" :localdata="reasonList" @change="reasonChange">
+							</uni-data-picker>
+						</view>
+					</view>
+					
+				<view class="page-main" >
+					<scroll-view scroll-y="true" class="page-main-scroll">
+						<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+							<view class="">
+								<record-com-detail-card :dataContent="item" :index="index"
+									@removeItem="removeItem(index,item)" @updateData="updateData" :isShowFromLocation="true" :isShowToLocation="false"
+									@removePack="removePack">
+								</record-com-detail-card>
+							</view>
+							<u-line />
+						</view>
+					</scroll-view>
+				</view>
+				<view class="page-footer">
+					<view class="uni-flex u-col-center space-between padding_10"
+						style="background-color:ghostwhite; width: 100%; ">
+						<view class="">
+						</view>
+						<view class=" uni-flex uni-row">
+							<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+						</view>
+					</view>
+				</view>
+				<win-scan-button @goScan='openScanPopup'></win-scan-button>
+			</view>
+			
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
+		</win-scan-pack-and-location>
+		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromLocationTypeArray"></win-scan-location>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import {
+		unPlannedIssueRequestCreate,
+	} from '@/api/request2.js';
+
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+
+	import {
+		getDirectoryItemArray,
+		getUnPlannedIssuseReasonList,
+	} from '@/common/directory.js';
+
+	import {
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import {
+		goHome,
+		updateTitle,
+		deepCopyData,
+		getCurrDateTimes,
+		getCurrDateOneMonthsTimes,
+		navigateBack
+	} from '@/common/basic.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			winScanButton,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		props: {},
+		data() {
+			return {
+				fromLocationCode: "",
+				fromLocationInfo: {},
+				fromLocationTypeArray: [],
+				fromInventoryStatus: [],
+				toInventoryStatus: [],
+				businessType: {}, //业务类型
+				detailSource: [], //绑定在页面上的数据源
+				reasonText: "",
+				reasonCode: "",
+				reasonList: [],
+				dataContent: {},
+			}
+		},
+
+		mounted() {
+			
+		},
+
+		onLoad(option) {
+			this.reasonList = getUnPlannedIssuseReasonList()
+			var typeCode = "UnplannedDeliver"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromLocationTypeArray = res.fromlocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+			
+		},
+
+		methods: {
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanFromLocationCode.openScanPopup();
+				})
+
+			},
+			getLocation(location) {
+				this.getfromLocationCode(location)
+			},
+			getfromLocationCode(location) {
+				this.fromLocationInfo = location;
+				this.fromLocationCode = location.code;
+				this.openScanPopup();
+			},
+			getScanResult(result) {
+				this.getDataSource(result)
+			},
+
+			getDataSource(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == label.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == result.packingNumber &&
+							r.batch == result.batch &&
+							r.locationCode == result.locationCode &&
+							r.inventoryStatus == result.inventoryStatus &&
+							r.scaned == true) {
+							return r;
+						}
+					})
+
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						this.showErrorMessage(result.packingNumber + "已经在列表中")
+					}
+				}
+				this.calcHandleQty();
+
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource);
+				this.$forceUpdate();
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			updateData() {
+				this.calcHandleQty();
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			commit() {
+				if (this.reasonText == '') {
+					this.showErrorMessage("请选择出库原因")
+					return;
+				}
+				if(this.detailSource.length==0){
+					this.showErrorMessage("请先扫描数据")
+					return;
+				}
+				
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var params = this.setRequestParams();
+				console.log("提交参数", JSON.stringify(params));
+				unPlannedIssueRequestCreate(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成计划外出库申请<br>" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+			setRequestParams() {
+				var subList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var submitItem = deepCopyData(detail)
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.reason = this.reasonCode;
+							submitItem.containerNumber ="";
+							submitItem.qty = detail.handleQty;
+							subList.push(submitItem)
+						}
+					})
+				})
+
+				this.dataContent.subList = subList
+				this.dataContent.status = "1";
+				this.dataContent.requestTime = getCurrDateTimes();
+				this.dataContent.dueTime = getCurrDateOneMonthsTimes();
+				
+				return this.dataContent;
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+
+			reasonChange(e) {
+				if (e.detail.value.length == 0) {
+					this.reasonCode = ""
+					this.reasonText = ""
+				} else {
+					this.reasonCode = e.detail.value[0].value
+					this.reasonText = e.detail.value[0].text
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/unPlanned/request/issueRequestDetail.vue b/pages/unPlanned/request/issueRequestDetail.vue
new file mode 100644
index 0000000..56586ff
--- /dev/null
+++ b/pages/unPlanned/request/issueRequestDetail.vue
@@ -0,0 +1,123 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<request-top :dataContent="requestContent"></request-top>
+			</view>
+			<view class="header_item">
+				从仓库代码 : {{requestContent.fromWarehouseCode}}
+			</view>
+			<u-line color="#D8D8D8" />
+		</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comRequestDetailCard :dataContent="item" @openDetail="openDetail">
+						</comRequestDetailCard>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<requestIssDetailInfoPopup ref="requestDetailPopup"></requestIssDetailInfoPopup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getUnPlannedIssueRequestDetail,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource,
+	} from '@/common/detail.js';
+
+
+	import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
+	import requestIssDetailInfoPopup from '@/pages/unPlanned/coms/requestIssDetailInfoPopup.vue'
+	import requestTop from "@/mycomponents/request/requestTop.vue"
+	
+	export default {
+		components: {
+			comRequestDetailCard,
+			requestIssDetailInfoPopup,
+			requestTop
+		},
+		data() {
+			return {
+				id: '',
+				requestContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			this.getDetail();
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getUnPlannedIssueRequestDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if(res.data.subList.length>0){
+							that.requestContent = res.data;
+							that.subList = res.data.subList;
+							that.detailSource = getDataSource(that.subList);
+						}else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+			openDetail(item) {
+				this.$refs.requestDetailPopup.openPopup(item)
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/unPlanned/request/receiptRequest.vue b/pages/unPlanned/request/receiptRequest.vue
new file mode 100644
index 0000000..2871cb2
--- /dev/null
+++ b/pages/unPlanned/request/receiptRequest.vue
@@ -0,0 +1,395 @@
+<template>
+	<view>
+		<com-empty-view v-if="requestList.length==0"></com-empty-view>
+		<request-filter ref="filter" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
+			:checkedWaitTask="checkedWaitTask">
+		</request-filter>
+		<view v-if="requestList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in requestList" :key="index">
+					<uni-swipe-action-item :right-options="item.options" @click="swipeClick($event,item)">
+						<com-receipt-request-card :dataContent="item" @click='openRequestDetail(item)'>
+						</com-receipt-request-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+			<uni-load-more :status="loadingType" />
+			<requestRecInfoPopup ref='requestInfoPopup'></requestRecInfoPopup>
+		</view>
+		<requestButton @goScan='openScanDetailPopup'></requestButton>
+	</view>
+	<comMessage ref="comMessage"></comMessage>
+</template>
+
+<script>
+	import requestFilter from '@/mycomponents/request/requestFilter.vue'
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comReceiptRequestCard from '@/pages/unPlanned/coms/comReceiptRequestCard.vue'
+	import requestRecInfoPopup from '@/pages/unPlanned/coms/requestRecInfoPopup.vue'
+	import requestButton from '@/mycomponents/button/requestButton.vue'
+
+	import {
+		goHome,
+		updateTitle,
+		clearTirmAndWrap
+	} from '@/common/basic.js';
+
+	import {
+		getUnPlannedReceiptRequestList,
+		unPlannedReceiptRequestApprove,
+		unPlannedReceiptRequestClose,
+		unPlannedReceiptRequestApproveAgree,
+		unPlannedReceiptRequestApproveRefused,
+		unPlannedReceiptRequestHandle,
+		unPlannedReceiptRequestAddAgain
+	} from '@/api/request2.js';
+	import {
+		getDetailOption,
+		getDetailAndApproveOption,
+		getDetailAndApprovePassAndApproveNoOption,
+		getDetailAndHandleOption,
+		getDetailAndAddAndCloseOption,
+		getAddAgainOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			requestFilter,
+			requiredLocation,
+			comReceiptRequestCard,
+			requestRecInfoPopup,
+			requestButton,
+		},
+		data() {
+			return {
+				requestList: [],
+				pageNo: 1,
+				pageSize: 10,
+				status: "1,2,3,4,5,6",
+				totalCount: 0,
+				checkedWaitTask: false,
+				detailOptions: [],
+				detailAndApproveOptions: [],
+				detailAndApprovePassAndApproveNoOption: [],
+				detailAndHandleOption: [],
+				detailAndAddAndCloseOption: [],
+				addAgainOption: [],
+				showOptions: [],
+				fromType: "requestType",
+				loadingType: "nomore",
+
+			};
+		},
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.addAgainOption = getAddAgainOption();
+			this.detailAndApproveOptions = getDetailAndApproveOption()
+			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
+			this.detailAndHandleOption = getDetailAndHandleOption()
+			this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
+
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+		onShow() {
+			this.getList('refresh');
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+
+		mounted() {
+
+		},
+		methods: {
+			requestConfirm(action, item) {},
+
+			openRequestInfoPopup(item) {
+				this.$refs.requestInfoPopup.openPopup(item)
+			},
+			openRequestDetail(item) {
+				uni.navigateTo({
+					url: './receiptRequestDetail?id=' + item.id
+				});
+			},
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.requestList = [];
+				}
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "==",
+					value: this.status
+				})
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getUnPlannedReceiptRequestList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					list.forEach(res => {
+						var options = this.updateOptions(res.status);
+						res.options = options;
+					})
+					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
+					this.pageNo++;
+					updateTitle("计划外入库申请(" + this.totalCount + ")");
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle("计划外入库申请");
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			updateOptions(status) {
+				if (status == "1") {
+					this.showOptions = this.detailAndApproveOptions;
+				} else if (status == "2") {
+					this.showOptions = this.detailAndApprovePassAndApproveNoOption;
+				} else if (status == "3") {
+					this.showOptions = this.detailAndHandleOption;
+				} else if (status == "4") {
+					this.showOptions = this.detailAndAddAndCloseOption;
+				} else if (status == "5") {
+					this.showOptions = this.addAgainOption;
+				} else {
+					this.showOptions = this.detailOptions;
+				}
+				return this.showOptions
+			},
+
+			openScanDetailPopup() {
+				uni.navigateTo({
+					url: "./receiptRequestCreate"
+				})
+			},
+
+			swipeClick(e, dataContent) {
+				var text = clearTirmAndWrap(e.content.text)
+				if (text == "详情") {
+					this.openRequestInfoPopup(dataContent);
+				} else if (text == "处理") {
+					this.showQuestionMessage("确定要处理当前申请吗?", res => {
+						this.unPlannedReceiptRequestHandle(dataContent.id)
+					})
+				} else if (text == "提交审批") {
+					this.showQuestionMessage("确定要审批当前申请吗?", res => {
+						this.unPlannedReceiptRequestApprove(dataContent.id)
+					})
+				} else if (text == "审批通过") {
+					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
+						this.unPlannedReceiptRequestApproveAgree(dataContent.id)
+					})
+				} else if (text == "审批驳回") {
+					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
+						this.unPlannedReceiptRequestApproveRefused(dataContent.id)
+					})
+				} else if (text == "关闭") {
+					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
+						this.unPlannedReceiptRequestClose(dataContent.id)
+					})
+				} else if (text == "重新添加") {
+					this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
+						this.unPlannedReceiptRequestAddAgain(dataContent.id)
+					})
+				}
+			},
+			showQuestionMessage(hint, callBack) {
+				this.$refs.comMessage.showQuestionMessage(hint,
+					res => {
+						if (res) {
+							callBack()
+						}
+					});
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getUnPlannedReceiptRequestList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openRequestDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			unPlannedReceiptRequestApprove(id) {
+				unPlannedReceiptRequestApprove(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请提交审批成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请提交审批失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+
+			},
+
+			unPlannedReceiptRequestClose(id) {
+				unPlannedReceiptRequestClose(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请关闭成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请关闭失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			unPlannedReceiptRequestApproveAgree(id) {
+				unPlannedReceiptRequestApproveAgree(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批通过成功"
+						})
+						this.getList("refresh")
+
+					} else {
+						this.showMessage("申请审批通过失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			unPlannedReceiptRequestApproveRefused(id) {
+				unPlannedReceiptRequestApproveRefused(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批驳回成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批驳回失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			unPlannedReceiptRequestHandle(id) {
+				unPlannedReceiptRequestHandle(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请处理成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请处理失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			unPlannedReceiptRequestAddAgain(id) {
+				unPlannedReceiptRequestAddAgain(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请重新添加成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请重新添加失败")
+					}
+
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/unPlanned/request/receiptRequestCreate.vue b/pages/unPlanned/request/receiptRequestCreate.vue
new file mode 100644
index 0000000..5fbcc64
--- /dev/null
+++ b/pages/unPlanned/request/receiptRequestCreate.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="page-wraper">
+		<view class="" v-if='detailSource.subList.length==0'>
+			<com-blank-view @goScan='goScan(true)'></com-blank-view>
+		</view>
+		<view v-else class="page-wraper">
+			<view class="page-main">
+				<view class="">
+					<view class="" style="margin-left: 20rpx; margin-top: 20rpx;margin-bottom:20rpx;font-size: 30rpx;">
+						目标库位：{{detailSource.toLocationCode}}
+					</view>
+					<view class="flex u-col-center"
+						style="width: 100%;background-color:#fff;margin-bottom: 20rpx;margin-top: 20rpx;">
+						<view class="" style="margin-left: 20rpx;  font-size: 30rpx;flex-shrink: 0;">入库原因：</view>
+						<view style="width: 100%">
+							<uni-data-picker style="background-color:#fff;margin-right: 20rpx;" class='uni-data-picker'
+								placeholder="请选择入库原因" popup-title="入库原因" :localdata="reasonList" @change="reasonChange">
+							</uni-data-picker>
+						</view>
+					</view>
+				</view>
+
+				<u-line />
+				<view v-for="(item, index) in detailSource.subList" :key="index">
+					<item-qty :dataContent="item" :isShowStdPack="false">
+					</item-qty>
+					<u-line />
+				</view>
+				<button class="btn_add" @click="goScan(false)">+去添加</button>
+			</view>
+			<div class="btn_bottom">
+				<view class="" style="display: flex;flex-direction: row;">
+					<view class="">
+						<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+					</view>
+				</view>
+			</div>
+
+			<comMessage ref="comMessage"></comMessage>
+		</view>
+	</view>
+	<comReceiptRequestPopup ref="comIssueRequestPopup" @confirm='requestConfirm' :itemCodeTypeList="itemCodeTypeList"></comReceiptRequestPopup>
+</template>
+
+<script>
+	import {
+		unPlannedReceiptRequestCreate
+	} from '@/api/request2.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+
+	import {
+		goHome,
+		updateTitle,
+		getRemoveOption,
+		getISODateTime,
+		navigateBack,
+		getBatch,
+		deepCopyData,
+		getCurrDateTimes,
+		getCurrDateOneMonthsTimes
+	} from '@/common/basic.js';
+	import {
+		getUnPlannedReceiptReasonList,
+	} from '@/common/directory.js';
+
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import comReceiptRequestPopup from '@/pages/unPlanned/coms/comReceiptRequestPopup.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import comIssueRequestCreator from '@/pages/issue/coms/comIssueRequestCreator.vue'
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+
+	export default {
+		name: '',
+		components: {
+			comBlankView,
+			comReceiptRequestPopup,
+			jobDetailPopup,
+			itemQty
+		},
+		data() {
+			return {
+				subList: [], //接口返回的任务subList
+				detailSource: {
+					subList: []
+				}, //绑定在页面上的数据源
+				reasonList: [], //需求信息
+				reasonText: "",
+				reasonCode: "",
+				itemCodeTypeList:[]
+
+			}
+		},
+		mounted() {
+		},
+		onLoad(option) {
+			this.reasonList = getUnPlannedReceiptReasonList()
+			var typeCode = "UnplannedReceipt"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.itemCodeTypeList = res.itemCodeTypeList;
+					this.goScan(true)
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		
+		},
+		methods: {
+			goScan(editPosition) {
+				this.$refs.comIssueRequestPopup.openRequestPopup(editPosition);
+			},
+
+			//确定需求信息
+			requestConfirm(action, item) {
+
+				if (this.detailSource.subList.length == 0) {
+					this.detailSource = {
+						totalQty: 0,
+						toLocationCode: item.toLocationCode,
+						subList: []
+					}
+
+					var subItem = {
+						toLocationCode: item.toLocationCode,
+						itemCode: item.itemCode,
+						itemName: item.itemName,
+						qty: item.qty,
+						uom: item.uom,
+					}
+					this.detailSource.subList.push(subItem)
+				} else {
+					var result = this.detailSource.subList.filter(res => {
+						if (res.itemCode == item.itemCode) {
+							return res
+						}
+					})
+
+					//没有添加数据
+					if (result.length == 0) {
+						var subItem = {
+							itemCode: item.itemCode,
+							itemName: item.itemName,
+							qty: item.qty,
+							uom: item.uom
+						}
+
+						this.detailSource.subList.push(subItem)
+
+					} else {
+						//有了更新数据
+						result[0].qty = calc.add(result[0].qty,item.qty)
+
+					}
+				}
+				this.caclcQty();
+
+			},
+
+			caclcQty() {
+				var totalQty = 0;
+				this.detailSource.subList.forEach(res => {
+					totalQty = calc.add(totalQty,res.qty)
+				})
+				this.detailSource.totalQty = totalQty;
+			},
+
+			submit() {
+				if (this.reasonText == '') {
+					this.showErrorMessage("请选择入库原因")
+					return;
+				}
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var params = this.setRequestParams()
+				console.log("提交参数", JSON.stringify(params));
+				unPlannedReceiptRequestCreate(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成计划外入库申请<br>" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			setRequestParams() {
+				var subList = []
+				this.detailSource.subList.forEach(detail => {
+					var submitItem = deepCopyData(detail)
+					submitItem.toLocationCode = this.detailSource.toLocationCode;
+					submitItem.reason = this.reasonCode;
+					submitItem.containerNumber = "";
+					submitItem.batch = getBatch();
+					submitItem.inventoryStatus = "OK";
+					console.log("", getBatch())
+					subList.push(submitItem)
+				})
+				this.dataContent.subList = subList
+				this.dataContent.status = "1";
+				this.dataContent.requestTime = getCurrDateTimes();
+				this.dataContent.dueTime = getCurrDateOneMonthsTimes();
+
+				return this.dataContent;
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+			reasonChange(e) {
+				if (e.detail.value.length == 0) {
+					this.reasonCode = ""
+					this.reasonText = ""
+				} else {
+					this.reasonCode = e.detail.value[0].value
+					this.reasonText = e.detail.value[0].text
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/unPlanned/request/receiptRequestDetail.vue b/pages/unPlanned/request/receiptRequestDetail.vue
new file mode 100644
index 0000000..1c7a299
--- /dev/null
+++ b/pages/unPlanned/request/receiptRequestDetail.vue
@@ -0,0 +1,126 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<request-top :dataContent="requestContent"></request-top>
+			</view>
+			<view class="header_item">
+				到仓库代码 : {{requestContent.toWarehouseCode}}
+			</view>
+			<u-line color="#D8D8D8" />
+		</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comRequestDetailCard :dataContent="item" @openDetail="openDetail">
+						</comRequestDetailCard>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<requestRecDetailInfoPopup ref="requestDetailPopup"></requestRecDetailInfoPopup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getUnPlannedReceiptRequestDetail,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource,
+	} from '@/common/detail.js';
+
+
+	import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
+	import requestRecDetailInfoPopup from '@/pages/unPlanned/coms/requestRecDetailInfoPopup.vue'
+	import requestTop from "@/mycomponents/request/requestTop.vue"
+
+	export default {
+		components: {
+			comRequestDetailCard,
+			requestRecDetailInfoPopup,
+			requestTop
+		},
+		data() {
+			return {
+				id: '',
+				requestContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			this.getDetail();
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getUnPlannedReceiptRequestDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.requestContent = res.data;
+							that.subList = res.data.subList;
+							that.subList.forEach(res => {
+								res.fromLocationCode = res.toLocationCode
+							})
+							that.detailSource = getDataSource(that.subList);
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+			openDetail(item) {
+				this.$refs.requestDetailPopup.openPopup(item)
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/plugins/auth.js b/plugins/auth.js
new file mode 100644
index 0000000..3b91c14
--- /dev/null
+++ b/plugins/auth.js
@@ -0,0 +1,60 @@
+import store from '@/store'
+
+function authPermission(permission) {
+  const all_permission = "*:*:*"
+  const permissions = store.getters && store.getters.permissions
+  if (permission && permission.length > 0) {
+    return permissions.some(v => {
+      return all_permission === v || v === permission
+    })
+  } else {
+    return false
+  }
+}
+
+function authRole(role) {
+  const super_admin = "admin"
+  const roles = store.getters && store.getters.roles
+  if (role && role.length > 0) {
+    return roles.some(v => {
+      return super_admin === v || v === role
+    })
+  } else {
+    return false
+  }
+}
+
+export default {
+  // 验证用户是否具备某权限
+  hasPermi(permission) {
+    return authPermission(permission)
+  },
+  // 验证用户是否含有指定权限，只需包含其中一个
+  hasPermiOr(permissions) {
+    return permissions.some(item => {
+      return authPermission(item)
+    })
+  },
+  // 验证用户是否含有指定权限，必须全部拥有
+  hasPermiAnd(permissions) {
+    return permissions.every(item => {
+      return authPermission(item)
+    })
+  },
+  // 验证用户是否具备某角色
+  hasRole(role) {
+    return authRole(role)
+  },
+  // 验证用户是否含有指定角色，只需包含其中一个
+  hasRoleOr(roles) {
+    return roles.some(item => {
+      return authRole(item)
+    })
+  },
+  // 验证用户是否含有指定角色，必须全部拥有
+  hasRoleAnd(roles) {
+    return roles.every(item => {
+      return authRole(item)
+    })
+  }
+}
diff --git a/plugins/index.js b/plugins/index.js
new file mode 100644
index 0000000..d76c141
--- /dev/null
+++ b/plugins/index.js
@@ -0,0 +1,17 @@
+import tab from './tab'
+// import auth from './auth'
+import modal from './modal'
+import time from './time'
+
+export default {
+  install(app) {
+    // 页签操作
+   app.config.globalProperties.$tab = tab
+    // 认证对象
+    // Vue.prototype.$auth = auth
+    // 模态框对象
+    app.config.globalProperties.$modal = modal
+    // 时间对象
+    app.config.globalProperties.$time = time
+  }
+}
diff --git a/plugins/modal.js b/plugins/modal.js
new file mode 100644
index 0000000..5425628
--- /dev/null
+++ b/plugins/modal.js
@@ -0,0 +1,73 @@
+export default {
+  // 消息提示
+  msg(content) {
+    uni.showToast({
+      title: content,
+      icon: 'none'
+    })
+  },
+  // 错误消息
+  msgError(content) {
+    uni.showToast({
+      title: content,
+      icon: 'error'
+    })
+  },
+  // 成功消息
+  msgSuccess(content) {
+    uni.showToast({
+      title: content,
+      icon: 'success'
+    })
+  },
+  // 隐藏消息
+  hideMsg(content) {
+    uni.hideToast()
+  },
+  // 弹出提示
+  alert(content) {
+    uni.showModal({
+      title: '提示',
+      content: content,
+      showCancel: false
+    })
+  },
+  // 确认窗体
+  confirm(content,confirmText,cancelText) {
+    return new Promise((resolve, reject) => {
+      uni.showModal({
+        title: '系统提示',
+        content: content,
+        cancelText: cancelText||'取消',
+        confirmText: confirmText || '确定',
+        success: function(res) {
+          if (res.confirm) {
+            resolve(res.confirm)
+          }
+        }
+      })
+    })
+  },
+  // 提示信息
+  showToast(option) {
+    if (typeof option === "object") {
+      uni.showToast(option)
+    } else {
+      uni.showToast({
+        title: option,
+        icon: "none",
+        duration: 2500
+      })
+    }
+  },
+  // 打开遮罩层
+  loading(content) {
+    uni.showLoading({
+      title: content,
+    })
+  },
+  // 关闭遮罩层
+  closeLoading() {
+    uni.hideLoading()
+  }
+}
diff --git a/plugins/tab.js b/plugins/tab.js
new file mode 100644
index 0000000..294253d
--- /dev/null
+++ b/plugins/tab.js
@@ -0,0 +1,32 @@
+export default {
+  // 关闭所有页面，打开到应用内的某个页面
+  reLaunch(url) {
+    return uni.reLaunch({
+      url: url
+    })
+  },
+  // 跳转到tabBar页面，并关闭其他所有非tabBar页面
+  switchTab(url) {
+    return uni.switchTab({
+      url: url
+    })
+  },
+  // 关闭当前页面，跳转到应用内的某个页面
+  redirectTo(url) {
+    return uni.redirectTo({
+      url: url
+    })
+  },
+  // 保留当前页面，跳转到应用内的某个页面
+  navigateTo(url) {
+    return uni.navigateTo({
+      url: url
+    })
+  },
+  // 关闭当前页面，返回上一页面或多级页面
+  navigateBack(level) {
+    return uni.navigateBack({
+		delta:level
+	})
+  }
+}
diff --git a/plugins/time.js b/plugins/time.js
new file mode 100644
index 0000000..9f8a11c
--- /dev/null
+++ b/plugins/time.js
@@ -0,0 +1,19 @@
+export default {
+  formatDate(timestamp){
+	  // 获取当前时间戳（单位：毫秒）
+	  // var timestamp = Date.now(); // 或者传入特定的时间戳值
+	   timestamp = timestamp ? timestamp :Date.now()
+	  // 创建Date对象并设置时间戳
+	  var dateObj = new Date(timestamp);
+	   
+	  // 提取年份、月份、日期等信息
+	  var year = dateObj.getFullYear();
+	  var month = (dateObj.getMonth() + 1).toString().padStart(2, '0'); // 注意月份从0开始计数，所以需要加1
+	  var day = dateObj.getDate().toString().padStart(2, '0');
+	  var hour = dateObj.getHours().toString().padStart(2, '0');
+	  var minutes = dateObj.getMinutes().toString().padStart(2, '0');
+	  var seconds = dateObj.getSeconds().toString().padStart(2, '0');
+	   
+	  return `${year}-${month}-${day}  ${hour}:${minutes}:${seconds}`
+  }
+}
diff --git a/static/avatar.png b/static/avatar.png
new file mode 100644
index 0000000..cbc3c6f
Binary files /dev/null and b/static/avatar.png differ
diff --git a/static/customicons.ttf b/static/customicons.ttf
new file mode 100644
index 0000000..a3c8ab9
Binary files /dev/null and b/static/customicons.ttf differ
diff --git a/static/icon/black_count.svg b/static/icon/black_count.svg
new file mode 100644
index 0000000..7122e62
--- /dev/null
+++ b/static/icon/black_count.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="45" height="18" viewBox="0 0 45 18"><g><g><g><g></g><g><path d="M3.05930125,3.003348869140625C3.05930125,3.003348869140625,14.44793125,14.392065869140625,14.44793125,14.392065869140625C14.68073125,14.624765869140624,14.68073125,14.977865869140626,14.44793125,15.210665869140625C14.34133125,15.317265869140625,14.19773125,15.369665869140626,14.01923125,15.369665869140626C13.84073125,15.369665869140626,13.69723125,15.317265869140625,13.59253125,15.212565869140626C13.59253125,15.212565869140626,12.01353125,13.635465869140624,12.01353125,13.635465869140624C10.71963125,14.525865869140626,9.36370125,14.977865869140626,7.98450125,14.977865869140626C6.90014125,14.977865869140626,5.83712125,14.708165869140625,4.82842125,14.176665869140624C4.01757125,13.749865869140624,3.23776125,13.152465869140626,2.51034125,12.401765869140625C1.22811825,11.078835869140624,0.54336195,9.724835869140625,0.51620475,9.666635869140624C0.51620475,9.666635869140624,0.51426495,9.662765869140625,0.51426495,9.662765869140625C0.43667225,9.470695869140625,0.43861215,9.278655869140625,0.51620475,9.123465869140624C0.51620475,9.123465869140624,0.52008435,9.117645869140624,0.52008435,9.117645869140624C0.52590395,9.109895869140626,0.5414225500000001,9.082735869140624,0.56082025,9.045875869140625C1.40269825,7.546395869140625,2.52973125,6.225385869140625,3.73630125,5.317555869140625C3.73630125,5.317555869140625,2.24070125,3.821952869140625,2.24070125,3.821952869140625C2.12819125,3.709438869140625,2.06612125,3.5639588691406248,2.06612125,3.412650869140625C2.06612125,3.261344869140625,2.12819125,3.115858869140625,2.24070125,3.003348869140625C2.47348125,2.770571369140625,2.82652125,2.770571369140625,3.05930125,3.003348869140625C3.05930125,3.003348869140625,3.05930125,3.003348869140625,3.05930125,3.003348869140625ZM14.12983125,11.639235869140625C14.92133125,10.682895869140625,15.39073125,9.837095869140626,15.45473125,9.670295869140624C15.57113125,9.511235869140625,15.57303125,9.313355869140626,15.45473125,9.154295869140626C15.31893125,8.886595869140624,12.70413125,3.812045869140625,7.98643125,3.812045869140625C7.59263125,3.812045869140625,7.19303125,3.848895869140625,6.79928125,3.920675869140625C6.79928125,3.920675869140625,6.79540125,3.920675869140625,6.79540125,3.920675869140625C6.64215125,3.959475869140625,6.50830125,4.044815869140625,6.42101125,4.161215869140625C6.32596125,4.287295869140625,6.29492125,4.438605869140625,6.33178125,4.586035869140625C6.40549125,4.876995869140625,6.67512125,5.131115869140626,6.99714125,5.049645869140625C7.31330125,4.979815869140625,7.63730125,4.979815869140625,7.95150125,4.979815869140625C9.42970125,4.979815869140625,10.85733125,5.604435869140625,12.19393125,6.836215869140625C13.21613125,7.778965869140625,13.91643125,8.834225869140624,14.25013125,9.394835869140625C14.11433125,9.635365869140625,13.76513125,10.217295869140624,13.19673125,10.898165869140625C13.10373125,11.010695869140624,13.05903125,11.165895869140625,13.07453125,11.323035869140625C13.09013125,11.480165869140626,13.16193125,11.623695869140626,13.27433125,11.716765869140625C13.27433125,11.716765869140625,13.27823125,11.720695869140625,13.27823125,11.720695869140625C13.39853125,11.800235869140625,13.51683125,11.835095869140625,13.66233125,11.835095869140625C13.82143125,11.835095869140625,14.01153125,11.755565869140625,14.12593125,11.643095869140625C14.12593125,11.643095869140625,14.12983125,11.639235869140625,14.12983125,11.639235869140625C14.12983125,11.639235869140625,14.12983125,11.639235869140625,14.12983125,11.639235869140625ZM6.78377125,9.501765869140625C6.78377125,9.222415869140626,6.90016125,8.923675869140624,7.09220125,8.714175869140625C7.09220125,8.714175869140625,8.77210125,10.394035869140625,8.77210125,10.394035869140625C8.56256125,10.584165869140625,8.263831249999999,10.702495869140625,7.98450125,10.702495869140625C7.33470125,10.702495869140625,6.78377125,10.153495869140624,6.78377125,9.501765869140625C6.78377125,9.501765869140625,6.78377125,9.501765869140625,6.78377125,9.501765869140625ZM3.74216125,11.951895869140625C5.07869125,13.183665869140626,6.50640125,13.808265869140625,7.98456125,13.808265869140625C9.08250125,13.808265869140625,10.14936125,13.461065869140626,11.15813125,12.778235869140625C11.15813125,12.778235869140625,9.58876125,11.208895869140624,9.58876125,11.208895869140624C9.13290125,11.612435869140626,8.56456125,11.833565869140624,7.98456125,11.833565869140624C7.35023125,11.833565869140624,6.75469125,11.587165869140625,6.30854125,11.141035869140625C5.86238125,10.694895869140625,5.61602125,10.099365869140625,5.61602125,9.465035869140625C5.61602125,8.848175869140626,5.83716125,8.279805869140624,6.23870125,7.858865869140625C6.23870125,7.858865869140625,4.55300125,6.173165869140625,4.55300125,6.173165869140625C3.11366125,7.197395869140625,2.14569125,8.619275869140626,1.68595125,9.395195869140625C2.01960125,9.955835869140625,2.71988125,11.011095869140625,3.74216125,11.951895869140625C3.74216125,11.951895869140625,3.74216125,11.951895869140625,3.74216125,11.951895869140625Z" fill-rule="evenodd" fill="#FA5151" fill-opacity="1"/></g></g></g><g><path d="M24.14062,11.482L29.96094,11.482L29.96094,12.482L24.14062,12.482L24.14062,11.482ZM24.14062,10.8375L24.14062,9.93122L29.96094,9.93122L29.96094,10.8375L24.14062,10.8375ZM24.14062,13.1187L29.96094,13.1187L29.96094,14.232L24.14062,14.232L24.14062,13.1187ZM23.26562,9.232L23.26562,15.3297L24.14062,15.3297L24.14062,14.9312L29.96094,14.9312L29.96094,15.275L30.875,15.275L30.875,9.232L23.26562,9.232ZM26.21875,4.22419C26.38672,4.53278,26.56641,4.89997,26.71094,5.232L21.753906,5.232L21.753906,6.01325L23.18359,6.01325L23.18359,8.27497L31.4375,8.27497L31.4375,7.482L24.07031,7.482L24.07031,6.01325L32.2188,6.01325L32.2188,5.232L27.67188,5.232C27.51562,4.85309,27.26172,4.36091,27.02344,3.97809L26.21875,4.22419ZM37.6797,9.20075C38.351600000000005,9.55622,39.1914,10.1109,39.5977,10.5054L40.0547,9.91559C39.648399999999995,9.52106,38.793,9.00153,38.1328,8.6695L37.6797,9.20075ZM38.5664,3.97028C38.4844,4.25544,38.3281,4.65388,38.1719,4.98981L35.543,4.98981L35.543,7.19294L35.5312,7.69294L33.6094,7.69294L33.6094,8.482L35.4102,8.482C35.2305,9.17731,34.8086,9.88044,33.8867,10.4625C34.0781,10.5836,34.4141,10.9273,34.5469,11.1148C35.6484,10.3804,36.1289,9.41559,36.3242,8.482L41.8906,8.482L41.8906,9.81403C41.8906,9.93903,41.8438,9.982,41.675799999999995,9.982C41.5195,9.99763,40.9648,9.99763,40.3906,9.982C40.523399999999995,10.2008,40.6445,10.525,40.6797,10.7515C41.4961,10.7515,42.023399999999995,10.7515,42.3477,10.6187C42.6836,10.4898,42.789100000000005,10.2476,42.789100000000005,9.82575L42.789100000000005,8.482L44.4727,8.482L44.4727,7.69294L42.789100000000005,7.69294L42.789100000000005,4.98981L39.1445,4.98981L39.539100000000005,4.16169L38.5664,3.97028ZM37.761700000000005,6.45075C38.398399999999995,6.78278,39.168,7.30622,39.539100000000005,7.69294L36.4297,7.69294L36.4414,7.20466L36.4414,5.732L41.8906,5.732L41.8906,7.69294L39.5625,7.69294L40.0195,7.10309C39.6211,6.70466,38.8438,6.20856,38.207,5.89997L37.761700000000005,6.45075ZM34.8945,11.232L34.8945,14.232L33.5391,14.232L33.5391,15.0367L44.460899999999995,15.0367L44.460899999999995,14.232L43.113299999999995,14.232L43.113299999999995,11.232L34.8945,11.232ZM35.7344,14.232L35.7344,11.9664L37.3438,11.9664L37.3438,14.232L35.7344,14.232ZM38.1719,14.232L38.1719,11.9664L39.7773,11.9664L39.7773,14.232L38.1719,14.232ZM40.6172,14.232L40.6172,11.9664L42.238299999999995,11.9664L42.238299999999995,14.232L40.6172,14.232Z" fill="#FA5151" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/checkmark-circle.svg b/static/icon/checkmark-circle.svg
new file mode 100644
index 0000000..d16c84e
--- /dev/null
+++ b/static/icon/checkmark-circle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="60" height="60" viewBox="0 0 60 60"><g style="mix-blend-mode:passthrough"><g style="mix-blend-mode:passthrough"></g><g style="mix-blend-mode:passthrough"><path d="M1.7138671875,30.00054375C1.7138671875,14.41054375,14.4095671875,1.71484375,29.9995671875,1.71484375C45.5958671875,1.71484375,58.2853671875,14.41054375,58.2853671875,30.00054375C58.2853671875,45.59064375,45.5896671875,58.28634375,29.9995671875,58.28634375C14.4095671875,58.28634375,1.7138671875,45.59064375,1.7138671875,30.00054375C1.7138671875,30.00054375,1.7138671875,30.00054375,1.7138671875,30.00054375ZM5.8531471875,29.99984375C5.8531471875,43.24534375,16.7540671875,54.14634375,29.9995671875,54.14634375C43.2450671875,54.14634375,54.1461671875,43.24534375,54.1461671875,29.99984375C54.1461671875,16.75424375,43.2450671875,5.85326375,29.9995671875,5.85326375C16.7540671875,5.85326375,5.8531471875,16.75424375,5.8531471875,29.99984375C5.8531471875,29.99984375,5.8531471875,29.99984375,5.8531471875,29.99984375Z" fill-rule="evenodd" fill="#5AC725" fill-opacity="1"/></g><g style="mix-blend-mode:passthrough"><path d="M42.2851953125,21.58265996875C42.2851953125,21.58265996875,25.8673953125,38.13954296875,25.8673953125,38.13954296875C25.8673953125,38.13954296875,17.7216953125,30.00012296875,17.7216953125,30.00012296875C16.893845312499998,29.17229296875,15.6489253125,29.17229296875,14.8210783125,30.00012296875C13.9932343125,30.82797296875,13.9932343125,32.07294296875,14.8210783125,32.90074296875C14.8210783125,32.90074296875,24.4771953125,42.556842968750004,24.4771953125,42.556842968750004C24.894195312500003,42.97384296875,25.4439953125,43.106642968749995,25.993795312499998,43.106642968749995C26.543595312500003,43.106642968749995,27.0996953125,42.967542968749996,27.510495312499998,42.556842968750004C27.510495312499998,42.556842968750004,45.451195312500005,24.61599296875,45.451195312500005,24.61599296875C46.2791953125,23.78814296875,46.2791953125,22.54321296875,45.451195312500005,21.71537096875C44.4906953125,20.89384496875,43.1131953125,20.89384496875,42.2851953125,21.58265996875C42.2851953125,21.58265996875,42.2851953125,21.58265996875,42.2851953125,21.58265996875C42.2851953125,21.58265996875,42.2851953125,21.58265996875,42.2851953125,21.58265996875Z" fill="#5AC725" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/close-circle.svg b/static/icon/close-circle.svg
new file mode 100644
index 0000000..55c1ffe
--- /dev/null
+++ b/static/icon/close-circle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="60" height="60" viewBox="0 0 60 60"><g style="mix-blend-mode:passthrough"><g style="mix-blend-mode:passthrough"></g><g style="mix-blend-mode:passthrough"><path d="M1.7138671875,30.00054375C1.7138671875,14.41264375,14.4053671875,1.71484375,29.9995671875,1.71484375C45.5938671875,1.71484375,58.2853671875,14.41894375,58.2853671875,30.00684375C58.2853671875,45.59484375,45.5938671875,58.29264375,29.9995671875,58.29264375C14.4053671875,58.29264375,1.7138671875,45.58854375,1.7138671875,30.00054375C1.7138671875,30.00054375,1.7138671875,30.00054375,1.7138671875,30.00054375ZM5.8543171875,30.00604375C5.8543171875,43.25064375,16.7551671875,54.15134375,29.9995671875,54.15134375C43.2438671875,54.15134375,54.1448671875,43.24414375,54.1448671875,29.99984375C54.1448671875,16.755443749999998,43.2438671875,5.85452375,29.9995671875,5.85452375C16.7551671875,5.85452375,5.8543171875,16.761643749999998,5.8543171875,30.00604375C5.8543171875,30.00604375,5.8543171875,30.00604375,5.8543171875,30.00604375Z" fill-rule="evenodd" fill="#F56C6C" fill-opacity="1"/></g><g style="mix-blend-mode:passthrough"><path d="M39.3809796875,20.20452953125C38.551579687499995,19.37518253125,37.3138796875,19.37518253125,36.4844796875,20.20452953125C36.4844796875,20.20452953125,29.8622796875,26.82671953125,29.8622796875,26.82671953125C29.8622796875,26.82671953125,23.2400996875,20.20452953125,23.2400996875,20.20452953125C22.4107796875,19.37518253125,21.1730296875,19.37518253125,20.3436896875,20.20452953125C19.5143426875,21.03386953125,19.5143426875,22.27161953125,20.3436896875,23.10093953125C20.3436896875,23.10093953125,26.9658796875,29.72311953125,26.9658796875,29.72311953125C26.9658796875,29.72311953125,20.3436896875,36.35161953125,20.3436896875,36.35161953125C19.5143426875,37.18101953125,19.5143426875,38.418719531250005,20.3436896875,39.24811953125C20.7583596875,39.662719531250005,21.3112596875,39.80101953125,21.8641596875,39.80101953125C22.4170496875,39.80101953125,22.9699496875,39.662719531250005,23.3846296875,39.24811953125C23.3846296875,39.24811953125,30.0004796875,32.62591953125,30.0004796875,32.62591953125C30.0004796875,32.62591953125,36.6227796875,39.24811953125,36.6227796875,39.24811953125C37.0373796875,39.662719531250005,37.5902796875,39.80101953125,38.1431796875,39.80101953125C38.6960796875,39.80101953125,39.2489796875,39.662719531250005,39.6636796875,39.24811953125C40.4930796875,38.418719531250005,40.4930796875,37.18101953125,39.6636796875,36.35161953125C39.6636796875,36.35161953125,32.7587796875,29.86761953125,32.7587796875,29.86761953125C32.7587796875,29.86761953125,39.3809796875,23.24546953125,39.3809796875,23.24546953125C40.210279687500005,22.41611953125,40.210279687500005,21.03386953125,39.3809796875,20.20452953125C39.3809796875,20.20452953125,39.3809796875,20.20452953125,39.3809796875,20.20452953125Z" fill="#F56C6C" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/close-circle2.svg b/static/icon/close-circle2.svg
new file mode 100644
index 0000000..48be751
--- /dev/null
+++ b/static/icon/close-circle2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="12" height="12" viewBox="0 0 12 12"><g><g></g><g><path d="M0.3427734375,6.00010654296875C0.3427734375,2.88251654296875,2.8810734375,0.34295654296875,5.9999234375,0.34295654296875C9.1187734375,0.34295654296875,11.6570734375,2.88377654296875,11.6570734375,6.00135654296875C11.6570734375,9.11895654296875,9.1187734375,11.65845654296875,5.9999234375,11.65845654296875C2.8810734375,11.65845654296875,0.3427734375,9.11770654296875,0.3427734375,6.00010654296875C0.3427734375,6.00010654296875,0.3427734375,6.00010654296875,0.3427734375,6.00010654296875ZM1.1708634375,6.00120654296875C1.1708634375,8.65010654296875,3.3510434375,10.83025654296875,5.9999234375,10.83025654296875C8.6487734375,10.83025654296875,10.8289734375,8.64880654296875,10.8289734375,5.99995654296875C10.8289734375,3.35106654296875,8.6487734375,1.17089154296875,5.9999234375,1.17089154296875C3.3510434375,1.17089154296875,1.1708634375,3.35232654296875,1.1708634375,6.00120654296875C1.1708634375,6.00120654296875,1.1708634375,6.00120654296875,1.1708634375,6.00120654296875Z" fill-rule="evenodd" fill="#909193" fill-opacity="1"/></g><g><path d="M7.8761859375,4.04096694140625C7.7103259375,3.87509764140625,7.4627759375,3.87509764140625,7.2969059375,4.04096694140625C7.2969059375,4.04096694140625,5.9724659375,5.36540494140625,5.9724659375,5.36540494140625C5.9724659375,5.36540494140625,4.6480209375,4.04096694140625,4.6480209375,4.04096694140625C4.4821559375,3.87509764140625,4.2346069375,3.87509764140625,4.0687379375,4.04096694140625C3.9028686375,4.20683594140625,3.9028686375,4.45438494140625,4.0687379375,4.62024994140625C4.0687379375,4.62024994140625,5.3931759375,5.94469494140625,5.3931759375,5.94469494140625C5.3931759375,5.94469494140625,4.0687379375,7.27039494140625,4.0687379375,7.27039494140625C3.9028686375,7.43626494140625,3.9028686375,7.68380494140625,4.0687379375,7.84967494140625C4.1516719375,7.93261494140625,4.2622519375,7.96025494140625,4.3728309375,7.96025494140625C4.4834109375,7.96025494140625,4.5939909375,7.93261494140625,4.6769259375,7.84967494140625C4.6769259375,7.84967494140625,6.0001059375,6.52523494140625,6.0001059375,6.52523494140625C6.0001059375,6.52523494140625,7.3245459375,7.84967494140625,7.3245459375,7.84967494140625C7.407485937500001,7.93261494140625,7.5180559375,7.96025494140625,7.6286359375,7.96025494140625C7.7392159375,7.96025494140625,7.8497959375,7.93261494140625,7.9327359375,7.84967494140625C8.0986059375,7.68380494140625,8.0986059375,7.43626494140625,7.9327359375,7.27039494140625C7.9327359375,7.27039494140625,6.5517459375,5.97359494140625,6.5517459375,5.97359494140625C6.5517459375,5.97359494140625,7.8761859375,4.64915494140625,7.8761859375,4.64915494140625C8.042055937499999,4.48328494140625,8.042055937499999,4.20683594140625,7.8761859375,4.04096694140625C7.8761859375,4.04096694140625,7.8761859375,4.04096694140625,7.8761859375,4.04096694140625Z" fill="#909193" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/close.svg b/static/icon/close.svg
new file mode 100644
index 0000000..e6a2272
--- /dev/null
+++ b/static/icon/close.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="60" height="60" viewBox="0 0 60 60"><defs><clipPath id="master_svg0_162_6627/146_3705"><rect x="0" y="0" width="60" height="60" rx="0"/></clipPath></defs><g style="mix-blend-mode:passthrough"><g style="mix-blend-mode:passthrough" clip-path="url(#master_svg0_162_6627/146_3705)"><g style="mix-blend-mode:passthrough"><path d="M21.96037346875,36.7929L36.96038046875,21.792893Q37.02998046875,21.723249,37.11188046875,21.66853Q37.19378046875,21.613812,37.28478046875,21.576121Q37.37578046875,21.538429999999998,37.47238046875,21.519215Q37.56898046875,21.5,37.66748046875,21.5Q37.76598046875,21.5,37.86258046875,21.519215Q37.95918046875,21.538429999999998,38.05018046875,21.576121Q38.14118046875,21.613812,38.22308046875,21.66853Q38.30498046875,21.723249,38.37458046875,21.792893Q38.44418046875,21.862537,38.49898046875,21.94443Q38.55368046875,22.026322,38.59138046875,22.117317Q38.629080468750004,22.208311,38.64828046875,22.30491Q38.66748046875,22.4015086,38.66748046875,22.4999999650844Q38.66748046875,22.5984914,38.64828046875,22.69509Q38.629080468750004,22.791689,38.59138046875,22.882683Q38.55368046875,22.973678,38.49898046875,23.05557Q38.44418046875,23.137463,38.37458046875,23.207107L23.37458746875,38.2071Q23.30494346875,38.2767,23.22305046875,38.3315Q23.14115846875,38.3862,23.05016346875,38.4239Q22.95916946875,38.461600000000004,22.86257046875,38.4808Q22.76597186875,38.5,22.6674805036656,38.5Q22.56898906875,38.5,22.47239046875,38.4808Q22.37579146875,38.461600000000004,22.28479746875,38.4239Q22.19380246875,38.3862,22.11191046875,38.3315Q22.03001746875,38.2767,21.96037346875,38.2071Q21.89072946875,38.1375,21.83601046875,38.0556Q21.78129246875,37.9737,21.74360146875,37.8827Q21.705910468749998,37.7917,21.68669546875,37.6951Q21.66748046875,37.5985,21.66748046875,37.5Q21.66748046875,37.4015,21.68669546875,37.3049Q21.705910468749998,37.2083,21.74360146875,37.1173Q21.78129246875,37.0263,21.83601046875,36.9444Q21.89072946875,36.8625,21.96037346875,36.7929ZM23.66748046875,37.5Q23.66748046875,37.5985,23.64826546875,37.6951Q23.629050468750002,37.7917,23.59135946875,37.8827Q23.55366846875,37.9737,23.49895046875,38.0556Q23.44423146875,38.1375,23.37458746875,38.2071Q23.30494346875,38.2767,23.22305046875,38.3315Q23.14115846875,38.3862,23.05016346875,38.4239Q22.95916946875,38.461600000000004,22.86257046875,38.4808Q22.76597186875,38.5,22.66748046875,38.5Q22.56898906875,38.5,22.47239046875,38.4808Q22.37579146875,38.461600000000004,22.28479746875,38.4239Q22.19380246875,38.3862,22.11191046875,38.3315Q22.03001746875,38.2767,21.96037346875,38.2071Q21.89072946875,38.1375,21.83601046875,38.0556Q21.78129246875,37.9737,21.74360146875,37.8827Q21.705910468749998,37.7917,21.68669546875,37.6951Q21.66748046875,37.5985,21.66748046875,37.5Q21.66748046875,37.4015,21.68669546875,37.3049Q21.705910468749998,37.2083,21.74360146875,37.1173Q21.78129246875,37.0263,21.83601046875,36.9444Q21.89072946875,36.8625,21.96037346875,36.7929Q22.03001746875,36.7232,22.11191046875,36.6685Q22.19380246875,36.6138,22.28479746875,36.5761Q22.37579146875,36.538399999999996,22.47239046875,36.5192Q22.56898906875,36.5,22.66748046875,36.5Q22.76597186875,36.5,22.86257046875,36.5192Q22.95916946875,36.538399999999996,23.05016346875,36.5761Q23.14115846875,36.6138,23.22305046875,36.6685Q23.30494346875,36.7232,23.37458746875,36.7929Q23.44423146875,36.8625,23.49895046875,36.9444Q23.55366846875,37.0263,23.59135946875,37.1173Q23.629050468750002,37.2083,23.64826546875,37.3049Q23.66748046875,37.4015,23.66748046875,37.5ZM38.66748046875,22.5Q38.66748046875,22.5984914,38.64828046875,22.69509Q38.629080468750004,22.791689,38.59138046875,22.882683Q38.55368046875,22.973678,38.49898046875,23.05557Q38.44418046875,23.137463,38.37458046875,23.207107Q38.30498046875,23.276751,38.22308046875,23.33147Q38.14118046875,23.386188,38.05018046875,23.423879Q37.95918046875,23.461570000000002,37.86258046875,23.480785Q37.76598046875,23.5,37.66748046875,23.5Q37.56898046875,23.5,37.47238046875,23.480785Q37.37578046875,23.461570000000002,37.28478046875,23.423879Q37.19378046875,23.386188,37.11188046875,23.33147Q37.02998046875,23.276751,36.96038046875,23.207107Q36.89068046875,23.137463,36.83598046875,23.05557Q36.78128046875,22.973678,36.74358046875,22.882683Q36.705880468749996,22.791689,36.68668046875,22.69509Q36.66748046875,22.5984914,36.66748046875,22.5Q36.66748046875,22.4015086,36.68668046875,22.30491Q36.705880468749996,22.208311,36.74358046875,22.117317Q36.78128046875,22.026322,36.83598046875,21.94443Q36.89068046875,21.862537,36.96038046875,21.792893Q37.02998046875,21.723249,37.11188046875,21.66853Q37.19378046875,21.613812,37.28478046875,21.576121Q37.37578046875,21.538429999999998,37.47238046875,21.519215Q37.56898046875,21.5,37.66748046875,21.5Q37.76598046875,21.5,37.86258046875,21.519215Q37.95918046875,21.538429999999998,38.05018046875,21.576121Q38.14118046875,21.613812,38.22308046875,21.66853Q38.30498046875,21.723249,38.37458046875,21.792893Q38.44418046875,21.862537,38.49898046875,21.94443Q38.55368046875,22.026322,38.59138046875,22.117317Q38.629080468750004,22.208311,38.64828046875,22.30491Q38.66748046875,22.4015086,38.66748046875,22.5Z" fill="#333333" fill-opacity="1"/></g><g style="mix-blend-mode:passthrough"><path d="M36.96038046875,38.2071L21.96037346875,23.207107Q21.89072946875,23.137463,21.83601046875,23.05557Q21.78129246875,22.973678,21.74360146875,22.882683Q21.705910468749998,22.791689,21.68669546875,22.69509Q21.66748046875,22.5984914,21.66748046875,22.4999999650844Q21.66748046875,22.4015086,21.68669546875,22.30491Q21.705910468749998,22.208311,21.74360146875,22.117317Q21.78129246875,22.026322,21.83601046875,21.94443Q21.89072946875,21.862537,21.96037346875,21.792893Q22.03001746875,21.723249,22.11191046875,21.66853Q22.19380246875,21.613812,22.28479746875,21.576121Q22.37579146875,21.538429999999998,22.47239046875,21.519215Q22.56898906875,21.5,22.6674805036656,21.5Q22.76597186875,21.5,22.86257046875,21.519215Q22.95916946875,21.538429999999998,23.05016346875,21.576121Q23.14115846875,21.613812,23.22305046875,21.66853Q23.30494346875,21.723249,23.37458746875,21.792893L38.37458046875,36.7929Q38.44418046875,36.8625,38.49898046875,36.9444Q38.55368046875,37.0263,38.59138046875,37.1173Q38.629080468750004,37.2083,38.64828046875,37.3049Q38.66748046875,37.4015,38.66748046875,37.5Q38.66748046875,37.5985,38.64828046875,37.6951Q38.629080468750004,37.7917,38.59138046875,37.8827Q38.55368046875,37.9737,38.49898046875,38.0556Q38.44418046875,38.1375,38.37458046875,38.2071Q38.30498046875,38.2767,38.22308046875,38.3315Q38.14118046875,38.3862,38.05018046875,38.4239Q37.95918046875,38.461600000000004,37.86258046875,38.4808Q37.76598046875,38.5,37.66748046875,38.5Q37.56898046875,38.5,37.47238046875,38.4808Q37.37578046875,38.461600000000004,37.28478046875,38.4239Q37.19378046875,38.3862,37.11188046875,38.3315Q37.02998046875,38.2767,36.96038046875,38.2071ZM38.66748046875,37.5Q38.66748046875,37.5985,38.64828046875,37.6951Q38.629080468750004,37.7917,38.59138046875,37.8827Q38.55368046875,37.9737,38.49898046875,38.0556Q38.44418046875,38.1375,38.37458046875,38.2071Q38.30498046875,38.2767,38.22308046875,38.3315Q38.14118046875,38.3862,38.05018046875,38.4239Q37.95918046875,38.461600000000004,37.86258046875,38.4808Q37.76598046875,38.5,37.66748046875,38.5Q37.56898046875,38.5,37.47238046875,38.4808Q37.37578046875,38.461600000000004,37.28478046875,38.4239Q37.19378046875,38.3862,37.11188046875,38.3315Q37.02998046875,38.2767,36.96038046875,38.2071Q36.89068046875,38.1375,36.83598046875,38.0556Q36.78128046875,37.9737,36.74358046875,37.8827Q36.705880468749996,37.7917,36.68668046875,37.6951Q36.66748046875,37.5985,36.66748046875,37.5Q36.66748046875,37.4015,36.68668046875,37.3049Q36.705880468749996,37.2083,36.74358046875,37.1173Q36.78128046875,37.0263,36.83598046875,36.9444Q36.89068046875,36.8625,36.96038046875,36.7929Q37.02998046875,36.7232,37.11188046875,36.6685Q37.19378046875,36.6138,37.28478046875,36.5761Q37.37578046875,36.538399999999996,37.47238046875,36.5192Q37.56898046875,36.5,37.66748046875,36.5Q37.76598046875,36.5,37.86258046875,36.5192Q37.95918046875,36.538399999999996,38.05018046875,36.5761Q38.14118046875,36.6138,38.22308046875,36.6685Q38.30498046875,36.7232,38.37458046875,36.7929Q38.44418046875,36.8625,38.49898046875,36.9444Q38.55368046875,37.0263,38.59138046875,37.1173Q38.629080468750004,37.2083,38.64828046875,37.3049Q38.66748046875,37.4015,38.66748046875,37.5ZM23.66748046875,22.5Q23.66748046875,22.5984914,23.64826546875,22.69509Q23.629050468750002,22.791689,23.59135946875,22.882683Q23.55366846875,22.973678,23.49895046875,23.05557Q23.44423146875,23.137463,23.37458746875,23.207107Q23.30494346875,23.276751,23.22305046875,23.33147Q23.14115846875,23.386188,23.05016346875,23.423879Q22.95916946875,23.461570000000002,22.86257046875,23.480785Q22.76597186875,23.5,22.66748046875,23.5Q22.56898906875,23.5,22.47239046875,23.480785Q22.37579146875,23.461570000000002,22.28479746875,23.423879Q22.19380246875,23.386188,22.11191046875,23.33147Q22.03001746875,23.276751,21.96037346875,23.207107Q21.89072946875,23.137463,21.83601046875,23.05557Q21.78129246875,22.973678,21.74360146875,22.882683Q21.705910468749998,22.791689,21.68669546875,22.69509Q21.66748046875,22.5984914,21.66748046875,22.5Q21.66748046875,22.4015086,21.68669546875,22.30491Q21.705910468749998,22.208311,21.74360146875,22.117317Q21.78129246875,22.026322,21.83601046875,21.94443Q21.89072946875,21.862537,21.96037346875,21.792893Q22.03001746875,21.723249,22.11191046875,21.66853Q22.19380246875,21.613812,22.28479746875,21.576121Q22.37579146875,21.538429999999998,22.47239046875,21.519215Q22.56898906875,21.5,22.66748046875,21.5Q22.76597186875,21.5,22.86257046875,21.519215Q22.95916946875,21.538429999999998,23.05016346875,21.576121Q23.14115846875,21.613812,23.22305046875,21.66853Q23.30494346875,21.723249,23.37458746875,21.792893Q23.44423146875,21.862537,23.49895046875,21.94443Q23.55366846875,22.026322,23.59135946875,22.117317Q23.629050468750002,22.208311,23.64826546875,22.30491Q23.66748046875,22.4015086,23.66748046875,22.5Z" fill="#333333" fill-opacity="1"/></g></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/data-checkbox.png b/static/icon/data-checkbox.png
new file mode 100644
index 0000000..748bdcb
Binary files /dev/null and b/static/icon/data-checkbox.png differ
diff --git a/static/icon/error-circle.svg b/static/icon/error-circle.svg
new file mode 100644
index 0000000..effaa05
--- /dev/null
+++ b/static/icon/error-circle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="60" height="60" viewBox="0 0 60 60"><g style="mix-blend-mode:passthrough"><g style="mix-blend-mode:passthrough"></g><g style="mix-blend-mode:passthrough"><path d="M28.0673828125,36.973190625C28.0673828125,37.951890625000004,28.8578028125,38.742390625,29.8364128125,38.742390625C30.8150328125,38.742390625,31.6054528125,37.945590625,31.6054528125,36.973190625C31.6054528125,36.973190625,31.6054528125,13.044620625,31.6054528125,13.044620625C31.6054528125,12.065897625,30.8150328125,11.275390625,29.8364128125,11.275390625C28.8578028125,11.275390625,28.0673828125,12.065897625,28.0673828125,13.044620625C28.0673828125,13.044620625,28.0673828125,36.973190625,28.0673828125,36.973190625C28.0673828125,36.973190625,28.0673828125,36.973190625,28.0673828125,36.973190625ZM29.8615228125,47.469390625C28.9017328125,47.469390625,28.1238600125,46.691390625,28.1238600125,45.731390625C28.1238600125,44.771690625,28.9017328125,43.993690625,29.8615228125,43.993690625C30.8213328125,43.993690625,31.5991828125,44.771690625,31.5991828125,45.731390625C31.5991828125,46.691390625,30.8213328125,47.469390625,29.8615228125,47.469390625C29.8615228125,47.469390625,29.8615228125,47.469390625,29.8615228125,47.469390625Z" fill-rule="evenodd" fill="#3C9CFF" fill-opacity="1"/></g><g style="mix-blend-mode:passthrough"><path d="M50.0045671875,10.0016471875C52.6018671875,12.5990671875,54.6406671875,15.6230671875,56.0645671875,18.9920671875C57.5388671875,22.4803671875,58.2853671875,26.1881671875,58.2853671875,30.0025671875C58.2853671875,33.8170671875,57.5325671875,37.5250671875,56.0583671875,41.0133671875C54.6343671875,44.3823671875,52.5955671875,47.4063671875,49.9983671875,50.0038671875C47.4013671875,52.6011671875,44.3775671875,54.6401671875,41.0088671875,56.0643671875C37.5211671875,57.5386671875,33.8198671875,58.2853671875,29.9995671875,58.2853671875C26.1854671875,58.2853671875,22.4780671875,57.5386671875,18.9901671875,56.0643671875C15.6214671875,54.6401671875,12.5978671875,52.6011671875,10.0007171875,50.0038671875C7.4036371875,47.4063671875,5.3648371875,44.3823671875,3.9408371875,41.0133671875C2.4603751875,37.5250671875,1.7138671875,33.8235671875,1.7138671875,30.0025671875C1.7138671875,26.1881671875,2.4603751875,22.4803671875,3.9408371875,18.9857671875C5.3648371875,15.6167671875,7.4036371875,12.5927671875,10.0007171875,9.9953671875C12.5978671875,7.3979871875,15.6214671875,5.3589871875,18.9901671875,3.9348171875C22.4780671875,2.4604571875,26.1792671875,1.7138671875,29.9995671875,1.7138671875C33.8198671875,1.7138671875,37.5211671875,2.4604571875,41.0153671875,3.9410871875C44.3838671875,5.365267187500001,47.4075671875,7.4042671875,50.0045671875,10.0016471875C50.0045671875,10.0016471875,50.0045671875,10.0016471875,50.0045671875,10.0016471875ZM5.5655871875,30.0030671875C5.5655871875,43.4793671875,16.5247671875,54.4398671875,29.9995671875,54.4398671875C43.4743671875,54.4398671875,54.4335671875,43.4793671875,54.4335671875,30.0030671875C54.4335671875,16.526867187500002,43.4680671875,5.5664171875,29.9995671875,5.5664171875C16.5310671875,5.5664171875,5.5655871875,16.526867187500002,5.5655871875,30.0030671875C5.5655871875,30.0030671875,5.5655871875,30.0030671875,5.5655871875,30.0030671875Z" fill-rule="evenodd" fill="#3C9CFF" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/icon_customer.svg b/static/icon/icon_customer.svg
new file mode 100644
index 0000000..1ec2604
--- /dev/null
+++ b/static/icon/icon_customer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="40" height="40" viewBox="0 0 40 40"><defs><clipPath id="master_svg0_1105_10939"><rect x="0" y="0" width="40" height="40" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_1105_10939)"><g><path d="M20,21C20.26532,21,20.52376,21.0857187,20.73722,21.244431C20.95089,21.403143,21.10826,21.626813,21.18629,21.882181L23.94543,30.911160000000002C24.00484,31.106,24.01592,31.3125,23.97779,31.5125C23.93989,31.7128,23.85389,31.9005,23.727330000000002,32.0594L20.96818,35.531C20.85181,35.6774,20.70441,35.795500000000004,20.53662,35.876599999999996C20.36883,35.9578,20.185299999999998,36,19.99911,36C19.81301,36,19.62928,35.9578,19.46153,35.876599999999996C19.29381,35.795500000000004,19.14632,35.6774,19.03004,35.531L16.272665,32.0594C16.146123,31.9005,16.0601214,31.7128,16.0221075,31.5125C15.9840954,31.3125,15.995221,31.106,16.0545578,30.911160000000002L18.81371,21.882181C18.89181,21.626813,19.04917,21.403143,19.26266,21.244431C19.47616,21.0857187,19.73459,21,20,21ZM18.62042,31.012900000000002L20,32.7487L21.3778,31.012900000000002L20,26.50025L18.62042,31.012900000000002Z" fill="#2196F3" fill-opacity="1"/></g><g><path d="M20,4C18.031,4,16.142699999999998,4.7577490000000004,14.7504,6.10655C13.35813,7.455360000000001,12.57597,9.284749999999999,12.57597,11.19225C12.57597,13.09975,13.35813,14.9291,14.7504,16.277900000000002C16.142699999999998,17.6268,18.031,18.3845,20,18.3845C21.969,18.3845,23.8574,17.6268,25.2495,16.277900000000002C26.6419,14.9291,27.424,13.09975,27.424,11.19225C27.424,9.284749999999999,26.6419,7.455360000000001,25.2495,6.10655C23.8574,4.7577490000000004,21.969,4,20,4ZM15.3052,11.19225C15.3052,9.985479999999999,15.8,8.828140000000001,16.680799999999998,7.974819999999999C17.5616,7.12151,18.7563,6.64213,20.002000000000002,6.64213C21.2475,6.64213,22.4421,7.12151,23.3231,7.974819999999999C24.2039,8.828140000000001,24.6987,9.985479999999999,24.6987,11.19225C24.6987,12.39902,24.2039,13.55637,23.3231,14.4097C22.4421,15.263,21.2475,15.7424,20.002000000000002,15.7424C18.7563,15.7424,17.5616,15.263,16.680799999999998,14.4097C15.8,13.55637,15.3052,12.39902,15.3052,11.19225ZM20,20.1472C16.0218,20.1472,12.20645,21.6782,9.39339,24.4034C6.58036,27.1286,5,30.8247,5,34.6789C5,35.0293,5.143669,35.3652,5.399399,35.6131C5.65513,35.8608,6.00198,36,6.36364,36C6.72529,36,7.07214,35.8608,7.32787,35.6131C7.583600000000001,35.3652,7.72727,35.0293,7.72727,34.6789C7.72727,31.5256,9.02029,28.5013,11.321860000000001,26.2718C13.62346,24.042,16.7451,22.7894,20,22.7894C23.255,22.7894,26.3765,24.042,28.6781,26.2718C30.9797,28.5013,32.2727,31.5256,32.2727,34.6789C32.2727,35.0293,32.416399999999996,35.3652,32.6721,35.6131C32.927800000000005,35.8608,33.2748,36,33.636399999999995,36C33.998000000000005,36,34.3447,35.8608,34.6006,35.6131C34.856300000000005,35.3652,35,35.0293,35,34.6789C35,32.7705,34.6121,30.8809,33.8582,29.1177C33.104299999999995,27.3548,31.9995,25.7528,30.6067,24.4034C29.2138,23.054,27.5601,21.9835,25.7402,21.2534C23.9205,20.523,21.9697,20.1472,20,20.1472Z" fill="#777E94" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/icon_date.svg b/static/icon/icon_date.svg
new file mode 100644
index 0000000..fd7b17c
--- /dev/null
+++ b/static/icon/icon_date.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="40" height="40" viewBox="0 0 40 40"><defs><clipPath id="master_svg0_1105_10946"><rect x="0" y="0" width="40" height="40" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_1105_10946)"><g style="mix-blend-mode:passthrough"><g><path d="M26.366163212585448,19.293422998413085C26.630463212585447,19.565976998413085,26.77906321258545,19.935438998413087,26.77906321258545,20.320638998413084C26.77906321258545,20.705828998413086,26.630463212585447,21.075298998413086,26.366163212585448,21.347848998413085L19.20898321258545,28.717108998413085C19.077873212585448,28.852268998413088,18.922193212585448,28.959238998413085,18.75082321258545,29.03233899841309C18.579473212585448,29.10553899841309,18.39578321258545,29.143238998413086,18.21028321258545,29.143238998413086C18.024783212585447,29.143238998413086,17.841113212585448,29.10553899841309,17.669753212585448,29.03233899841309C17.49840321258545,28.959238998413085,17.342723212585447,28.852268998413088,17.211613212585448,28.717108998413085L13.633029212585448,25.034648998413086C13.368170212585449,24.762018998413087,13.21936321258545,24.391968998413084,13.21936321258545,24.006408998413086C13.21936321258545,23.620588998413087,13.368170212585449,23.250788998413086,13.633029212585448,22.978158998413086C13.897913212585449,22.705268998413086,14.257143212585449,22.552028998413086,14.631733212585448,22.552028998413086C15.00632321258545,22.552028998413086,15.36554321258545,22.705268998413086,15.63043321258545,22.978158998413086L18.20925321258545,25.633408998413085L24.36866321258545,19.293422998413085C24.49986321258545,19.158321998413086,24.65546321258545,19.051129998413085,24.826963212585447,18.977997998413088C24.99836321258545,18.904864498413087,25.181863212585448,18.867238998413086,25.36756321258545,18.867238998413086C25.55306321258545,18.867238998413086,25.73646321258545,18.904864498413087,25.907863212585447,18.977997998413088C26.07936321258545,19.051129998413085,26.23496321258545,19.158321998413086,26.366163212585448,19.293422998413085Z" fill="#1677FF" fill-opacity="1"/></g><g><path d="M13.83635,3C14.6144,3,15.2481,3.650362,15.2481,4.4536L15.2481,5.433450000000001L24.7518,5.433450000000001L24.7518,4.4536C24.7518,4.06809,24.9006,3.69835,25.1654,3.425745C25.4302,3.153139,25.7891,3,26.1636,3C26.538,3,26.8972,3.153139,27.162,3.425745C27.4268,3.69835,27.5753,4.06809,27.5753,4.4536L27.5753,5.433450000000001L33.099199999999996,5.433450000000001C34.7012,5.433450000000001,36,6.76859,36,8.42032L36,33.0132C36,34.6627,34.703199999999995,36,33.099199999999996,36L6.90091,36C5.29882,36,4,34.664699999999996,4,33.015299999999996L4,8.42032C4,6.77076,5.29674,5.433450000000001,6.90091,5.433450000000001L12.42247,5.433450000000001L12.42247,4.4536C12.42247,3.650362,13.0562,3,13.83635,3ZM24.7541,8.23297L15.246,8.23297L15.246,10.79992C15.246,10.99081,15.2095,11.17984,15.1386,11.35619C15.0676,11.53256,14.9636,11.69281,14.8325,11.82778C14.7014,11.96275,14.5458,12.06984,14.3745,12.14289C14.2032,12.21592,14.0196,12.25352,13.83424,12.25352C13.64884,12.25352,13.46527,12.21592,13.29398,12.14289C13.12271,12.06984,12.96708,11.96275,12.83599,11.82778C12.70488,11.69281,12.6009,11.53256,12.52995,11.35619C12.45899,11.17984,12.42247,10.99081,12.42247,10.79992L12.42247,8.23297L6.90091,8.23297C6.85267,8.23297,6.80636,8.25271,6.77225,8.28783C6.73812,8.322980000000001,6.7189499999999995,8.37063,6.7189499999999995,8.42032L6.7189499999999995,14.1594L33.281099999999995,14.1594L33.281099999999995,8.42247C33.281099999999995,8.372779999999999,33.2618,8.32512,33.2277,8.290009999999999C33.1935,8.25486,33.147400000000005,8.23512,33.099199999999996,8.23512L27.5776,8.23512L27.5776,10.80209C27.5776,11.1876,27.4288,11.55732,27.164,11.82992C26.8992,12.10253,26.5403,12.25569,26.1658,12.25569C25.7914,12.25569,25.4322,12.10253,25.1674,11.82992C24.9027,11.55732,24.7541,11.1876,24.7541,10.80209L24.7541,8.23297ZM6.7189499999999995,16.961100000000002L6.7189499999999995,33.0132C6.7189499999999995,33.1166,6.80051,33.2006,6.90091,33.2006L33.099199999999996,33.2006C33.147400000000005,33.2006,33.1935,33.1807,33.2277,33.1455C33.2618,33.1104,33.281099999999995,33.062799999999996,33.281099999999995,33.0132L33.281099999999995,16.961100000000002L6.7189499999999995,16.961100000000002Z" fill="#777E94" fill-opacity="1"/></g></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/icon_eye-fill.svg b/static/icon/icon_eye-fill.svg
new file mode 100644
index 0000000..6cabb84
--- /dev/null
+++ b/static/icon/icon_eye-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><g><g><g></g><g><path d="M6.6651164375,9.0937666015625C6.9835384375,9.4121766015625,7.4476484375,9.5365266015625,7.8826084375,9.4199666015625C8.3175784375,9.3034066015625,8.657318437499999,8.9636566015625,8.7738584375,8.5286866015625C8.8904084375,8.0937166015625,8.7660384375,7.6296166015625,8.4476084375,7.3112036015625C8.1291884375,6.9927911015625,7.6650884375,6.8684426015625,7.2301184375,6.9849994015625C6.7951534375,7.1015556015625,6.4554114375,7.4413096015625,6.3388698375,7.8762766015625C6.2223283375,8.3112466015625,6.3466928375,8.7753466015625,6.6651164375,9.0937666015625C6.6651164375,9.0937666015625,6.6651164375,9.0937666015625,6.6651164375,9.0937666015625C6.6651164375,9.0937666015625,6.6651164375,9.0937666015625,6.6651164375,9.0937666015625Z" fill="#0CC2B6" fill-opacity="1"/></g><g><path d="M7.542870000000028,2.5142822265625C12.295100000000028,2.5142822265625,14.923700000000029,7.6620522265625,15.031500000000028,7.8791422265625C15.103800000000028,8.0238622265625,15.103800000000028,8.2039222265625,15.031500000000028,8.383992226562501C15.027000000000028,8.3913622265625,15.018200000000029,8.407172226562501,15.005200000000029,8.430692226562499C14.702800000000028,8.9763122265625,12.098700000000028,13.6747822265625,7.542870000000028,13.6747822265625C2.7905500000000285,13.6747822265625,0.16197200000002843,8.5623722265625,0.05427120000002842,8.3469622265625C-0.018090399999971578,8.2022422265625,-0.018090399999971578,8.0221822265625,0.05427120000002842,7.8421122265625C0.16197200000002843,7.6267122265625,2.825890000000028,2.5142822265625,7.542870000000028,2.5142822265625C7.542870000000028,2.5142822265625,7.542870000000028,2.5142822265625,7.542870000000028,2.5142822265625ZM7.556330000000028,10.5430122265625C8.852070000000028,10.5430122265625,9.897130000000029,9.4996822265625,9.897130000000029,8.2022122265625C9.897130000000029,6.9047522265625,8.853800000000028,5.8614022265625,7.556330000000028,5.8614022265625C6.258860000000029,5.8614022265625,5.2155100000000285,6.9047522265625,5.2155100000000285,8.2022122265625C5.2155100000000285,9.4996822265625,6.260540000000028,10.5430122265625,7.556330000000028,10.5430122265625C7.556330000000028,10.5430122265625,7.556330000000028,10.5430122265625,7.556330000000028,10.5430122265625Z" fill-rule="evenodd" fill="#0CC2B6" fill-opacity="1"/></g></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/icon_eye-off-outline.svg b/static/icon/icon_eye-off-outline.svg
new file mode 100644
index 0000000..a99c7e5
--- /dev/null
+++ b/static/icon/icon_eye-off-outline.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><g><g><g></g><g><path d="M3.05930125,2.003348869140625C3.05930125,2.003348869140625,14.44793125,13.392065869140625,14.44793125,13.392065869140625C14.68073125,13.624765869140624,14.68073125,13.977865869140626,14.44793125,14.210665869140625C14.34133125,14.317265869140625,14.19773125,14.369665869140626,14.01923125,14.369665869140626C13.84073125,14.369665869140626,13.69723125,14.317265869140625,13.59253125,14.212565869140626C13.59253125,14.212565869140626,12.01353125,12.635465869140624,12.01353125,12.635465869140624C10.71963125,13.525865869140626,9.36370125,13.977865869140626,7.98450125,13.977865869140626C6.90014125,13.977865869140626,5.83712125,13.708165869140625,4.82842125,13.176665869140624C4.01757125,12.749865869140624,3.23776125,12.152465869140626,2.51034125,11.401765869140625C1.22811825,10.078835869140624,0.54336195,8.724835869140625,0.51620475,8.666635869140624C0.51620475,8.666635869140624,0.51426495,8.662765869140625,0.51426495,8.662765869140625C0.43667225,8.470695869140625,0.43861215,8.278655869140625,0.51620475,8.123465869140624C0.51620475,8.123465869140624,0.52008435,8.117645869140624,0.52008435,8.117645869140624C0.52590395,8.109895869140626,0.5414225500000001,8.082735869140624,0.56082025,8.045875869140625C1.40269825,6.546395869140625,2.52973125,5.225385869140625,3.73630125,4.317555869140625C3.73630125,4.317555869140625,2.24070125,2.821952869140625,2.24070125,2.821952869140625C2.12819125,2.709438869140625,2.06612125,2.5639588691406248,2.06612125,2.412650869140625C2.06612125,2.261344869140625,2.12819125,2.115858869140625,2.24070125,2.003348869140625C2.47348125,1.770571369140625,2.82652125,1.770571369140625,3.05930125,2.003348869140625C3.05930125,2.003348869140625,3.05930125,2.003348869140625,3.05930125,2.003348869140625ZM14.12983125,10.639235869140625C14.92133125,9.682895869140625,15.39073125,8.837095869140626,15.45473125,8.670295869140624C15.57113125,8.511235869140625,15.57303125,8.313355869140626,15.45473125,8.154295869140626C15.31893125,7.886595869140625,12.70413125,2.812045869140625,7.98643125,2.812045869140625C7.59263125,2.812045869140625,7.19303125,2.848895869140625,6.79928125,2.920675869140625C6.79928125,2.920675869140625,6.79540125,2.920675869140625,6.79540125,2.920675869140625C6.64215125,2.959475869140625,6.50830125,3.044815869140625,6.42101125,3.1612158691406247C6.32596125,3.287295869140625,6.29492125,3.438605869140625,6.33178125,3.586035869140625C6.40549125,3.876995869140625,6.67512125,4.131115869140626,6.99714125,4.049645869140625C7.31330125,3.979815869140625,7.63730125,3.979815869140625,7.95150125,3.979815869140625C9.42970125,3.979815869140625,10.85733125,4.604435869140625,12.19393125,5.836215869140625C13.21613125,6.778965869140625,13.91643125,7.834225869140625,14.25013125,8.394835869140625C14.11433125,8.635365869140625,13.76513125,9.217295869140624,13.19673125,9.898165869140625C13.10373125,10.010695869140624,13.05903125,10.165895869140625,13.07453125,10.323035869140625C13.09013125,10.480165869140626,13.16193125,10.623695869140626,13.27433125,10.716765869140625C13.27433125,10.716765869140625,13.27823125,10.720695869140625,13.27823125,10.720695869140625C13.39853125,10.800235869140625,13.51683125,10.835095869140625,13.66233125,10.835095869140625C13.82143125,10.835095869140625,14.01153125,10.755565869140625,14.12593125,10.643095869140625C14.12593125,10.643095869140625,14.12983125,10.639235869140625,14.12983125,10.639235869140625C14.12983125,10.639235869140625,14.12983125,10.639235869140625,14.12983125,10.639235869140625ZM6.78377125,8.501765869140625C6.78377125,8.222415869140626,6.90016125,7.923675869140625,7.09220125,7.714175869140625C7.09220125,7.714175869140625,8.77210125,9.394035869140625,8.77210125,9.394035869140625C8.56256125,9.584165869140625,8.263831249999999,9.702495869140625,7.98450125,9.702495869140625C7.33470125,9.702495869140625,6.78377125,9.153495869140624,6.78377125,8.501765869140625C6.78377125,8.501765869140625,6.78377125,8.501765869140625,6.78377125,8.501765869140625ZM3.74216125,10.951895869140625C5.07869125,12.183665869140626,6.50640125,12.808265869140625,7.98456125,12.808265869140625C9.08250125,12.808265869140625,10.14936125,12.461065869140626,11.15813125,11.778235869140625C11.15813125,11.778235869140625,9.58876125,10.208895869140624,9.58876125,10.208895869140624C9.13290125,10.612435869140626,8.56456125,10.833565869140624,7.98456125,10.833565869140624C7.35023125,10.833565869140624,6.75469125,10.587165869140625,6.30854125,10.141035869140625C5.86238125,9.694895869140625,5.61602125,9.099365869140625,5.61602125,8.465035869140625C5.61602125,7.848175869140625,5.83716125,7.279805869140625,6.23870125,6.858865869140625C6.23870125,6.858865869140625,4.55300125,5.173165869140625,4.55300125,5.173165869140625C3.11366125,6.197395869140625,2.14569125,7.619275869140625,1.68595125,8.395195869140625C2.01960125,8.955835869140625,2.71988125,10.011095869140625,3.74216125,10.951895869140625C3.74216125,10.951895869140625,3.74216125,10.951895869140625,3.74216125,10.951895869140625Z" fill-rule="evenodd" fill="#FA5151" fill-opacity="1"/></g></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/icon_filter.svg b/static/icon/icon_filter.svg
new file mode 100644
index 0000000..a916a83
--- /dev/null
+++ b/static/icon/icon_filter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="24.000001907348633" height="24" viewBox="0 0 24.000001907348633 24"><defs><clipPath id="master_svg0_305_00255"><rect x="0" y="0" width="24.000001907348633" height="24" rx="0"/></clipPath></defs><g style="mix-blend-mode:passthrough" clip-path="url(#master_svg0_305_00255)"><g style="mix-blend-mode:passthrough"><path d="M14.5106,12.81584L21.8511,4.04804C22.0774,3.777745,22.0417,3.375175,21.7714,3.148878C21.6566,3.0527018,21.5115,3,21.3617,3.0000000507273L2.638297,3C2.285775,3,2,3.285775,2,3.638297C2,3.788119,2.0527018,3.933167,2.148878,4.04804L9.48936,12.81584L9.48936,18.7683C9.48936,19.0092,9.62492,19.2295,9.8399,19.3381L13.5846,21.2293C13.8992,21.3882,14.2832,21.262,14.4421,20.9473C14.4872,20.8581,14.5106,20.7595,14.5106,20.6596L14.5106,12.81584ZM19.9948,4.27659L13.3829,12.17417C13.2867,12.28905,13.234,12.4341,13.234,12.58392L13.234,19.6221L10.76595,18.3756L10.76595,12.58392C10.76595,12.4341,10.71325,12.28905,10.61707,12.17417L4.00515,4.27659L19.9948,4.27659Z" fill-rule="evenodd" fill="#000000" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/iconfont.ttf b/static/icon/iconfont.ttf
new file mode 100644
index 0000000..d9c6e1a
Binary files /dev/null and b/static/icon/iconfont.ttf differ
diff --git a/static/icon/icons_camera.svg b/static/icon/icons_camera.svg
new file mode 100644
index 0000000..4c05bd8
--- /dev/null
+++ b/static/icon/icons_camera.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="24" height="24" viewBox="0 0 24 24"><g style="mix-blend-mode:passthrough"><g style="mix-blend-mode:passthrough"><g style="mix-blend-mode:passthrough" transform="matrix(0,1,-1,0,23.99999999999997,-24.00000000000003)"></g><g style="mix-blend-mode:passthrough"><path d="M16.9916171875,5.184572269973755C16.9916171875,5.184572269973755,20.5901171875,5.184572269973755,20.5901171875,5.184572269973755C22.1162171875,5.184572269973755,23.3187171875,6.3840622699737555,23.3737171875,7.910132269973755C23.3737171875,7.910132269973755,23.3737171875,18.815412269973756,23.3737171875,18.815412269973756C23.3737171875,20.341512269973755,22.1192171875,21.541012269973756,20.6481171875,21.541012269973756C20.6481171875,21.541012269973756,3.4706771875,21.541012269973756,3.4706771875,21.541012269973756C1.9446071875,21.541012269973756,0.7451171875,20.286612269973755,0.7451171875,18.815412269973756C0.7451171875,18.815412269973756,0.7451171875,7.910132269973755,0.7451171875,7.910132269973755C0.7451171875,6.3840622699737555,1.9995471875,5.184572269973755,3.4706771875,5.184572269973755C3.4706771875,5.184572269973755,7.0691571875,5.184572269973755,7.0691571875,5.184572269973755C7.0691571875,5.184572269973755,8.5952271875,2.895468269973755,8.5952271875,2.895468269973755C8.7569871875,2.623828269973755,9.0316771875,2.459012269973755,9.3582571875,2.459012269973755C9.3582571875,2.459012269973755,14.7025171875,2.459012269973755,14.7025171875,2.459012269973755C15.0291171875,2.459012269973755,15.3008171875,2.623828269973755,15.4656171875,2.895468269973755C15.4656171875,2.895468269973755,16.9916171875,5.184572269973755,16.9916171875,5.184572269973755C16.9916171875,5.184572269973755,16.9916171875,5.184572269973755,16.9916171875,5.184572269973755ZM20.5901171875,19.688312269973753C21.0815171875,19.688312269973753,21.4630171875,19.306812269973754,21.4630171875,18.815412269973756C21.4630171875,18.815412269973756,21.4630171875,7.965072269973755,21.4630171875,7.965072269973755C21.4630171875,7.473682269973755,21.0815171875,7.0921622699737545,20.5901171875,7.0921622699737545C20.5901171875,7.0921622699737545,16.500317187500002,7.0921622699737545,16.500317187500002,7.0921622699737545C16.1737171875,7.0921622699737545,15.9020171875,6.927352269973755,15.7372171875,6.655712269973755C15.7372171875,6.655712269973755,14.2111171875,4.366602269973755,14.2111171875,4.366602269973755C14.2111171875,4.366602269973755,9.8496571875,4.366602269973755,9.8496571875,4.366602269973755C9.8496571875,4.366602269973755,8.3235871875,6.6007722699737545,8.3235871875,6.6007722699737545C8.161817187499999,6.872412269973755,7.8871271875,7.037222269973755,7.5605471875,7.037222269973755C7.5605471875,7.037222269973755,3.4706771875,7.037222269973755,3.4706771875,7.037222269973755C2.9792871875,7.037222269973755,2.5977671874999997,7.418742269973755,2.5977671874999997,7.910142269973755C2.5977671874999997,7.910142269973755,2.5977671874999997,18.815412269973756,2.5977671874999997,18.815412269973756C2.5977671874999997,19.306812269973754,2.9792871875,19.688312269973753,3.4706771875,19.688312269973753C3.4706771875,19.688312269973753,20.5901171875,19.688312269973753,20.5901171875,19.688312269973753C20.5901171875,19.688312269973753,20.5901171875,19.688312269973753,20.5901171875,19.688312269973753Z" fill-rule="evenodd" fill="#000000" fill-opacity="1"/></g><g style="mix-blend-mode:passthrough"><path d="M6.6171875,12.87323375C6.6171875,9.90350375,9.0588975,7.46484375,12.0255775,7.46484375C14.9922575,7.46484375,17.4339875,9.90350375,17.4339875,12.87323375C17.4339875,15.84297375,14.9953175,18.28164375,12.0255775,18.28164375C9.0558475,18.28164375,6.6171875,15.84297375,6.6171875,12.87323375C6.6171875,12.87323375,6.6171875,12.87323375,6.6171875,12.87323375ZM8.7933675,12.87324375C8.7933675,14.655693750000001,10.2461875,16.10546375,12.0255775,16.10546375C13.8049775,16.10546375,15.2577975,14.655693750000001,15.2577975,12.87324375C15.2577975,11.09079375,13.8080275,9.64102375,12.0255775,9.64102375C10.2431275,9.64102375,8.7933675,11.09079375,8.7933675,12.87324375C8.7933675,12.87324375,8.7933675,12.87324375,8.7933675,12.87324375Z" fill-rule="evenodd" fill="#000000" fill-opacity="1"/></g></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/icons_close-circle.svg b/static/icon/icons_close-circle.svg
new file mode 100644
index 0000000..01bb878
--- /dev/null
+++ b/static/icon/icons_close-circle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="24" height="24" viewBox="0 0 24 24"><g style="mix-blend-mode:passthrough"><g style="mix-blend-mode:passthrough"><g style="mix-blend-mode:passthrough"></g><g style="mix-blend-mode:passthrough"><path d="M0.685546875,11.999846875C0.685546875,5.764656875,5.762146875,0.685546875,11.999846875,0.685546875C18.237546875,0.685546875,23.314146875,5.767176875,23.314146875,12.002346875C23.314146875,18.237546875,18.237546875,23.316646875,11.999846875,23.316646875C5.762146875,23.316646875,0.685546875,18.235046875,0.685546875,11.999846875C0.685546875,11.999846875,0.685546875,11.999846875,0.685546875,11.999846875ZM2.341726875,12.002046875C2.341726875,17.299846875,6.702076875,21.660146875,11.999846875,21.660146875C17.297546875,21.660146875,21.657946875,17.297246875,21.657946875,11.999546875C21.657946875,6.701766875,17.297546875,2.341416875,11.999846875,2.341416875C6.702076875,2.341416875,2.341726875,6.704276875,2.341726875,12.002046875C2.341726875,12.002046875,2.341726875,12.002046875,2.341726875,12.002046875Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g style="mix-blend-mode:passthrough"><path d="M15.752381875000001,8.0818118125C15.420641875000001,7.7500732125,14.925541875,7.7500732125,14.593801875,8.0818118125C14.593801875,8.0818118125,11.944921875,10.7306878125,11.944921875,10.7306878125C11.944921875,10.7306878125,9.296041875,8.0818118125,9.296041875,8.0818118125C8.964311875,7.7500732125,8.469213875,7.7500732125,8.137475875,8.0818118125C7.805737275,8.4135498125,7.805737275,8.9086478125,8.137475875,9.2403778125C8.137475875,9.2403778125,10.786351875,11.8892578125,10.786351875,11.8892578125C10.786351875,11.8892578125,8.137475875,14.540657812500001,8.137475875,14.540657812500001C7.805737275,14.872397812500001,7.805737275,15.3674878125,8.137475875,15.6992278125C8.303344875,15.8650978125,8.524503875,15.9203878125,8.745662875,15.9203878125C8.966821875,15.9203878125,9.187981875,15.8650978125,9.353851875,15.6992278125C9.353851875,15.6992278125,12.000211875,13.0503478125,12.000211875,13.0503478125C12.000211875,13.0503478125,14.649091875,15.6992278125,14.649091875,15.6992278125C14.814961875,15.8650978125,15.036121875,15.9203878125,15.257281875,15.9203878125C15.478441875,15.9203878125,15.699601874999999,15.8650978125,15.865471875,15.6992278125C16.197211875,15.3674878125,16.197211875,14.872397812500001,15.865471875,14.540657812500001C15.865471875,14.540657812500001,13.103501875,11.9470678125,13.103501875,11.9470678125C13.103501875,11.9470678125,15.752381875000001,9.2981878125,15.752381875000001,9.2981878125C16.084111874999998,8.9664478125,16.084111874999998,8.4135498125,15.752381875000001,8.0818118125C15.752381875000001,8.0818118125,15.752381875000001,8.0818118125,15.752381875000001,8.0818118125Z" fill="#FFFFFF" fill-opacity="1"/></g></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/icons_close.svg b/static/icon/icons_close.svg
new file mode 100644
index 0000000..5574d0b
--- /dev/null
+++ b/static/icon/icons_close.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="24" height="24" viewBox="0 0 24 24"><g style="mix-blend-mode:passthrough"><g style="mix-blend-mode:passthrough"><g style="mix-blend-mode:passthrough" transform="matrix(0,1,-1,0,24.000000000000014,-23.999999999999986)"></g><g style="mix-blend-mode:passthrough" transform="matrix(0,1,-1,0,24,-22.62890625)"><path d="M36.160553125,12.003346875C36.160553125,12.003346875,45.548653125,2.615276875,45.548653125,2.615276875C45.985253125,2.178626875,45.985253125,1.523641875,45.548653125,1.086987875C45.111953125,0.650332975,44.456953125,0.650332975,44.020353125,1.086987875C44.020353125,1.086987875,34.632253125,10.475066875,34.632253125,10.475066875C34.632253125,10.475066875,25.244183125,1.013037875,25.244183125,1.013037875C24.807533125,0.576382875,24.152548125,0.576382875,23.715894125,1.013037875C23.279239225,1.449692875,23.279239225,2.104676875,23.715894125,2.541326875C23.715894125,2.541326875,33.103973124999996,12.003346875,33.103973124999996,12.003346875C33.103973124999996,12.003346875,23.641944125,21.391446875,23.641944125,21.391446875C23.205289125,21.828046875,23.205289125,22.483046875,23.641944125,22.919746875C23.860271125,23.138046875,24.152548125,23.212046875,24.441303125,23.212046875C24.730063125,23.212046875,25.022333125,23.138046875,25.240663125,22.919746875C25.240663125,22.919746875,34.628753125,13.531646875,34.628753125,13.531646875C34.628753125,13.531646875,44.016853125,22.919746875,44.016853125,22.919746875C44.235153125,23.138046875,44.527453125,23.212046875,44.816153125,23.212046875C45.108453125,23.212046875,45.397253125,23.138046875,45.615553125000005,22.919746875C46.052153125000004,22.483046875,46.052153125000004,21.828046875,45.615553125000005,21.391446875C45.615553125000005,21.391446875,36.160553125,12.003346875,36.160553125,12.003346875C36.160553125,12.003346875,36.160553125,12.003346875,36.160553125,12.003346875Z" fill="#000000" fill-opacity="1"/></g></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/icons_edit.svg b/static/icon/icons_edit.svg
new file mode 100644
index 0000000..e81fde4
--- /dev/null
+++ b/static/icon/icons_edit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="24" height="24" viewBox="0 0 24 24"><g style="mix-blend-mode:passthrough"><g style="mix-blend-mode:passthrough"><g style="mix-blend-mode:passthrough"></g><g style="mix-blend-mode:passthrough"><path d="M7.282366875,20.4344671875C7.282366875,20.4344671875,9.615706875,20.0598671875,9.615706875,20.0598671875C9.615706875,20.0598671875,18.203046875,11.3424371875,18.203046875,11.3424371875C18.203046875,11.3424371875,18.209346875,11.3487871875,18.209346875,11.3487871875C18.209346875,11.3487871875,22.177646875,7.3837071875,22.177646875,7.3837071875C22.177646875,7.3837071875,16.507746875000002,1.7138671875,16.507746875000002,1.7138671875C16.507746875000002,1.7138671875,13.876046875,4.3487871875,13.876046875,4.3487871875C13.876046875,4.3487871875,13.860146875,4.3329171875,13.860146875,4.3329171875C13.860146875,4.3329171875,3.987136875,14.3519671875,3.987136875,14.3519671875C3.987136875,14.3519671875,3.037926875,20.4344671875,3.037926875,20.4344671875C3.037926875,20.4344671875,0.685546875,20.4344671875,0.685546875,20.4344671875C0.685546875,20.4344671875,0.685546875,22.3519671875,0.685546875,22.3519671875C0.685546875,22.3519671875,23.314146875,22.3519671875,23.314146875,22.3519671875C23.314146875,22.3519671875,23.314146875,20.4344671875,23.314146875,20.4344671875C23.314146875,20.4344671875,7.282366875,20.4344671875,7.282366875,20.4344671875C7.282366875,20.4344671875,7.282366875,20.4344671875,7.282366875,20.4344671875ZM16.507746875000002,4.5264671875C16.507746875000002,4.5264671875,19.485546875,7.5042471875,19.485546875,7.5042471875C19.485546875,7.5042471875,18.272846875,8.716937187500001,18.272846875,8.716937187500001C18.272846875,8.716937187500001,15.295046875,5.7391671875,15.295046875,5.7391671875C15.295046875,5.7391671875,16.507746875000002,4.5264671875,16.507746875000002,4.5264671875C16.507746875000002,4.5264671875,16.507746875000002,4.5264671875,16.507746875000002,4.5264671875ZM13.860146875,7.0439871875C13.860146875,7.0439871875,5.726816875,15.2979671875,5.726816875,15.2979671875C5.726816875,15.2979671875,5.206176875,18.8217671875,5.206176875,18.8217671875C5.206176875,18.8217671875,8.679196874999999,18.2947671875,8.679196874999999,18.2947671875C8.679196874999999,18.2947671875,16.812546875,10.0408171875,16.812546875,10.0408171875C16.812546875,10.0408171875,13.860146875,7.0439871875,13.860146875,7.0439871875C13.860146875,7.0439871875,13.860146875,7.0439871875,13.860146875,7.0439871875Z" fill-rule="evenodd" fill="#000000" fill-opacity="1"/></g></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/icons_scan_close.svg b/static/icon/icons_scan_close.svg
new file mode 100644
index 0000000..15a32b8
--- /dev/null
+++ b/static/icon/icons_scan_close.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="24" height="24" viewBox="0 0 24 24"><g><g><g transform="matrix(0,1,-1,0,24.000000000000014,-23.999999999999986)"></g><g transform="matrix(0,1,-1,0,24,-22.62890625)"><path d="M36.160553125,12.003346875C36.160553125,12.003346875,45.548653125,2.615276875,45.548653125,2.615276875C45.985253125,2.178626875,45.985253125,1.523641875,45.548653125,1.086987875C45.111953125,0.650332975,44.456953125,0.650332975,44.020353125,1.086987875C44.020353125,1.086987875,34.632253125,10.475066875,34.632253125,10.475066875C34.632253125,10.475066875,25.244183125,1.013037875,25.244183125,1.013037875C24.807533125,0.576382875,24.152548125,0.576382875,23.715894125,1.013037875C23.279239225,1.449692875,23.279239225,2.104676875,23.715894125,2.541326875C23.715894125,2.541326875,33.103973124999996,12.003346875,33.103973124999996,12.003346875C33.103973124999996,12.003346875,23.641944125,21.391446875,23.641944125,21.391446875C23.205289125,21.828046875,23.205289125,22.483046875,23.641944125,22.919746875C23.860271125,23.138046875,24.152548125,23.212046875,24.441303125,23.212046875C24.730063125,23.212046875,25.022333125,23.138046875,25.240663125,22.919746875C25.240663125,22.919746875,34.628753125,13.531646875,34.628753125,13.531646875C34.628753125,13.531646875,44.016853125,22.919746875,44.016853125,22.919746875C44.235153125,23.138046875,44.527453125,23.212046875,44.816153125,23.212046875C45.108453125,23.212046875,45.397253125,23.138046875,45.615553125000005,22.919746875C46.052153125000004,22.483046875,46.052153125000004,21.828046875,45.615553125000005,21.391446875C45.615553125000005,21.391446875,36.160553125,12.003346875,36.160553125,12.003346875C36.160553125,12.003346875,36.160553125,12.003346875,36.160553125,12.003346875Z" fill="#FFFFFF" fill-opacity="1"/></g></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/light_count.svg b/static/icon/light_count.svg
new file mode 100644
index 0000000..0e4b9ab
--- /dev/null
+++ b/static/icon/light_count.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="45" height="18" viewBox="0 0 45 18"><g><g><g><g></g><g><path d="M6.6651164375,10.0937666015625C6.9835384375,10.4121766015625,7.4476484375,10.5365266015625,7.8826084375,10.4199666015625C8.3175784375,10.3034066015625,8.657318437499999,9.9636566015625,8.7738584375,9.5286866015625C8.8904084375,9.0937166015625,8.7660384375,8.6296166015625,8.4476084375,8.3112036015625C8.1291884375,7.9927911015625,7.6650884375,7.8684426015625,7.2301184375,7.9849994015625C6.7951534375,8.1015556015625,6.4554114375,8.4413096015625,6.3388698375,8.8762766015625C6.2223283375,9.3112466015625,6.3466928375,9.7753466015625,6.6651164375,10.0937666015625C6.6651164375,10.0937666015625,6.6651164375,10.0937666015625,6.6651164375,10.0937666015625C6.6651164375,10.0937666015625,6.6651164375,10.0937666015625,6.6651164375,10.0937666015625Z" fill="#0CC2B6" fill-opacity="1"/></g><g><path d="M7.542870000000028,3.5142822265625C12.295100000000028,3.5142822265625,14.923700000000029,8.662052226562501,15.031500000000028,8.8791422265625C15.103800000000028,9.0238622265625,15.103800000000028,9.2039222265625,15.031500000000028,9.383992226562501C15.027000000000028,9.3913622265625,15.018200000000029,9.407172226562501,15.005200000000029,9.430692226562499C14.702800000000028,9.9763122265625,12.098700000000028,14.6747822265625,7.542870000000028,14.6747822265625C2.7905500000000285,14.6747822265625,0.16197200000002843,9.5623722265625,0.05427120000002842,9.3469622265625C-0.018090399999971578,9.2022422265625,-0.018090399999971578,9.0221822265625,0.05427120000002842,8.842112226562499C0.16197200000002843,8.6267122265625,2.825890000000028,3.5142822265625,7.542870000000028,3.5142822265625C7.542870000000028,3.5142822265625,7.542870000000028,3.5142822265625,7.542870000000028,3.5142822265625ZM7.556330000000028,11.5430122265625C8.852070000000028,11.5430122265625,9.897130000000029,10.4996822265625,9.897130000000029,9.2022122265625C9.897130000000029,7.9047522265625,8.853800000000028,6.8614022265625,7.556330000000028,6.8614022265625C6.258860000000029,6.8614022265625,5.2155100000000285,7.9047522265625,5.2155100000000285,9.2022122265625C5.2155100000000285,10.4996822265625,6.260540000000028,11.5430122265625,7.556330000000028,11.5430122265625C7.556330000000028,11.5430122265625,7.556330000000028,11.5430122265625,7.556330000000028,11.5430122265625Z" fill-rule="evenodd" fill="#0CC2B6" fill-opacity="1"/></g></g></g><g><path d="M25.05469,8.79841L25.05469,11.232L22.80859,11.232L22.80859,8.79841L25.05469,8.79841ZM25.05469,7.982L22.80859,7.982L22.80859,5.732L25.05469,5.732L25.05469,7.982ZM21.957031,4.90778L21.957031,13.2515L22.80859,13.2515L22.80859,12.0758L25.89453,12.0758L25.89453,4.90778L21.957031,4.90778ZM31.2461,5.482L31.2461,7.6695L27.88672,7.6695L27.88672,5.482L31.2461,5.482ZM27.01172,4.64216L27.01172,9.04059C27.01172,10.9547,26.80469,13.275,24.76562,14.8453C24.95703,14.9742,25.29297,15.275,25.42578,15.4664C26.80469,14.4117,27.41797,12.9351,27.69531,11.482L31.2461,11.482L31.2461,14.1929C31.2461,14.4117,31.164099999999998,14.482,30.94531,14.482C30.74219,14.4976,29.98828,14.5093,29.20703,14.4703C29.339840000000002,14.7242,29.496090000000002,15.107,29.53125,15.3609C30.57422,15.3609,31.2227,15.3375,31.6172,15.1929C32.0039,15.0484,32.1367,14.7593,32.1367,14.1929L32.1367,4.64216L27.01172,4.64216ZM31.2461,8.482L31.2461,10.6695L27.81641,10.6695C27.875,10.1109,27.88672,9.55622,27.88672,9.05231L27.88672,8.482L31.2461,8.482ZM37.6797,9.20075C38.351600000000005,9.55622,39.1914,10.1109,39.5977,10.5054L40.0547,9.91559C39.648399999999995,9.52106,38.793,9.00153,38.1328,8.6695L37.6797,9.20075ZM38.5664,3.97028C38.4844,4.25544,38.3281,4.65388,38.1719,4.98981L35.543,4.98981L35.543,7.19294L35.5312,7.69294L33.6094,7.69294L33.6094,8.482L35.4102,8.482C35.2305,9.17731,34.8086,9.88044,33.8867,10.4625C34.0781,10.5836,34.4141,10.9273,34.5469,11.1148C35.6484,10.3804,36.1289,9.41559,36.3242,8.482L41.8906,8.482L41.8906,9.81403C41.8906,9.93903,41.8438,9.982,41.675799999999995,9.982C41.5195,9.99763,40.9648,9.99763,40.3906,9.982C40.523399999999995,10.2008,40.6445,10.525,40.6797,10.7515C41.4961,10.7515,42.023399999999995,10.7515,42.3477,10.6187C42.6836,10.4898,42.789100000000005,10.2476,42.789100000000005,9.82575L42.789100000000005,8.482L44.4727,8.482L44.4727,7.69294L42.789100000000005,7.69294L42.789100000000005,4.98981L39.1445,4.98981L39.539100000000005,4.16169L38.5664,3.97028ZM37.761700000000005,6.45075C38.398399999999995,6.78278,39.168,7.30622,39.539100000000005,7.69294L36.4297,7.69294L36.4414,7.20466L36.4414,5.732L41.8906,5.732L41.8906,7.69294L39.5625,7.69294L40.0195,7.10309C39.6211,6.70466,38.8438,6.20856,38.207,5.89997L37.761700000000005,6.45075ZM34.8945,11.232L34.8945,14.232L33.5391,14.232L33.5391,15.0367L44.460899999999995,15.0367L44.460899999999995,14.232L43.113299999999995,14.232L43.113299999999995,11.232L34.8945,11.232ZM35.7344,14.232L35.7344,11.9664L37.3438,11.9664L37.3438,14.232L35.7344,14.232ZM38.1719,14.232L38.1719,11.9664L39.7773,11.9664L39.7773,14.232L38.1719,14.232ZM40.6172,14.232L40.6172,11.9664L42.238299999999995,11.9664L42.238299999999995,14.232L40.6172,14.232Z" fill="#0CC2B6" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/plus.svg b/static/icon/plus.svg
new file mode 100644
index 0000000..d8c2ef6
--- /dev/null
+++ b/static/icon/plus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="24" height="24" viewBox="0 0 24 24"><defs><clipPath id="master_svg0_1409_35721"><rect x="0" y="0" width="24" height="24" rx="0"/></clipPath></defs><g style="mix-blend-mode:passthrough" clip-path="url(#master_svg0_1409_35721)"><g style="mix-blend-mode:passthrough"><path d="M12.000244140625,4.00048828125C12.552524140625,4.00048828125,13.000244140625,4.44820328125,13.000244140625,5.00048828125C13.000244140625,5.00048828125,13.000244140625,11.00048828125,13.000244140625,11.00048828125C13.000244140625,11.00048828125,19.000244140625,11.00048828125,19.000244140625,11.00048828125C19.552544140625002,11.00048828125,20.000244140625,11.44820828125,20.000244140625,12.00048828125C20.000244140625,12.55276828125,19.552544140625002,13.00048828125,19.000244140625,13.00048828125C19.000244140625,13.00048828125,13.000244140625,13.00048828125,13.000244140625,13.00048828125C13.000244140625,13.00048828125,13.000244140625,19.00048828125,13.000244140625,19.00048828125C13.000244140625,19.552788281250002,12.552524140625,20.00048828125,12.000244140625,20.00048828125C11.447964140625,20.00048828125,11.000244140625,19.552788281250002,11.000244140625,19.00048828125C11.000244140625,19.00048828125,11.000244140625,13.00048828125,11.000244140625,13.00048828125C11.000244140625,13.00048828125,5.000244140625,13.00048828125,5.000244140625,13.00048828125C4.447959140625,13.00048828125,4.000244140625,12.55276828125,4.000244140625,12.00048828125C4.000244140625,11.44820828125,4.447959140625,11.00048828125,5.000244140625,11.00048828125C5.000244140625,11.00048828125,11.000244140625,11.00048828125,11.000244140625,11.00048828125C11.000244140625,11.00048828125,11.000244140625,5.00048828125,11.000244140625,5.00048828125C11.000244140625,4.44820328125,11.447964140625,4.00048828125,12.000244140625,4.00048828125C12.000244140625,4.00048828125,12.000244140625,4.00048828125,12.000244140625,4.00048828125Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/question-circle.svg b/static/icon/question-circle.svg
new file mode 100644
index 0000000..1829a60
--- /dev/null
+++ b/static/icon/question-circle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="60" height="60" viewBox="0 0 60 60"><g style="mix-blend-mode:passthrough"><g style="mix-blend-mode:passthrough" transform="matrix(0,1,-1,0,60,-60)"></g><g style="mix-blend-mode:passthrough"><path d="M1.77734375,30.00004375C1.77734375,45.58684375,14.41324375,58.22264375,30.00004375,58.22264375C45.58684375,58.22264375,58.22264375,45.58684375,58.22264375,30.00004375C58.22264375,14.41324375,45.58684375,1.77734375,30.00004375,1.77734375C14.41324375,1.77734375,1.77734375,14.41324375,1.77734375,30.00004375C1.77734375,30.00004375,1.77734375,30.00004375,1.77734375,30.00004375ZM54.43934375,30.00634375C54.43934375,43.49984375,43.49964375,54.44584375,30.00004375,54.44584375C16.50024375,54.44584375,5.56051375,43.49984375,5.56051375,30.00004375C5.56051375,16.50024375,16.50024375,5.56054375,30.00004375,5.56054375C43.49964375,5.56054375,54.43934375,16.512843750000002,54.43934375,30.00634375C54.43934375,30.00634375,54.43934375,30.00634375,54.43934375,30.00634375Z" fill-rule="evenodd" fill="#9A9998" fill-opacity="1"/></g><g style="mix-blend-mode:passthrough"><path d="M18.9904671875,56.0595671875C22.4773671875,57.5348671875,26.1785671875,58.2853671875,29.9995671875,58.2853671875C33.8206671875,58.2853671875,37.5218671875,57.5348671875,41.0086671875,56.0595671875C44.3755671875,54.6346671875,47.4023671875,52.5978671875,50.0001671875,50.0001671875C52.5978671875,47.4023671875,54.6346671875,44.3755671875,56.0595671875,41.0086671875C57.5348671875,37.5218671875,58.2853671875,33.8143671875,58.2853671875,29.9995671875C58.2853671875,26.1848671875,57.5348671875,22.4773671875,56.0595671875,18.9904671875C54.6346671875,15.6233671875,52.5978671875,12.5968671875,50.0001671875,9.9990671875C47.4023671875,7.4012671875,44.3755671875,5.3646371875,41.0086671875,3.9396471875C37.5218671875,2.4642021874999998,33.8206671875,1.7138671875,29.9995671875,1.7138671875C26.1848671875,1.7138671875,22.4773671875,2.4642021874999998,18.9904671875,3.9396471875C15.6233671875,5.3646371875,12.5968671875,7.4012671875,9.9990671875,9.9990671875C7.4012671875,12.5968671875,5.3646371875,15.6233671875,3.9396471875,18.9904671875C2.4642021874999998,22.4773671875,1.7138671875,26.1848671875,1.7138671875,29.9995671875C1.7138671875,33.8143671875,2.4642021874999998,37.5218671875,3.9396471875,41.0086671875C5.3646371875,44.3755671875,7.4012671875,47.4023671875,9.9990671875,50.0001671875C12.5968671875,52.5978671875,15.6233671875,54.6346671875,18.9904671875,56.0595671875C18.9904671875,56.0595671875,18.9904671875,56.0595671875,18.9904671875,56.0595671875ZM19.0409671875,4.0530771875C22.5088671875,2.5839371875,26.1974671875,1.8399091875,29.9995671875,1.8399091875C33.8015671875,1.8399091875,37.4903671875,2.5839371875,40.9583671875,4.0530771875C44.3125671875,5.471767187499999,47.3266671875,7.5020971875,49.9118671875,10.0872871875C52.4970671875,12.6787671875,54.5273671875,15.6863671875,55.9461671875,19.0408671875C57.4151671875,22.5087671875,58.1591671875,26.1973671875,58.1591671875,29.9995671875C58.1591671875,33.8015671875,57.4151671875,37.4838671875,55.9461671875,40.9580671875C54.5273671875,44.3125671875,52.4970671875,47.3266671875,49.9118671875,49.9118671875C47.3203671875,52.4968671875,44.3125671875,54.5273671875,40.9583671875,55.9458671875C37.4903671875,57.4151671875,33.8015671875,58.1591671875,29.9995671875,58.1591671875C26.1974671875,58.1591671875,22.5151671875,57.4151671875,19.0409671875,55.9458671875C15.6864671875,54.5273671875,12.6725671875,52.4968671875,10.0873971875,49.9118671875C7.5021971875,47.3203671875,5.4718871875,44.3125671875,4.053177187499999,40.9580671875C2.5840401875,37.4903671875,1.8400111875,33.8015671875,1.8400111875,29.9995671875C1.8400111875,26.1973671875,2.5840401875,22.5087671875,4.053177187499999,19.0408671875C5.4718871875,15.6863671875,7.5021971875,12.6724671875,10.0873971875,10.0872871875C12.6788671875,7.5020971875,15.6864671875,5.471767187499999,19.0409671875,4.0530771875C19.0409671875,4.0530771875,19.0409671875,4.0530771875,19.0409671875,4.0530771875ZM29.9995671875,54.5083671875C26.6893671875,54.5083671875,23.4798671875,53.8588671875,20.4596671875,52.5850671875C17.5402671875,51.3493671875,14.9235671875,49.5838671875,12.6725671875,47.3328671875C10.4215671875,45.0818671875,8.6560671875,42.4588671875,7.4202171875,39.5458671875C6.1402371875,36.5255671875,5.4970971875,33.316067187499996,5.4970971875,30.0058671875C5.4970971875,26.6955671875,6.1465371875,23.4861671875,7.4202171875,20.4658671875C8.6560671875,17.5464671875,10.4215671875,14.9297671875,12.6725671875,12.6787671875C14.9235671875,10.4277871875,17.546567187500003,8.6622971875,20.4596671875,7.4264371875C23.4798671875,6.1464671875,26.6893671875,5.5033171875,29.9995671875,5.5033171875C33.309867187500004,5.5033171875,36.5193671875,6.1527671875,39.5395671875,7.4264371875C42.4588671875,8.6622971875,45.0755671875,10.4277871875,47.3266671875,12.6787671875C49.5776671875,14.9297671875,51.3430671875,17.552767187500002,52.5790671875,20.4658671875C53.8588671875,23.4861671875,54.5020671875,26.6955671875,54.5020671875,30.0058671875C54.5020671875,33.316067187499996,53.8525671875,36.5255671875,52.5790671875,39.5458671875C51.3430671875,42.4651671875,49.5776671875,45.0818671875,47.3266671875,47.3328671875C45.0755671875,49.5838671875,42.4526671875,51.3493671875,39.5395671875,52.5850671875C36.5193671875,53.8588671875,33.309867187500004,54.5083671875,29.9995671875,54.5083671875C29.9995671875,54.5083671875,29.9995671875,54.5083671875,29.9995671875,54.5083671875ZM20.5100671875,7.5399471875C23.5177671875,6.2662671875,26.7082671875,5.6231171875,29.9995671875,5.6231171875C33.2911671875,5.6231171875,36.4815671875,6.2662671875,39.4890671875,7.5399471875C42.3896671875,8.769487187500001,45.0001671875,10.5286671875,47.2383671875,12.7670671875C49.4768671875,15.0054671875,51.2358671875,17.6158671875,52.4655671875,20.5163671875C53.7391671875,23.5239671875,54.3823671875,26.7143671875,54.3823671875,30.0058671875C54.3823671875,33.2971671875,53.7391671875,36.4876671875,52.4655671875,39.4953671875C51.2358671875,42.3958671875,49.4768671875,45.0061671875,47.2383671875,47.2445671875C45.0001671875,49.4830671875,42.3896671875,51.2421671875,39.4890671875,52.4718671875C36.4815671875,53.7453671875,33.2911671875,54.3886671875,29.9995671875,54.3886671875C26.7082671875,54.3886671875,23.5177671875,53.7453671875,20.5100671875,52.4718671875C17.6096671875,51.2421671875,14.9992671875,49.4830671875,12.7608671875,47.2445671875C10.5224471875,45.0061671875,8.7632671875,42.3958671875,7.5337171875,39.4953671875C6.2600471875,36.4876671875,5.6168971875,33.2971671875,5.6168971875,30.0058671875C5.6168971875,26.7143671875,6.2600471875,23.5239671875,7.5337171875,20.5163671875C8.7632671875,17.6158671875,10.5224471875,15.0054671875,12.7608671875,12.7670671875C14.9992671875,10.5286671875,17.6096671875,8.769487187500001,20.5100671875,7.5399471875C20.5100671875,7.5399471875,20.5100671875,7.5399471875,20.5100671875,7.5399471875Z" fill-rule="evenodd" fill="#9A9998" fill-opacity="1"/></g><g style="mix-blend-mode:passthrough"><path d="M31.891632031249998,37.7497578125C31.891632031249998,38.7965578125,31.046732031250002,39.6412578125,30.00003203125,39.6412578125C28.95333203125,39.6412578125,28.10840203125,38.7965578125,28.10840203125,37.7497578125C28.10840203125,37.7497578125,28.10840203125,36.5643578125,28.10840203125,36.5643578125C28.10840203125,36.5201578125,28.10840203125,36.4823578125,28.114702031249998,36.4382578125C28.24083203125,34.5466578125,28.94073203125,33.071157812500005,30.176532031249998,31.9551578125C30.67463203125,31.5011578125,31.24213203125,31.1228578125,31.91053203125,30.7634578125C32.38973203125,30.5048578125,32.83743203125,30.3031578125,33.61923203125,29.9689578125C33.61923203125,29.9689578125,33.90933203125,29.8428578125,33.90933203125,29.8428578125C34.01643203125,29.7987578125,34.10473203125,29.7608578125,34.19303203125,29.7230578125C35.62433203125,29.1051578125,36.362032031249996,28.663757812500002,36.923232031249995,28.0332578125C37.61683203125,27.2639578125,37.99513203125,26.1794578125,38.00773203125,24.4833578125C37.99513203125,20.1641578125,34.502032031249996,16.8349578125,30.00003203125,16.8349578125C25.49798203125,16.8349578125,21.99853203125,20.1704878125,21.99853203125,24.495957812500002C21.99853203125,25.5425578125,21.15361203125,26.3875578125,20.10693203125,26.3875578125C19.06024703125,26.3875578125,18.21533203125,25.5425578125,18.21533203125,24.495957812500002C18.21533203124999,18.0392778125,23.44246203125,13.0517578125,29.99363203125,13.0517578125C36.54493203125,13.0517578125,41.77203203125,18.0392778125,41.77203203125,24.495957812500002C41.77203203125,24.495957812500002,41.77203203125,24.5085578125,41.77203203125,24.5085578125C41.753132031250004,27.0874578125,41.06583203125,29.0673578125,39.72283203125,30.5616578125C39.15533203125,31.1984578125,38.48693203125,31.7218578125,37.70513203125,32.188457812500005C37.118732031250005,32.5415578125,36.52603203125,32.8252578125,35.68113203125,33.1909578125C35.59283203125,33.2287578125,35.49823203125,33.2666578125,35.384732031249996,33.317057812499996C35.384732031249996,33.317057812499996,35.094732031250004,33.4368578125,35.094732031250004,33.4368578125C33.76433203125,34.0106578125,33.17163203125,34.3196578125,32.704932031249996,34.7484578125C32.21313203125,35.1960578125,31.94833203125,35.7446578125,31.878932031250002,36.6273578125C31.891632031249998,36.6273578125,31.891632031249998,37.7497578125,31.891632031249998,37.7497578125C31.891632031249998,37.7497578125,31.891632031249998,37.7497578125,31.891632031249998,37.7497578125C31.891632031249998,37.7497578125,31.891632031249998,37.7497578125,31.891632031249998,37.7497578125Z" fill="#9A9998" fill-opacity="1"/></g><g style="mix-blend-mode:passthrough"><path d="M27.47802734375,43.922520625C27.47802734375,45.315990625,28.60667734375,46.444660625,30.00015734375,46.444660625C31.39362734375,46.444660625,32.52229734375,45.315990625,32.52229734375,43.922520625C32.52229734375,42.529040625,31.39362734375,41.400390625,30.00015734375,41.400390625C28.60667734375,41.400390625,27.47802734375,42.529040625,27.47802734375,43.922520625C27.47802734375,43.922520625,27.47802734375,43.922520625,27.47802734375,43.922520625Z" fill="#9A9998" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/screen.png b/static/icon/screen.png
new file mode 100644
index 0000000..6bdb41d
Binary files /dev/null and b/static/icon/screen.png differ
diff --git a/static/icon/search.svg b/static/icon/search.svg
new file mode 100644
index 0000000..0de882b
--- /dev/null
+++ b/static/icon/search.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><g><g transform="matrix(0,1,-1,0,16.00000000000004,-15.999999999999963)"></g><g><path d="M15.35145237250328,14.40964885582924C15.35145237250328,14.40964885582924,15.35375237250328,14.41424885582924,15.35375237250328,14.41424885582924C15.560452372503281,14.664648855829238,15.581152372503281,15.089648855829239,15.397352372503281,15.36524885582924C15.397352372503281,15.36524885582924,15.390452372503281,15.37444885582924,15.390452372503281,15.37444885582924C15.390452372503281,15.37444885582924,15.383552372503281,15.38134885582924,15.383552372503281,15.38134885582924C15.26415237250328,15.503048855829238,15.10105237250328,15.56274885582924,14.896652372503281,15.56274885582924C14.694552372503281,15.56274885582924,14.529152372503281,15.500748855829238,14.409652372503281,15.38134885582924C14.409652372503281,15.38134885582924,11.191652372503281,12.16554885582924,11.191652372503281,12.16554885582924C9.95819237250328,13.132648855829238,8.52026237250328,13.642448855829238,7.022642372503281,13.642448855829238C6.140612372503281,13.642448855829238,5.28155237250328,13.467948855829238,4.470722372503281,13.121048855829239C3.6874523725032806,12.788048855829238,2.984592372503281,12.310248855829238,2.3758823725032805,11.70384885582924C1.7694923725032807,11.097448855829239,1.2917193725032807,10.392268855829238,0.9586623725032807,9.60906885582924C0.6141183725032806,8.79819885582924,0.43725237250328064,7.939128855829239,0.43725237250328064,7.057108855829239C0.43725237250328064,6.175078855829239,0.6118213725032806,5.313708855829239,0.9586623725032807,4.498288855829239C1.2917193725032807,3.710428855829239,1.7694923725032807,3.002958855829239,2.3758823725032805,2.391968855829239C2.982292372503281,1.780968855829239,3.6874523725032806,1.2986108558292389,4.468422372503281,0.9632538558292388C5.28155237250328,0.6141148558292389,6.140612372503281,0.4372488558292389,7.022642372503281,0.4372488558292389C7.904662372503281,0.4372488558292389,8.763722372503281,0.6118188558292389,9.57686237250328,0.9586608558292389C10.36012237250328,1.2917178558292388,11.06295237250328,1.769488855829239,11.671752372503281,2.375888855829239C12.28035237250328,2.982288855829239,12.75585237250328,3.687458855829239,13.08895237250328,4.470728855829239C13.43345237250328,5.2815488558292385,13.61035237250328,6.1406188558292385,13.61035237250328,7.022648855829239C13.61035237250328,8.579998855829238,13.08665237250328,10.054668855829238,12.13565237250328,11.19394885582924C12.13565237250328,11.19394885582924,15.35145237250328,14.40964885582924,15.35145237250328,14.40964885582924C15.35145237250328,14.40964885582924,15.35145237250328,14.40964885582924,15.35145237250328,14.40964885582924ZM1.7763823725032806,7.0570988558292385C1.7763823725032806,9.948998855829238,4.12847237250328,12.303348855829238,7.022652372503281,12.303348855829238C9.914522372503281,12.303348855829238,12.26895237250328,9.95126885582924,12.26895237250328,7.0570988558292385C12.26895237250328,4.162918855829239,9.914522372503281,1.8108188558292388,7.022652372503281,1.8108188558292388C4.13077237250328,1.8108188558292388,1.7763823725032806,4.165208855829238,1.7763823725032806,7.0570988558292385C1.7763823725032806,7.0570988558292385,1.7763823725032806,7.0570988558292385,1.7763823725032806,7.0570988558292385Z" fill-rule="evenodd" fill="#C0C4CC" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/static/icon/warning.svg b/static/icon/warning.svg
new file mode 100644
index 0000000..a517020
--- /dev/null
+++ b/static/icon/warning.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="60" height="60" viewBox="0 0 60 60"><g style="mix-blend-mode:passthrough"><g style="mix-blend-mode:passthrough" transform="matrix(0,1,-1,0,60.000000000000114,-59.999999999999886)"></g><g style="mix-blend-mode:passthrough"><path d="M35.730515625,7.31032296875C35.730515625,7.31032296875,56.773015625,45.02209296875,56.773015625,45.02209296875C58.059015625,47.30109296875,58.059015625,50.14209296875,56.773015625,52.42129296875C55.518015625,54.79249296875,53.108215625,56.26329296875,50.490215625,56.26329296875C50.490215625,56.26329296875,8.413095625,56.26329296875,8.413095625,56.26329296875C5.910765625,56.26329296875,3.446965625,54.75409296875,2.130365625,52.42129296875C0.844565625,50.13459296875,0.844565625,47.30109296875,2.130365625,45.01429296875C2.130365625,45.01429296875,23.172915625,7.302622968750001,23.172915625,7.302622968750001C24.474115625,5.1390829687499995,26.937715625,3.73779296875,29.447715625,3.73779296875C32.081015625,3.73779296875,34.491015625,5.10828296875,35.730515625,7.31032296875C35.730515625,7.31032296875,35.730515625,7.31032296875,35.730515625,7.31032296875ZM8.420765625,51.55099296875C8.420765625,51.55099296875,50.498015625,51.55099296875,50.498015625,51.55099296875C51.375815625,51.55099296875,52.207315625,51.03529296875,52.684715625,50.21159296875C53.177515625,49.21059296875,53.185215625,48.23279296875,52.692315625,47.37029296875C52.692315625,47.37029296875,31.650015625,9.666342968750001,31.650015625,9.666342968750001C31.149515625,8.92719296875,30.287015625,8.449812968749999,29.455515625,8.449812968749999C28.616215625,8.449812968749999,27.754015625,8.92719296875,27.253515625,9.666342968750001C27.253515625,9.666342968750001,6.226435625,47.36249296875,6.226435625,47.36249296875C5.733665625,48.22509296875,5.733665625,49.34129296875,6.226435625,50.20379296875C6.703795625,51.03529296875,7.543045625,51.55099296875,8.420765625,51.55099296875C8.420765625,51.55099296875,8.420765625,51.55099296875,8.420765625,51.55099296875Z" fill-rule="evenodd" fill="#F9AE3D" fill-opacity="1"/></g><g style="mix-blend-mode:passthrough"><path d="M31.50400625,34.095953125C31.50400625,35.189253125,30.54928625,36.143953124999996,29.45595625,36.143953124999996C28.36263625,36.143953124999996,27.40020925,35.189253125,27.40790825,34.095953125C27.40790825,34.095953125,27.40790825,21.799993125,27.40790825,21.799993125C27.40790825,20.706681125,28.36263625,19.751953125,29.45595625,19.751953125C30.54928625,19.751953125,31.50400625,20.706681125,31.50400625,21.799993125C31.50400625,21.799993125,31.50400625,34.095953125,31.50400625,34.095953125C31.50400625,34.095953125,31.50400625,34.095953125,31.50400625,34.095953125ZM29.45595625,46.391953125C27.94686625,46.391953125,26.72265625,45.167653125,26.72265625,43.658753125000004C26.72265625,42.149653125,27.94686625,40.925453125000004,29.45595625,40.925453125000004C30.96502625,40.925453125000004,32.18923625,42.149653125,32.18923625,43.658753125000004C32.18923625,45.167653125,30.96502625,46.391953125,29.45595625,46.391953125C29.45595625,46.391953125,29.45595625,46.391953125,29.45595625,46.391953125Z" fill-rule="evenodd" fill="#F9AE3D" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/static/icon_personal_name.png b/static/icon_personal_name.png
new file mode 100644
index 0000000..88746da
Binary files /dev/null and b/static/icon_personal_name.png differ
diff --git a/static/icon_personal_password.png b/static/icon_personal_password.png
new file mode 100644
index 0000000..5611287
Binary files /dev/null and b/static/icon_personal_password.png differ
diff --git a/static/icon_personal_setting.png b/static/icon_personal_setting.png
new file mode 100644
index 0000000..7508cf6
Binary files /dev/null and b/static/icon_personal_setting.png differ
diff --git a/static/icons_ui/default_blank.png b/static/icons_ui/default_blank.png
new file mode 100644
index 0000000..a9f0fda
Binary files /dev/null and b/static/icons_ui/default_blank.png differ
diff --git a/static/icons_ui/default_data.png b/static/icons_ui/default_data.png
new file mode 100644
index 0000000..939913a
Binary files /dev/null and b/static/icons_ui/default_data.png differ
diff --git a/static/icons_ui/default_notpassed.png b/static/icons_ui/default_notpassed.png
new file mode 100644
index 0000000..b78385b
Binary files /dev/null and b/static/icons_ui/default_notpassed.png differ
diff --git a/static/icons_ui/icon_add.svg b/static/icons_ui/icon_add.svg
new file mode 100644
index 0000000..5edc037
--- /dev/null
+++ b/static/icons_ui/icon_add.svg
@@ -0,0 +1,4 @@
+<svg width="33" height="33" viewBox="0 0 33 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect y="14.5" width="33" height="4" rx="2" fill="white"/>
+<rect x="18.5" width="33" height="4" rx="2" transform="rotate(90 18.5 0)" fill="white"/>
+</svg>
diff --git a/static/icons_ui/icon_apply_num.svg b/static/icons_ui/icon_apply_num.svg
new file mode 100644
index 0000000..9c098c4
--- /dev/null
+++ b/static/icons_ui/icon_apply_num.svg
@@ -0,0 +1,13 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1421_19307)">
+<rect width="200" height="200" fill="white"/>
+<path d="M34 52.1899C34 50.983 34.2803 49.788 34.8248 48.6731C35.3694 47.5581 36.1675 46.545 37.1737 45.6917C38.1799 44.8383 39.3745 44.1614 40.6891 43.6995C42.0038 43.2377 43.4128 43 44.8358 43H72.4179V54.6962H47.791V163.304H152.209V54.6962H127.582V43H155.164C156.587 43 157.996 43.2377 159.311 43.6995C160.626 44.1614 161.82 44.8383 162.826 45.6917C163.832 46.545 164.631 47.5581 165.175 48.6731C165.72 49.788 166 50.983 166 52.1899V165.81C166 167.017 165.72 168.212 165.175 169.327C164.631 170.442 163.832 171.455 162.826 172.308C161.82 173.162 160.626 173.839 159.311 174.3C157.996 174.762 156.587 175 155.164 175H44.8358C43.4128 175 42.0038 174.762 40.6891 174.3C39.3745 173.839 38.1799 173.162 37.1737 172.308C36.1675 171.455 35.3694 170.442 34.8248 169.327C34.2803 168.212 34 167.017 34 165.81V52.1899Z" fill="#777E94"/>
+<path d="M99.5 37.8276C98.8528 37.8276 98.2119 37.9368 97.6139 38.1491C97.016 38.3614 96.4726 38.6726 96.015 39.0648C95.5573 39.4571 95.1943 39.9227 94.9466 40.4352C94.6989 40.9477 94.5714 41.497 94.5714 42.0517V48.6414C94.5714 50.2546 93.8237 51.8018 92.4927 52.9425C91.1618 54.0833 89.3566 54.7241 87.4743 54.7241H78.8V63.1724H120.2V54.7241H111.526C109.643 54.7241 107.838 54.0833 106.507 52.9425C105.176 51.8018 104.429 50.2546 104.429 48.6414V42.0517C104.429 41.497 104.301 40.9477 104.053 40.4352C103.806 39.9227 103.443 39.4571 102.985 39.0648C102.527 38.6726 101.984 38.3614 101.386 38.1491C100.788 37.9368 100.147 37.8276 99.5 37.8276V37.8276ZM80.7714 42.0517C80.7714 37.7945 82.7446 33.7117 86.2569 30.7014C89.7692 27.6912 94.5329 26 99.5 26C104.467 26 109.231 27.6912 112.743 30.7014C116.255 33.7117 118.229 37.7945 118.229 42.0517V42.8966H134V65.7069C134 66.9273 133.72 68.1357 133.175 69.2632C132.63 70.3907 131.831 71.4152 130.824 72.2781C129.817 73.1411 128.622 73.8256 127.307 74.2926C125.991 74.7596 124.581 75 123.157 75H75.8429C74.419 75 73.009 74.7596 71.6935 74.2926C70.378 73.8256 69.1827 73.1411 68.1758 72.2781C67.1689 71.4152 66.3703 70.3907 65.8254 69.2632C65.2805 68.1357 65 66.9273 65 65.7069V42.8966H80.7714V42.0517V42.0517Z" fill="#777E94"/>
+<path d="M95.504 83.984H102.8V94.7H126.892V138.248H119.824V134.22H102.8V153.448H95.504V134.22H78.176V138.78H71.108V94.7H95.504V83.984ZM78.176 127.38H95.504V117.576H78.176V127.38ZM102.8 127.38H119.824V117.576H102.8V127.38ZM78.176 111.116H95.504V101.464H78.176V111.116ZM102.8 111.116H119.824V101.464H102.8V111.116Z" fill="#1677FF"/>
+</g>
+<defs>
+<clipPath id="clip0_1421_19307">
+<rect width="200" height="200" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/static/icons_ui/icon_asn.svg b/static/icons_ui/icon_asn.svg
new file mode 100644
index 0000000..e1ab37d
--- /dev/null
+++ b/static/icons_ui/icon_asn.svg
@@ -0,0 +1,12 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_330_3563)">
+<rect width="200" height="200" fill="white"/>
+<circle cx="100" cy="100" r="70.4839" stroke="#777E94" stroke-width="11.0323"/>
+<path d="M66.0717 88.0195L72.8763 62.8685L81.0589 64.2467L76.58 80.1813H89.3277C90.8781 74.0946 92.1988 67.3762 93.2899 60.0261L101.645 61.0597C100.669 67.5484 99.4053 73.9223 97.8549 80.1813H137.304V88.0195H95.7877C95.6155 88.6511 94.7254 91.35 93.1176 96.116H127.571V103.007C125.331 110.127 121.054 116.501 114.737 122.128C121.226 125.746 129.121 129.105 138.424 132.206L134.203 139.958C123.925 136.225 115.168 132.062 107.933 127.469C101.157 132.177 92.8018 136.484 82.8677 140.389L78.5611 132.637C87.117 129.536 94.4957 126.119 100.697 122.387C95.07 117.908 90.8781 113.113 88.1219 108.002C81.9203 120.693 74.1108 130.856 64.6936 138.494L60.4731 130.914C72.3595 120.406 81.2312 106.107 87.0883 88.0195H66.0717ZM94.0651 103.523C96.9362 108.634 101.415 113.343 107.502 117.649C112.957 113.228 116.89 108.519 119.302 103.523H94.0651ZM116.115 60.1123C121.972 64.5338 126.968 69.0701 131.102 73.7213L125.245 79.5784C121.743 75.042 116.862 70.3621 110.603 65.5387L116.115 60.1123Z" fill="#035DFF"/>
+</g>
+<defs>
+<clipPath id="clip0_330_3563">
+<rect width="200" height="200" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/static/icons_ui/icon_avn.svg b/static/icons_ui/icon_avn.svg
new file mode 100644
index 0000000..d2694bc
--- /dev/null
+++ b/static/icons_ui/icon_avn.svg
@@ -0,0 +1,12 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1404_18305)">
+<rect width="200" height="200" fill="white"/>
+<circle cx="100" cy="100" r="70.4839" stroke="#777E94" stroke-width="11.0323"/>
+<path d="M106.124 135.689C91.883 138.618 77.5275 140.972 63.0571 142.752L61.1621 134.914C67.134 134.282 73.6802 133.45 80.8005 132.416V118.204H64.8659V110.366H80.8005V101.236H89.0693V110.366H103.626V118.204H89.0693V131.038C93.2612 130.291 98.946 129.143 106.124 127.593V135.689ZM62.4541 67.4715H105.779V75.2235H84.1597C80.657 82.4587 77.3265 88.1722 74.1683 92.364C80.5996 91.7323 87.3467 90.8136 94.4096 89.6077C91.4811 85.1862 89.701 82.5448 89.0693 81.6835L95.3571 77.6352C101.214 85.4446 105.578 92.0195 108.449 97.3597L101.645 102.097L98.1133 95.6371C87.2031 97.6468 75.4603 99.2834 62.8848 100.547L61.076 93.2253C62.5116 93.0531 63.5739 92.7947 64.2629 92.4501C67.0192 90.1532 70.7229 84.411 75.3741 75.2235H62.4541V67.4715ZM115.426 143.097L113.617 135.172C118.211 135.459 122.116 135.603 125.331 135.603C127.514 135.603 128.605 134.483 128.605 132.244V64.6291H136.873V134.311C136.873 140.168 133.974 143.097 128.174 143.097H115.426ZM111.809 72.3811H119.733V125.181H111.809V72.3811Z" fill="#035DFF"/>
+</g>
+<defs>
+<clipPath id="clip0_1404_18305">
+<rect width="200" height="200" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/static/icons_ui/icon_buy_num.svg b/static/icons_ui/icon_buy_num.svg
new file mode 100644
index 0000000..9a6f363
--- /dev/null
+++ b/static/icons_ui/icon_buy_num.svg
@@ -0,0 +1,13 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1414_18571)">
+<rect width="200" height="200" fill="white"/>
+<path d="M34 52.1899C34 50.983 34.2803 49.788 34.8248 48.6731C35.3694 47.5581 36.1675 46.545 37.1737 45.6917C38.1799 44.8383 39.3745 44.1614 40.6891 43.6995C42.0038 43.2377 43.4128 43 44.8358 43H72.4179V54.6962H47.791V163.304H152.209V54.6962H127.582V43H155.164C156.587 43 157.996 43.2377 159.311 43.6995C160.626 44.1614 161.82 44.8383 162.826 45.6917C163.832 46.545 164.631 47.5581 165.175 48.6731C165.72 49.788 166 50.983 166 52.1899V165.81C166 167.017 165.72 168.212 165.175 169.327C164.631 170.442 163.832 171.455 162.826 172.308C161.82 173.162 160.626 173.839 159.311 174.3C157.996 174.762 156.587 175 155.164 175H44.8358C43.4128 175 42.0038 174.762 40.6891 174.3C39.3745 173.839 38.1799 173.162 37.1737 172.308C36.1675 171.455 35.3694 170.442 34.8248 169.327C34.2803 168.212 34 167.017 34 165.81V52.1899Z" fill="#777E94"/>
+<path d="M99.5 37.8276C98.8528 37.8276 98.2119 37.9368 97.6139 38.1491C97.016 38.3614 96.4726 38.6726 96.015 39.0648C95.5573 39.4571 95.1943 39.9227 94.9466 40.4352C94.6989 40.9477 94.5714 41.497 94.5714 42.0517V48.6414C94.5714 50.2546 93.8237 51.8018 92.4927 52.9425C91.1618 54.0833 89.3566 54.7241 87.4743 54.7241H78.8V63.1724H120.2V54.7241H111.526C109.643 54.7241 107.838 54.0833 106.507 52.9425C105.176 51.8018 104.429 50.2546 104.429 48.6414V42.0517C104.429 41.497 104.301 40.9477 104.053 40.4352C103.806 39.9227 103.443 39.4571 102.985 39.0648C102.527 38.6726 101.984 38.3614 101.386 38.1491C100.788 37.9368 100.147 37.8276 99.5 37.8276V37.8276ZM80.7714 42.0517C80.7714 37.7945 82.7446 33.7117 86.2569 30.7014C89.7692 27.6912 94.5329 26 99.5 26C104.467 26 109.231 27.6912 112.743 30.7014C116.255 33.7117 118.229 37.7945 118.229 42.0517V42.8966H134V65.7069C134 66.9273 133.72 68.1357 133.175 69.2632C132.63 70.3907 131.831 71.4152 130.824 72.2781C129.817 73.1411 128.622 73.8256 127.307 74.2926C125.991 74.7596 124.581 75 123.157 75H75.8429C74.419 75 73.009 74.7596 71.6935 74.2926C70.378 73.8256 69.1827 73.1411 68.1758 72.2781C67.1689 71.4152 66.3703 70.3907 65.8254 69.2632C65.2805 68.1357 65 66.9273 65 65.7069V42.8966H80.7714V42.0517V42.0517Z" fill="#777E94"/>
+<path d="M128.184 97.056C124.941 103.541 121.091 109.165 116.632 113.928L110.856 109.824C115.061 105.213 118.659 99.8933 121.648 93.864L128.184 97.056ZM99.304 95.232C101.635 99.2853 103.687 103.744 105.46 108.608L98.468 110.356C96.948 105.897 94.9973 101.591 92.616 97.436L99.304 95.232ZM78.632 97.056C81.368 101.16 83.7747 105.593 85.852 110.356L79.24 113.32C77.0107 108.051 74.5027 103.389 71.716 99.336L78.632 97.056ZM128.716 89.912C114.023 92.9013 94.6173 94.396 70.5 94.396L68.296 87.708C90.8427 87.708 109.817 86.416 125.22 83.832L128.716 89.912ZM68.372 118.488H95.428V111.952H102.572V118.488H129.704V125.48H108.728C113.947 132.523 122.281 138.755 133.732 144.176L128.564 150.636C116.404 143.087 107.816 134.701 102.8 125.48H102.572V153.448H95.428V125.48C89.9053 135.816 80.9627 144.328 68.6 151.016L64.496 144.252C75.744 139.185 84.0027 132.928 89.272 125.48H68.372V118.488Z" fill="#1677FF"/>
+</g>
+<defs>
+<clipPath id="clip0_1414_18571">
+<rect width="200" height="200" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/static/icons_ui/icon_camera_black.svg b/static/icons_ui/icon_camera_black.svg
new file mode 100644
index 0000000..94c440c
--- /dev/null
+++ b/static/icons_ui/icon_camera_black.svg
@@ -0,0 +1,8 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="path-1-inside-1_1407_18323" fill="white">
+<rect x="29" y="43" width="141" height="114" rx="10"/>
+</mask>
+<rect x="29" y="43" width="141" height="114" rx="10" stroke="#101010" stroke-width="23" mask="url(#path-1-inside-1_1407_18323)"/>
+<circle cx="85.5" cy="100.5" r="25.75" stroke="#101010" stroke-width="11.5"/>
+<rect x="128" y="67" width="25" height="10" rx="5" fill="#101010"/>
+</svg>
diff --git a/static/icons_ui/icon_camera_white.svg b/static/icons_ui/icon_camera_white.svg
new file mode 100644
index 0000000..8bdb5dc
--- /dev/null
+++ b/static/icons_ui/icon_camera_white.svg
@@ -0,0 +1,8 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="path-1-inside-1_1387_18303" fill="white">
+<rect x="29" y="43" width="141" height="114" rx="10"/>
+</mask>
+<rect x="29" y="43" width="141" height="114" rx="10" stroke="white" stroke-width="23" mask="url(#path-1-inside-1_1387_18303)"/>
+<circle cx="85.5" cy="100.5" r="25.75" stroke="white" stroke-width="11.5"/>
+<rect x="128" y="67" width="25" height="10" rx="5" fill="white"/>
+</svg>
diff --git a/static/icons_ui/icon_close.svg b/static/icons_ui/icon_close.svg
new file mode 100644
index 0000000..7c0e9dd
--- /dev/null
+++ b/static/icons_ui/icon_close.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="96" height="96" viewBox="0 0 96 96"><defs><clipPath id="master_svg0_1152_20357/146_3705"><rect x="0" y="0" width="96" height="96" rx="0"/></clipPath></defs><g style="mix-blend-mode:passthrough" clip-path="url(#master_svg0_1152_20357/146_3705)"><g style="mix-blend-mode:passthrough"><path d="M35.560471125,59.2929L59.560478125,35.292893Q59.630078125,35.223249,59.711978125,35.16853Q59.793878125,35.113812,59.884878125,35.076121Q59.975878125,35.03843,60.072478125,35.019215Q60.169078125,35,60.267578125,35Q60.366078125,35,60.462678125,35.019215Q60.559278125,35.03843,60.650278125,35.076121Q60.741278125,35.113812,60.823178125,35.16853Q60.905078125,35.223249,60.974678125,35.292893Q61.044278125000005,35.362537,61.099078125,35.44443Q61.153778125,35.526322,61.191478125,35.617317Q61.229178125000004,35.708311,61.248378125,35.80491Q61.267578125,35.9015086,61.267578125,35.9999999650844Q61.267578125,36.0984914,61.248378125,36.19509Q61.229178125000004,36.291689,61.191478125,36.382683Q61.153778125,36.473678,61.099078125,36.55557Q61.044278125000005,36.637463,60.974678125,36.707107L36.974685125,60.7071Q36.905041125,60.7768,36.823148125,60.8315Q36.741256125,60.8862,36.650261125,60.9239Q36.559267125,60.961600000000004,36.462668125,60.9808Q36.366069525,61,36.2675781599156,61Q36.169086725,61,36.072488125,60.9808Q35.975889125,60.961600000000004,35.884895125,60.9239Q35.793900125,60.8862,35.712008125,60.8315Q35.630115125,60.7768,35.560471125,60.7071Q35.490827125,60.6375,35.436108125,60.5556Q35.381390125,60.4737,35.343699125,60.3827Q35.306008125,60.2917,35.286793125,60.1951Q35.267578125,60.0985,35.267578125,60Q35.267578125,59.9015,35.286793125,59.8049Q35.306008125,59.7083,35.343699125,59.6173Q35.381390125,59.5263,35.436108125,59.4444Q35.490827125,59.3625,35.560471125,59.2929ZM37.267578125,60Q37.267578125,60.0985,37.248363125,60.1951Q37.229148125,60.2917,37.191457125,60.3827Q37.153766125,60.4737,37.099048125,60.5556Q37.044329125,60.6375,36.974685125,60.7071Q36.905041125,60.776700000000005,36.823148125,60.8315Q36.741256125,60.8862,36.650261125,60.9239Q36.559267125,60.961600000000004,36.462668125,60.9808Q36.366069525,61,36.267578125,61Q36.169086725,61,36.072488125,60.9808Q35.975889125,60.961600000000004,35.884895125,60.9239Q35.793900125,60.8862,35.712008125,60.8315Q35.630115125,60.776700000000005,35.560471125,60.7071Q35.490827125,60.6375,35.436108125,60.5556Q35.381390125,60.4737,35.343699125,60.3827Q35.306008125,60.2917,35.286793125,60.1951Q35.267578125,60.0985,35.267578125,60Q35.267578125,59.9015,35.286793125,59.8049Q35.306008125,59.7083,35.343699125,59.6173Q35.381390125,59.5263,35.436108125,59.4444Q35.490827125,59.3625,35.560471125,59.2929Q35.630115125,59.2232,35.712008125,59.1685Q35.793900125,59.1138,35.884895125,59.0761Q35.975889125,59.038399999999996,36.072488125,59.0192Q36.169086725,59,36.267578125,59Q36.366069525,59,36.462668125,59.0192Q36.559267125,59.038399999999996,36.650261125,59.0761Q36.741256125,59.1138,36.823148125,59.1685Q36.905041125,59.2232,36.974685125,59.2929Q37.044329125,59.3625,37.099048125,59.4444Q37.153766125,59.5263,37.191457125,59.6173Q37.229148125,59.7083,37.248363125,59.8049Q37.267578125,59.9015,37.267578125,60ZM61.267578125,36Q61.267578125,36.0984914,61.248378125,36.19509Q61.229178125000004,36.291689,61.191478125,36.382683Q61.153778125,36.473678,61.099078125,36.55557Q61.044278125000005,36.637463,60.974678125,36.707107Q60.905078125,36.776751,60.823178125,36.83147Q60.741278125,36.886188,60.650278125,36.923879Q60.559278125,36.96157,60.462678125,36.980785Q60.366078125,37,60.267578125,37Q60.169078125,37,60.072478125,36.980785Q59.975878125,36.96157,59.884878125,36.923879Q59.793878125,36.886188,59.711978125,36.83147Q59.630078125,36.776751,59.560478125,36.707107Q59.490778125,36.637463,59.436078125,36.55557Q59.381378125,36.473678,59.343678125,36.382683Q59.305978124999996,36.291689,59.286778125,36.19509Q59.267578125,36.0984914,59.267578125,36Q59.267578125,35.9015086,59.286778125,35.80491Q59.305978124999996,35.708311,59.343678125,35.617317Q59.381378125,35.526322,59.436078125,35.44443Q59.490778125,35.362537,59.560478125,35.292893Q59.630078125,35.223249,59.711978125,35.16853Q59.793878125,35.113812,59.884878125,35.076121Q59.975878125,35.03843,60.072478125,35.019215Q60.169078125,35,60.267578125,35Q60.366078125,35,60.462678125,35.019215Q60.559278125,35.03843,60.650278125,35.076121Q60.741278125,35.113812,60.823178125,35.16853Q60.905078125,35.223249,60.974678125,35.292893Q61.044278125000005,35.362537,61.099078125,35.44443Q61.153778125,35.526322,61.191478125,35.617317Q61.229178125000004,35.708311,61.248378125,35.80491Q61.267578125,35.9015086,61.267578125,36Z" fill="#909399" fill-opacity="1"/></g><g style="mix-blend-mode:passthrough"><path d="M59.560478125,60.7071L35.560471125,36.707107Q35.490827125,36.637463,35.436108125,36.55557Q35.381390125,36.473678,35.343699125,36.382683Q35.306008125,36.291689,35.286793125,36.19509Q35.267578125,36.0984914,35.267578125,35.9999999650844Q35.267578125,35.9015086,35.286793125,35.80491Q35.306008125,35.708311,35.343699125,35.617317Q35.381390125,35.526322,35.436108125,35.44443Q35.490827125,35.362537,35.560471125,35.292893Q35.630115125,35.223249,35.712008125,35.16853Q35.793900125,35.113812,35.884895125,35.076121Q35.975889125,35.03843,36.072488125,35.019215Q36.169086725,35,36.2675781599156,35Q36.366069525,35,36.462668125,35.019215Q36.559267125,35.03843,36.650261125,35.076121Q36.741256125,35.113812,36.823148125,35.16853Q36.905041125,35.223249,36.974685125,35.292893L60.974678125,59.2929Q61.044278125000005,59.3625,61.099078125,59.4444Q61.153778125,59.5263,61.191478125,59.6173Q61.229178125000004,59.7083,61.248378125,59.8049Q61.267578125,59.9015,61.267578125,60Q61.267578125,60.0985,61.248378125,60.1951Q61.229178125000004,60.2917,61.191478125,60.3827Q61.153778125,60.4737,61.099078125,60.5556Q61.044278125000005,60.6375,60.974678125,60.7071Q60.905078125,60.7768,60.823178125,60.8315Q60.741278125,60.8862,60.650278125,60.9239Q60.559278125,60.961600000000004,60.462678125,60.9808Q60.366078125,61,60.267578125,61Q60.169078125,61,60.072478125,60.9808Q59.975878125,60.961600000000004,59.884878125,60.9239Q59.793878125,60.8862,59.711978125,60.8315Q59.630078125,60.7768,59.560478125,60.7071ZM61.267578125,60Q61.267578125,60.0985,61.248378125,60.1951Q61.229178125000004,60.2917,61.191478125,60.3827Q61.153778125,60.4737,61.099078125,60.5556Q61.044278125000005,60.6375,60.974678125,60.7071Q60.905078125,60.776700000000005,60.823178125,60.8315Q60.741278125,60.8862,60.650278125,60.9239Q60.559278125,60.961600000000004,60.462678125,60.9808Q60.366078125,61,60.267578125,61Q60.169078125,61,60.072478125,60.9808Q59.975878125,60.961600000000004,59.884878125,60.9239Q59.793878125,60.8862,59.711978125,60.8315Q59.630078125,60.776700000000005,59.560478125,60.7071Q59.490778125,60.6375,59.436078125,60.5556Q59.381378125,60.4737,59.343678125,60.3827Q59.305978124999996,60.2917,59.286778125,60.1951Q59.267578125,60.0985,59.267578125,60Q59.267578125,59.9015,59.286778125,59.8049Q59.305978124999996,59.7083,59.343678125,59.6173Q59.381378125,59.5263,59.436078125,59.4444Q59.490778125,59.3625,59.560478125,59.2929Q59.630078125,59.2232,59.711978125,59.1685Q59.793878125,59.1138,59.884878125,59.0761Q59.975878125,59.038399999999996,60.072478125,59.0192Q60.169078125,59,60.267578125,59Q60.366078125,59,60.462678125,59.0192Q60.559278125,59.038399999999996,60.650278125,59.0761Q60.741278125,59.1138,60.823178125,59.1685Q60.905078125,59.2232,60.974678125,59.2929Q61.044278125000005,59.3625,61.099078125,59.4444Q61.153778125,59.5263,61.191478125,59.6173Q61.229178125000004,59.7083,61.248378125,59.8049Q61.267578125,59.9015,61.267578125,60ZM37.267578125,36Q37.267578125,36.0984914,37.248363125,36.19509Q37.229148125,36.291689,37.191457125,36.382683Q37.153766125,36.473678,37.099048125,36.55557Q37.044329125,36.637463,36.974685125,36.707107Q36.905041125,36.776751,36.823148125,36.83147Q36.741256125,36.886188,36.650261125,36.923879Q36.559267125,36.96157,36.462668125,36.980785Q36.366069525,37,36.267578125,37Q36.169086725,37,36.072488125,36.980785Q35.975889125,36.96157,35.884895125,36.923879Q35.793900125,36.886188,35.712008125,36.83147Q35.630115125,36.776751,35.560471125,36.707107Q35.490827125,36.637463,35.436108125,36.55557Q35.381390125,36.473678,35.343699125,36.382683Q35.306008125,36.291689,35.286793125,36.19509Q35.267578125,36.0984914,35.267578125,36Q35.267578125,35.9015086,35.286793125,35.80491Q35.306008125,35.708311,35.343699125,35.617317Q35.381390125,35.526322,35.436108125,35.44443Q35.490827125,35.362537,35.560471125,35.292893Q35.630115125,35.223249,35.712008125,35.16853Q35.793900125,35.113812,35.884895125,35.076121Q35.975889125,35.03843,36.072488125,35.019215Q36.169086725,35,36.267578125,35Q36.366069525,35,36.462668125,35.019215Q36.559267125,35.03843,36.650261125,35.076121Q36.741256125,35.113812,36.823148125,35.16853Q36.905041125,35.223249,36.974685125,35.292893Q37.044329125,35.362537,37.099048125,35.44443Q37.153766125,35.526322,37.191457125,35.617317Q37.229148125,35.708311,37.248363125,35.80491Q37.267578125,35.9015086,37.267578125,36Z" fill="#909399" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/static/icons_ui/icon_customer.svg b/static/icons_ui/icon_customer.svg
new file mode 100644
index 0000000..ced7ba7
--- /dev/null
+++ b/static/icons_ui/icon_customer.svg
@@ -0,0 +1,4 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M100 100.624C101.197 100.624 102.363 101.008 103.326 101.719C104.29 102.43 105 103.432 105.352 104.576L117.8 145.024C118.068 145.897 118.118 146.822 117.946 147.718C117.775 148.615 117.387 149.456 116.816 150.168L104.368 165.72C103.843 166.376 103.178 166.905 102.421 167.268C101.664 167.632 100.836 167.821 99.996 167.821C99.1564 167.821 98.3275 167.632 97.5707 167.268C96.814 166.905 96.1486 166.376 95.624 165.72L83.184 150.168C82.6131 149.456 82.2251 148.615 82.0536 147.718C81.8821 146.822 81.9323 145.897 82.2 145.024L94.648 104.576C95.0004 103.432 95.7103 102.43 96.6735 101.719C97.6367 101.008 98.8026 100.624 100 100.624V100.624ZM93.776 145.48L100 153.256L106.216 145.48L100 125.264L93.776 145.48Z" fill="#035DFF"/>
+<path d="M99.9999 32.1758C91.914 32.1758 84.1592 35.3879 78.4416 41.1055C72.724 46.8231 69.5119 54.5779 69.5119 62.6638C69.5119 70.7497 72.724 78.5044 78.4416 84.2221C84.1592 89.9397 91.914 93.1518 99.9999 93.1518C108.086 93.1518 115.841 89.9397 121.558 84.2221C127.276 78.5044 130.488 70.7497 130.488 62.6638C130.488 54.5779 127.276 46.8231 121.558 41.1055C115.841 35.3879 108.086 32.1758 99.9999 32.1758V32.1758ZM80.7199 62.6638C80.7199 57.5483 82.752 52.6423 86.3692 49.0251C89.9864 45.4079 94.8924 43.3758 100.008 43.3758C105.123 43.3758 110.029 45.4079 113.647 49.0251C117.264 52.6423 119.296 57.5483 119.296 62.6638C119.296 67.7793 117.264 72.6853 113.647 76.3025C110.029 79.9197 105.123 81.9518 100.008 81.9518C94.8924 81.9518 89.9864 79.9197 86.3692 76.3025C82.752 72.6853 80.7199 67.7793 80.7199 62.6638V62.6638ZM99.9999 100.624C83.6626 100.624 67.9944 107.114 56.4421 118.666C44.8899 130.218 38.3999 145.886 38.3999 162.224C38.3999 163.709 38.9899 165.133 40.0401 166.184C41.0903 167.234 42.5147 167.824 43.9999 167.824C45.4851 167.824 46.9095 167.234 47.9597 166.184C49.0099 165.133 49.5999 163.709 49.5999 162.224C49.5999 148.857 54.9099 136.037 64.3617 126.586C73.8136 117.134 86.633 111.824 99.9999 111.824C113.367 111.824 126.186 117.134 135.638 126.586C145.09 136.037 150.4 148.857 150.4 162.224C150.4 163.709 150.99 165.133 152.04 166.184C153.09 167.234 154.515 167.824 156 167.824C157.485 167.824 158.909 167.234 159.96 166.184C161.01 165.133 161.6 163.709 161.6 162.224C161.6 154.134 160.007 146.124 156.911 138.65C153.815 131.177 149.278 124.386 143.558 118.666C137.838 112.946 131.047 108.408 123.573 105.313C116.1 102.217 108.089 100.624 99.9999 100.624V100.624Z" fill="#777E94"/>
+</svg>
diff --git a/static/icons_ui/icon_date.svg b/static/icons_ui/icon_date.svg
new file mode 100644
index 0000000..de352cd
--- /dev/null
+++ b/static/icons_ui/icon_date.svg
@@ -0,0 +1,4 @@
+<svg width="38" height="38" viewBox="0 0 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.8197 17.0341C24.0198 17.2344 24.1322 17.5061 24.1322 17.7893C24.1322 18.0725 24.0198 18.3442 23.8197 18.5446L18.4015 23.9627C18.3023 24.0621 18.1844 24.1409 18.0547 24.1946C17.925 24.2484 17.7859 24.2761 17.6455 24.2761C17.505 24.2761 17.366 24.2484 17.2363 24.1946C17.1065 24.1409 16.9887 24.0621 16.8894 23.9627L14.1804 21.2552C13.9798 21.0547 13.8672 20.7827 13.8672 20.4992C13.8672 20.2156 13.9798 19.9437 14.1804 19.7431C14.3809 19.5426 14.6528 19.43 14.9364 19.43C15.22 19.43 15.4919 19.5426 15.6924 19.7431L17.6447 21.6954L22.3076 17.0341C22.4069 16.9347 22.5247 16.8559 22.6544 16.8021C22.7842 16.7484 22.9232 16.7207 23.0636 16.7207C23.2041 16.7207 23.3431 16.7484 23.4728 16.8021C23.6026 16.8559 23.7204 16.9347 23.8197 17.0341Z" fill="#1677FF"/>
+<path d="M14.3341 5.05469C14.9231 5.05469 15.4029 5.53285 15.4029 6.12344V6.84385H22.5975V6.12344C22.5975 5.83999 22.7101 5.56815 22.9106 5.36772C23.111 5.16729 23.3828 5.05469 23.6663 5.05469C23.9497 5.05469 24.2216 5.16729 24.422 5.36772C24.6224 5.56815 24.735 5.83999 24.735 6.12344V6.84385H28.9166C30.1294 6.84385 31.1127 7.82552 31.1127 9.03994V27.1216C31.1127 28.3344 30.131 29.3177 28.9166 29.3177H9.08378C7.87095 29.3177 6.8877 28.336 6.8877 27.1232V9.03994C6.8877 7.8271 7.86936 6.84385 9.08378 6.84385H13.2638V6.12344C13.2638 5.53285 13.7435 5.05469 14.3341 5.05469ZM22.5991 8.90219H15.4013V10.7895C15.4013 10.9299 15.3736 11.0688 15.3199 11.1985C15.2662 11.3282 15.1875 11.446 15.0882 11.5452C14.989 11.6445 14.8712 11.7232 14.7415 11.7769C14.6119 11.8306 14.4729 11.8583 14.3325 11.8583C14.1922 11.8583 14.0532 11.8306 13.9235 11.7769C13.7939 11.7232 13.6761 11.6445 13.5768 11.5452C13.4776 11.446 13.3988 11.3282 13.3451 11.1985C13.2914 11.0688 13.2638 10.9299 13.2638 10.7895V8.90219H9.08378C9.04725 8.90219 9.01221 8.9167 8.98637 8.94253C8.96054 8.96837 8.94603 9.0034 8.94603 9.03994V13.2595H29.0544V9.04152C29.0544 9.00499 29.0398 8.96995 29.014 8.94412C28.9882 8.91828 28.9531 8.90377 28.9166 8.90377H24.7366V10.7911C24.7366 11.0746 24.624 11.3464 24.4236 11.5468C24.2232 11.7473 23.9513 11.8599 23.6679 11.8599C23.3844 11.8599 23.1126 11.7473 22.9121 11.5468C22.7117 11.3464 22.5991 11.0746 22.5991 10.7911V8.90219ZM8.94603 15.3194V27.1216C8.94603 27.1976 9.00778 27.2594 9.08378 27.2594H28.9166C28.9531 27.2594 28.9882 27.2448 29.014 27.219C29.0398 27.1932 29.0544 27.1581 29.0544 27.1216V15.3194H8.94603Z" fill="#777E94"/>
+</svg>
diff --git a/static/icons_ui/icon_down.svg b/static/icons_ui/icon_down.svg
new file mode 100644
index 0000000..95a4c41
--- /dev/null
+++ b/static/icons_ui/icon_down.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="1672729472118" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2683" width="16" height="16" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M185.884 327.55 146.3 367.133 512.021 732.779 877.7 367.133 838.117 327.55 511.997 653.676Z" p-id="2684" fill="#bfbfbf"></path></svg>
\ No newline at end of file
diff --git a/static/icons_ui/icon_erp.svg b/static/icons_ui/icon_erp.svg
new file mode 100644
index 0000000..385359d
--- /dev/null
+++ b/static/icons_ui/icon_erp.svg
@@ -0,0 +1,11 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1406_18319)">
+<circle cx="100" cy="100" r="70.4839" stroke="#777E94" stroke-width="11.0323"/>
+<path d="M78.7064 71.5008H122.893V79.5112H88.095V97.4269H120.826V105.437H88.095V124.99H124.357V133H78.7064V71.5008Z" fill="#035DFF"/>
+</g>
+<defs>
+<clipPath id="clip0_1406_18319">
+<rect width="200" height="200" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/static/icons_ui/icon_form.svg b/static/icons_ui/icon_form.svg
new file mode 100644
index 0000000..d6fc9f2
--- /dev/null
+++ b/static/icons_ui/icon_form.svg
@@ -0,0 +1,5 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M31.25 6.25C31.9123 6.25 32.5385 6.51156 33.0135 6.98652C33.4884 7.46148 33.75 8.08773 33.75 8.75V31.25C33.75 31.9123 33.4884 32.5385 33.0135 33.0135C32.5385 33.4884 31.9123 33.75 31.25 33.75H8.75C8.08773 33.75 7.46148 33.4884 6.98652 33.0135C6.51156 32.5385 6.25 31.9123 6.25 31.25V8.75C6.25 8.08773 6.51156 7.46148 6.98652 6.98652C7.46148 6.51156 8.08773 6.25 8.75 6.25H31.25ZM31.25 3.75H8.75C6 3.75 3.75 6 3.75 8.75V31.25C3.75 34 6 36.25 8.75 36.25H31.25C34 36.25 36.25 34 36.25 31.25V8.75C36.25 6 34 3.75 31.25 3.75Z" fill="#5A7CF3"/>
+<path d="M5 11.25H35V13.75H5V11.25ZM5 18.75H35V21.25H5V18.75ZM5 26.25H35V28.75H5V26.25Z" fill="#5A7CF3"/>
+<path d="M13.75 12.5H16.25V35H13.75V12.5ZM23.75 12.5H26.25V35H23.75V12.5ZM7.5 5L5 7.5V12.5H35V7.5L32.5 5H7.5Z" fill="#5A7CF3"/>
+</svg>
diff --git a/static/icons_ui/icon_kw.svg b/static/icons_ui/icon_kw.svg
new file mode 100644
index 0000000..54f3ffc
--- /dev/null
+++ b/static/icons_ui/icon_kw.svg
@@ -0,0 +1,10 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1417_18667)">
+<path d="M105.64 43.76C107.32 46.48 109.16 50.04 111.16 54.44H153.76V65.6H65.8V91.4C65.4 118.04 61.52 139.36 54.16 155.36L44.68 146.84C50.84 133.4 54.04 114.92 54.28 91.4V54.44H98.44C97.16 52.04 95.32 49.2 92.92 45.92L105.64 43.76ZM105.88 69.8L103.24 77.72H148.48V87.68H99.4C96.44 94.56 93.32 100.64 90.04 105.92H108.64V92.72H119.92V105.92H145.84V116.12H119.92V126.92H154.84V137.24H119.92V155.48H108.64V137.24H66.64V126.92H108.64V116.12H78.52L76.12 106.16C80.2 101.04 83.88 94.88 87.16 87.68H71.08V77.72H91.36C92.56 74.36 93.76 70.88 94.96 67.28L105.88 69.8Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1417_18667">
+<rect width="200" height="200" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/static/icons_ui/icon_kw_blue.svg b/static/icons_ui/icon_kw_blue.svg
new file mode 100644
index 0000000..23f200d
--- /dev/null
+++ b/static/icons_ui/icon_kw_blue.svg
@@ -0,0 +1,5 @@
+<svg width="38" height="38" viewBox="0 0 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.12487 26.084C7.39782 26.084 7.65959 26.1924 7.8526 26.3854C8.04561 26.5784 8.15404 26.8402 8.15404 27.1132V29.1129H29.8457V27.1132C29.8457 26.8402 29.9541 26.5784 30.1471 26.3854C30.3401 26.1924 30.6019 26.084 30.8749 26.084C31.1478 26.084 31.4096 26.1924 31.6026 26.3854C31.7956 26.5784 31.904 26.8402 31.904 27.1132V30.1421C31.904 30.2772 31.8774 30.411 31.8257 30.5359C31.774 30.6608 31.6982 30.7742 31.6026 30.8698C31.507 30.9654 31.3936 31.0412 31.2687 31.0929C31.1439 31.1446 31.01 31.1712 30.8749 31.1712H7.12487C6.98972 31.1712 6.85589 31.1446 6.73103 31.0929C6.60616 31.0412 6.49271 30.9654 6.39714 30.8698C6.30157 30.7742 6.22576 30.6608 6.17404 30.5359C6.12232 30.411 6.0957 30.2772 6.0957 30.1421V27.1132C6.0957 26.8402 6.20413 26.5784 6.39714 26.3854C6.59015 26.1924 6.85192 26.084 7.12487 26.084Z" fill="#777E94"/>
+<path d="M14.9473 17.2509C14.9473 16.957 15.064 16.6751 15.2719 16.4672C15.4797 16.2593 15.7617 16.1426 16.0556 16.1426H21.9013C22.0468 16.1426 22.191 16.1712 22.3255 16.2269C22.46 16.2826 22.5822 16.3642 22.6851 16.4671C22.788 16.5701 22.8697 16.6922 22.9254 16.8267C22.9811 16.9612 23.0098 17.1053 23.0098 17.2509C23.0098 17.3965 22.9811 17.5406 22.9254 17.6751C22.8697 17.8096 22.788 17.9318 22.6851 18.0347C22.5822 18.1376 22.46 18.2192 22.3255 18.2749C22.191 18.3306 22.0468 18.3593 21.9013 18.3592H16.0556C15.7617 18.3592 15.4797 18.2425 15.2719 18.0346C15.064 17.8268 14.9473 17.5449 14.9473 17.2509Z" fill="#5A7CF3"/>
+<path d="M12.6445 7.28029C12.7331 7.16461 12.8472 7.07088 12.9779 7.00636C13.1086 6.94184 13.2524 6.90825 13.3981 6.9082H25.1575C25.3154 6.90831 25.4707 6.94774 25.6095 7.02293C25.7482 7.09813 25.8661 7.20671 25.9524 7.33887L29.1729 12.2678C29.3016 12.4651 29.3524 12.7033 29.3154 12.936C29.3233 12.9835 29.328 13.0341 29.328 13.0848V23.5886C29.328 24.9329 28.2371 26.0222 26.8929 26.0222H11.107C9.76121 26.0222 8.67188 24.9329 8.67188 23.5886V12.7871C8.67188 12.5623 8.75104 12.3565 8.88088 12.1934L12.6445 7.28029V7.28029ZM10.5719 13.7371V23.5886C10.5719 23.8831 10.811 24.1222 11.107 24.1222H26.8929C26.9631 24.1224 27.0326 24.1088 27.0976 24.082C27.1625 24.0553 27.2215 24.0161 27.2712 23.9665C27.3209 23.9169 27.3604 23.858 27.3873 23.7932C27.4142 23.7283 27.428 23.6588 27.428 23.5886V13.7355H10.5719V13.7371ZM13.87 8.8082L11.5472 11.8371H18.023V8.8082H13.87ZM24.6445 8.8082H19.9262V11.8371H26.6237L24.6445 8.8082Z" fill="#777E94"/>
+</svg>
diff --git a/static/icons_ui/icon_kw_use.svg b/static/icons_ui/icon_kw_use.svg
new file mode 100644
index 0000000..f0f037a
--- /dev/null
+++ b/static/icons_ui/icon_kw_use.svg
@@ -0,0 +1,10 @@
+<svg width="45" height="40" viewBox="0 0 45 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_1463_18681" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="45" height="40">
+<path d="M0 0H37C41.4183 0 45 3.58172 45 8V40H0V0Z" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_1463_18681)">
+<path d="M7.01442 -20L59 26.4118L46.9856 40L-5 -6.41177L7.01442 -20Z" fill="#5A7CF3"/>
+<path d="M25.4235 8.37163L27.1952 9.95339L28.4602 8.52263L29.245 9.22322L27.9799 10.654L29.8487 12.3224L29.1874 13.0703L27.3186 11.4019L25.5505 13.4017L27.7752 15.3879L27.1068 16.144L22.0262 11.6081L22.6947 10.8521L24.7657 12.7011L26.5339 10.7013L24.7622 9.11952L25.4235 8.37163ZM23.4435 7.81129C23.0259 7.83607 22.5663 7.8428 22.0649 7.83148L22.1401 6.76403C23.7584 6.82205 25.2885 6.59773 26.7305 6.09107L24.7889 4.35763L25.4574 3.6016L27.7631 5.66006C28.1914 5.47031 28.6545 5.21945 29.1523 4.90747L29.8661 5.70472C29.4174 5.98297 28.9995 6.22088 28.6125 6.41844L32.5766 9.95754L31.9082 10.7136L27.6043 6.87111C26.7206 7.22653 25.8411 7.47899 24.9658 7.62851L21.4366 11.62L20.6762 10.9411L23.4435 7.81129Z" fill="white"/>
+<path d="M34.0604 17.4644C33.269 17.8246 32.5165 18.0644 31.803 18.1838L31.588 17.2645C32.2674 17.1728 32.9782 16.9638 33.7205 16.6373L34.0604 17.4644ZM36.7875 19.2591C36.711 20.2188 36.5968 21.0138 36.4447 21.6442L35.4723 21.5324C35.6567 20.8436 35.7982 20.0341 35.8968 19.104L36.7875 19.2591ZM39.3233 14.148C39.1462 15.2215 39.3655 16.5179 39.9812 18.0374L39.0304 18.2941C38.8877 17.9533 38.7621 17.5988 38.6536 17.2303L38.2223 17.7181L37.1787 16.7864L36.5462 17.5018L38.4312 19.1846L37.8202 19.8756L35.9352 18.1928L34.5768 19.7292C34.1263 20.2386 33.6584 20.2767 33.173 19.8433L32.4692 19.2149L32.939 18.3398C33.1206 18.5601 33.3111 18.7593 33.5107 18.9374C33.6779 19.0867 33.843 19.0692 34.0059 18.885L35.1991 17.5355L33.306 15.8454L33.9169 15.1544L35.81 16.8445L36.4425 16.1291L35.3099 15.1179L35.6837 14.6952C35.3278 14.6393 34.9785 14.565 34.6357 14.4724L34.7703 13.5016C36.1724 13.8805 37.4851 13.913 38.7085 13.5991L39.3233 14.148ZM38.5439 16.7978C38.3687 15.9917 38.32 15.25 38.3978 14.5727C37.6818 14.7384 36.9674 14.7988 36.2544 14.7538L38.5439 16.7978ZM34.9457 10.3561C35.1167 11.2652 35.1993 12.105 35.1935 12.8756L34.177 12.9283C34.2122 12.2227 34.1446 11.3768 33.9742 10.3907L34.9457 10.3561ZM33.1654 21.8003C32.8957 21.5595 32.4151 21.1207 31.7235 20.4839C31.216 20.0211 30.8279 19.5922 30.5594 19.1973C30.3221 18.8109 30.2039 18.366 30.205 17.8627C30.2115 17.6261 30.169 17.4668 30.0773 17.385C29.9101 17.2357 29.2954 17.3415 28.2332 17.7024L28.1341 16.6684C29.1232 16.3683 29.8514 16.2815 30.3188 16.4078L32.3529 14.1072L31.2689 13.1394L31.9014 12.424L33.7055 14.0346L30.9885 17.1075C31.0029 17.1786 31.0074 17.2553 31.002 17.3378C31.0045 17.7279 31.0549 18.0639 31.1533 18.3456C31.3013 18.6911 31.6028 19.0815 32.0576 19.5167C32.6629 20.0764 33.2055 20.5706 33.6855 20.9991C33.9444 21.2302 34.3483 21.5811 34.8972 22.0518C35.2526 22.3594 35.5747 22.6227 35.8635 22.8418L35.0018 23.4398L33.1654 21.8003Z" fill="white"/>
+</g>
+</svg>
diff --git a/static/icons_ui/icon_login_password.svg b/static/icons_ui/icon_login_password.svg
new file mode 100644
index 0000000..4ece043
--- /dev/null
+++ b/static/icons_ui/icon_login_password.svg
@@ -0,0 +1,5 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30.1111 19H9.88889C8.2934 19 7 20.3024 7 21.9091V32.0909C7 33.6976 8.2934 35 9.88889 35H30.1111C31.7066 35 33 33.6976 33 32.0909V21.9091C33 20.3024 31.7066 19 30.1111 19Z" stroke="#5A7CF3" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13 19V12.7778C13 10.715 13.7375 8.73667 15.0503 7.27806C16.363 5.81944 18.1435 5 20 5C21.8565 5 23.637 5.81944 24.9497 7.27806C26.2625 8.73667 27 10.715 27 12.7778V19" stroke="#5A7CF3" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M22 24.1667V30H19V24.1667C19 24.0135 19.0388 23.8617 19.1142 23.7202C19.1896 23.5787 19.3001 23.45 19.4393 23.3417C19.5786 23.2334 19.744 23.1474 19.926 23.0888C20.108 23.0302 20.303 23 20.5 23C20.697 23 20.892 23.0302 21.074 23.0888C21.256 23.1474 21.4214 23.2334 21.5607 23.3417C21.6999 23.45 21.8104 23.5787 21.8858 23.7202C21.9612 23.8617 22 24.0135 22 24.1667Z" fill="#5A7CF3"/>
+</svg>
diff --git a/static/icons_ui/icon_login_user.svg b/static/icons_ui/icon_login_user.svg
new file mode 100644
index 0000000..a628595
--- /dev/null
+++ b/static/icons_ui/icon_login_user.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.0494 5C16.0652 5 13.4985 6.68 12.269 9.51327C11.4827 11.326 11.346 13.2448 11.5288 15.0529L11.5519 15.2479C11.7723 16.9544 12.6388 18.9921 13.8798 20.4725L13.9513 20.5562L7.6248 25.8656C7.36663 26.082 7.15899 26.3524 7.01646 26.6577C6.87394 26.963 6.79999 27.2958 6.7998 27.6327V32.6923C6.7998 33.3043 7.04294 33.8913 7.47571 34.3241C7.90849 34.7569 8.49546 35 9.1075 35H31.0306C31.6426 35 32.2296 34.7569 32.6624 34.3241C33.0951 33.8913 33.3383 33.3043 33.3383 32.6923V27.6344L33.3342 27.4983C33.3156 27.1838 33.2329 26.8764 33.091 26.5951C32.9491 26.3138 32.7511 26.0646 32.5092 25.8627L26.2537 20.6427L26.35 20.5371C27.6406 19.0671 28.4615 17.0992 28.7327 15.0904C28.9773 13.2673 28.806 11.1512 27.9377 9.32C26.646 6.59404 24.0342 5 20.0494 5ZM20.0494 7.30769C23.1567 7.30769 24.9492 8.40154 25.8527 10.3077C26.4988 11.6721 26.6362 13.3631 26.4452 14.7829C26.1781 16.7692 25.2233 18.6962 23.8104 19.7704C23.6723 19.8753 23.5596 20.0101 23.4808 20.1646C23.402 20.3191 23.359 20.4894 23.355 20.6628C23.3511 20.8362 23.3863 21.0083 23.4581 21.1662C23.5298 21.3242 23.6362 21.4639 23.7694 21.575L31.0306 27.635V32.6923H9.1075V27.6333L16.4113 21.5052C16.5429 21.3948 16.6481 21.2564 16.7194 21.1002C16.7906 20.944 16.8261 20.7738 16.8232 20.6021C16.8204 20.4304 16.7792 20.2615 16.7027 20.1077C16.6263 19.954 16.5165 19.8192 16.3813 19.7133C15.0585 18.676 13.9888 16.4323 13.8256 14.8198C13.6785 13.37 13.7892 11.8071 14.3863 10.4317C15.2488 8.44308 16.9825 7.30769 20.0494 7.30769Z" fill="#5A7CF3"/>
+<path d="M21.2227 24.6148V30.384H18.915V24.6148C18.915 24.4633 18.9449 24.3132 19.0029 24.1732C19.0609 24.0332 19.1458 23.906 19.253 23.7989C19.3601 23.6917 19.4873 23.6068 19.6273 23.5488C19.7673 23.4908 19.9174 23.4609 20.0689 23.4609C20.2204 23.4609 20.3705 23.4908 20.5104 23.5488C20.6504 23.6068 20.7776 23.6917 20.8848 23.7989C20.9919 23.906 21.0769 24.0332 21.1349 24.1732C21.1929 24.3132 21.2227 24.4633 21.2227 24.6148Z" fill="#5A7CF3"/>
+</svg>
diff --git a/static/icons_ui/icon_notpass.svg b/static/icons_ui/icon_notpass.svg
new file mode 100644
index 0000000..9c4ea07
--- /dev/null
+++ b/static/icons_ui/icon_notpass.svg
@@ -0,0 +1,5 @@
+<svg width="117" height="117" viewBox="0 0 117 117" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M114.258 57.6963C114.702 88.4906 90.0979 113.814 59.3036 114.258C28.5092 114.702 3.18567 90.0978 2.74186 59.3034C2.29805 28.5091 26.902 3.18553 57.6964 2.74172C88.4908 2.29791 113.814 26.9019 114.258 57.6963Z" stroke="#F54D4D" stroke-width="3.82186"/>
+<path d="M107.139 57.7966C107.526 84.6597 86.0635 106.75 59.2005 107.138C32.3374 107.525 10.2467 86.0617 9.85959 59.1986C9.47244 32.3356 30.9354 10.2449 57.7985 9.85779C84.6615 9.47063 106.752 30.9336 107.139 57.7966Z" stroke="#F54D4D" stroke-width="1.91093"/>
+<path d="M26.6396 72.6344L42.7646 59.7506L44.1579 61.4943L38.1016 66.3332C38.3558 67.4204 38.5426 68.3975 38.662 69.2646L48.7893 81.9397L46.9518 83.4078L38.862 73.2828C38.7424 76.6961 37.9944 80.2326 36.6178 83.8925L34.1931 83.2801C36.4479 77.6692 37.082 72.5546 36.0953 67.9362L28.0328 74.3781L26.6396 72.6344ZM42.0582 68.6708C45.4541 68.6404 48.5524 68.8784 51.3533 69.3849L51.0706 71.9147C48.5647 71.316 45.4651 70.9867 41.772 70.927L42.0582 68.6708ZM52.0788 50.8341C56.5911 51.6115 60.9815 51.5442 65.25 50.6323L65.657 53.1026C64.1351 53.3765 62.6869 53.5505 61.3125 53.6246L62.3762 54.9559L52.5137 62.836L51.42 61.4672C51.0394 62.8363 50.545 64.2553 49.9369 65.7242L47.6211 64.7483C49.5478 60.4441 50.5962 56.1556 50.7663 51.8827L52.0788 50.8341ZM60.5067 53.6541C57.8454 53.7324 55.2468 53.5047 52.7109 52.9709C52.6868 55.5296 52.3229 58.1244 51.6191 60.7552L60.5067 53.6541ZM65.1604 56.0183L71.3776 63.7996L69.6526 65.1779L68.8436 64.1654L60.0686 71.1765L60.8776 72.1891L59.1526 73.5673L52.9354 65.786L65.1604 56.0183ZM58.7203 69.489L67.4953 62.4779L64.7688 59.0653L55.9937 66.0765L58.7203 69.489ZM78.3659 58.1238L76.6222 59.5171L69.7009 50.8546C70.3918 52.8215 70.8616 54.7809 71.1103 56.7326L68.7985 55.4155C68.7202 52.7543 68.1196 50.1314 66.9967 47.547L64.6905 49.3897L63.3272 47.6834L65.6709 45.8108L62.8694 42.3045L64.6132 40.9113L67.4147 44.4176L69.3084 42.9045L70.6717 44.6107L68.778 46.1238L69.4521 46.9676C70.8288 47.1783 72.2867 47.4778 73.8257 47.8661C74.8463 46.0676 75.6195 44.3439 76.1452 42.695C74.9384 42.5943 73.8278 42.3962 72.8135 42.1008C72.8081 42.7604 72.7501 43.585 72.6395 44.5744L70.4209 44.1046C70.7696 41.9008 70.5737 39.4257 69.8333 36.6791L71.8541 35.7095L72.2692 37.344L77.3504 33.2841L78.4441 34.6528C78.9551 36.5997 79.0676 38.5988 78.7815 40.6501C80.5557 40.4613 82.5088 39.9965 84.6407 39.2557L85.1828 41.5874C82.6435 42.3054 80.3694 42.6889 78.3604 42.7376C77.8895 44.5064 77.1325 46.3401 76.0894 48.2385L84.0206 41.9015L89.7584 49.0828L88.0334 50.461L87.4641 49.7485L82.8329 53.4489L83.4021 54.1614L81.6584 55.5546L75.9805 48.4484L75.3689 49.49L74.2559 49.2119L74.349 50.2127C73.1599 49.7497 72.0719 49.3493 71.0851 49.0113L78.3659 58.1238ZM81.5145 51.7989L86.1458 48.0985L83.614 44.9298L78.9827 48.6301L81.5145 51.7989ZM76.5999 40.765C76.8608 39.2459 76.9041 37.8391 76.73 36.5446L72.6612 39.7955L72.706 40.1591C73.8927 40.5422 75.1906 40.7441 76.5999 40.765Z" fill="#F54D4D"/>
+</svg>
diff --git a/static/icons_ui/icon_num.svg b/static/icons_ui/icon_num.svg
new file mode 100644
index 0000000..75ba510
--- /dev/null
+++ b/static/icons_ui/icon_num.svg
@@ -0,0 +1,4 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M145.833 164.583V177.083H54.1667V164.583H145.833ZM177.083 27.0835V147.917H22.9167V27.0835H177.083ZM164.583 39.5835H35.4167V135.417H164.583V39.5835Z" fill="#777E94"/>
+<path d="M75 81.8503V111.017H62.5V81.8503H75ZM106.25 65.1836V111.017H93.75V65.1836H106.25ZM137.5 77.6836V111.017H125V77.6836H137.5Z" fill="#1677FF"/>
+</svg>
diff --git a/static/icons_ui/icon_passed.svg b/static/icons_ui/icon_passed.svg
new file mode 100644
index 0000000..5a06471
--- /dev/null
+++ b/static/icons_ui/icon_passed.svg
@@ -0,0 +1,5 @@
+<svg width="117" height="117" viewBox="0 0 117 117" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M114.258 57.6963C114.702 88.4906 90.0979 113.814 59.3036 114.258C28.5092 114.702 3.18567 90.0978 2.74186 59.3034C2.29805 28.5091 26.902 3.18553 57.6964 2.74172C88.4908 2.29791 113.814 26.9019 114.258 57.6963Z" stroke="#5FCB94" stroke-width="3.82186"/>
+<path d="M107.139 57.7966C107.526 84.6597 86.0635 106.75 59.2005 107.138C32.3374 107.525 10.2467 86.0617 9.85959 59.1986C9.47244 32.3356 30.9354 10.2449 57.7985 9.85779C84.6615 9.47063 106.752 30.9336 107.139 57.7966Z" stroke="#5FCB94" stroke-width="1.91093"/>
+<path d="M43.359 57.8011C47.8713 58.5785 52.2617 58.5112 56.5302 57.5993L56.9372 60.0696C55.4153 60.3435 53.9672 60.5175 52.5928 60.5917L53.6564 61.9229L43.7939 69.803L42.7003 68.4342C42.3196 69.8033 41.8253 71.2223 41.2172 72.6913L38.9014 71.7153C40.8281 67.4111 41.8765 63.1226 42.0465 58.8498L43.359 57.8011ZM51.7869 60.6211C49.1257 60.6995 46.5271 60.4717 43.9911 59.9379C43.9671 62.4967 43.6032 65.0914 42.8994 67.7222L51.7869 60.6211ZM56.4407 62.9853L62.6579 70.7666L60.9329 72.1449L60.1239 71.1324L51.3489 78.1436L52.1578 79.1561L50.4328 80.5343L44.2156 72.7531L56.4407 62.9853ZM50.0006 76.4561L58.7756 69.4449L56.049 66.0324L47.274 73.0436L50.0006 76.4561ZM69.6462 65.0909L67.9024 66.4841L60.9811 57.8216C61.6721 59.7886 62.1419 61.7479 62.3906 63.6996L60.0787 62.3826C60.0004 59.7213 59.3998 57.0985 58.277 54.514L55.9707 56.3567L54.6074 54.6505L56.9512 52.7778L54.1497 49.2716L55.8934 47.8783L58.6949 51.3846L60.5887 49.8715L61.952 51.5777L60.0582 53.0908L60.7324 53.9346C62.1091 54.1453 63.5669 54.4448 65.1059 54.8331C66.1265 53.0346 66.8997 51.3109 67.4255 49.662C66.2186 49.5613 65.108 49.3633 64.0937 49.0678C64.0883 49.7274 64.0303 50.552 63.9198 51.5415L61.7012 51.0716C62.0498 48.8679 61.854 46.3927 61.1135 43.6461L63.1344 42.6766L63.5494 44.311L68.6307 40.2511L69.7243 41.6199C70.2354 43.5667 70.3478 45.5658 70.0617 47.6172C71.8359 47.4283 73.789 46.9635 75.9209 46.2227L76.463 48.5544C73.9238 49.2725 71.6497 49.6559 69.6406 49.7046C69.1698 51.4735 68.4128 53.3071 67.3696 55.2055L75.3009 48.8685L81.0387 56.0498L79.3137 57.428L78.7444 56.7155L74.1131 60.4159L74.6824 61.1284L72.9386 62.5216L67.2608 55.4154L66.6492 56.457L65.5361 56.1789L65.6292 57.1798C64.4401 56.7168 63.3521 56.3163 62.3653 55.9783L69.6462 65.0909ZM72.7948 58.7659L77.426 55.0655L74.8942 51.8968L70.2629 55.5971L72.7948 58.7659ZM67.8802 47.732C68.141 46.2129 68.1843 44.8061 68.0102 43.5116L63.9415 46.7626L63.9862 47.1262C65.1729 47.5092 66.4709 47.7111 67.8802 47.732Z" fill="#5FCB94"/>
+</svg>
diff --git a/static/icons_ui/icon_pc.svg b/static/icons_ui/icon_pc.svg
new file mode 100644
index 0000000..95698a0
--- /dev/null
+++ b/static/icons_ui/icon_pc.svg
@@ -0,0 +1,10 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1418_19305)">
+<path d="M80.8 106.88L70.48 110.96V142.4C70.48 150.56 66.6 154.64 58.84 154.64H48.88L46.36 143.48C49.24 143.96 52.08 144.2 54.88 144.2C57.92 144.2 59.44 142.64 59.44 139.52V114.68C55.76 115.8 51.96 116.88 48.04 117.92L45.4 107C50.6 105.96 55.28 104.84 59.44 103.64V76.76H46.84V65.84H59.44V44.6H70.48V65.84H81.4V76.76H70.48V100.16C73.2 99.2 76.64 97.84 80.8 96.08V106.88ZM96.76 90.44V139.76C101.8 138.32 106.52 136.56 110.92 134.48L112.96 145.04C104.24 148.56 94.44 151.56 83.56 154.04L80.68 143.48C83.96 142.52 85.6 140.28 85.6 136.76V45.2H96.76V79.4H112.12V90.44H96.76ZM128.32 154.04C120.56 154.04 116.68 149.84 116.68 141.44V44.96H127.96V78.92C134.76 76.44 141 73.36 146.68 69.68L153.28 78.92C144.72 83.64 136.28 87.4 127.96 90.2V139.04C127.96 141.92 129.28 143.36 131.92 143.36H136.84C138.92 143.36 140.44 142.44 141.4 140.6C142.52 138.52 143.24 132.28 143.56 121.88L154 125.12C153.04 139.12 151.36 147.48 148.96 150.2C146.8 152.76 143.44 154.04 138.88 154.04H128.32Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1418_19305">
+<rect width="200" height="200" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/static/icons_ui/icon_ponumber.svg b/static/icons_ui/icon_ponumber.svg
new file mode 100644
index 0000000..3f1e82d
--- /dev/null
+++ b/static/icons_ui/icon_ponumber.svg
@@ -0,0 +1,5 @@
+<svg width="38" height="38" viewBox="0 0 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.3916 8.23385C8.3916 8.00514 8.43665 7.77866 8.52418 7.56735C8.6117 7.35604 8.74 7.16404 8.90172 7.00231C9.06345 6.84058 9.25545 6.71229 9.46676 6.62476C9.67807 6.53724 9.90455 6.49219 10.1333 6.49219H14.5666V8.70885H10.6083V29.2922H27.3916V8.70885H23.4333V6.49219H27.8666C28.0953 6.49219 28.3218 6.53724 28.5331 6.62476C28.7444 6.71229 28.9364 6.84058 29.0981 7.00231C29.2599 7.16404 29.3882 7.35604 29.4757 7.56735C29.5632 7.77866 29.6083 8.00514 29.6083 8.23385V29.7672C29.6083 29.9959 29.5632 30.2224 29.4757 30.4337C29.3882 30.645 29.2599 30.837 29.0981 30.9987C28.9364 31.1605 28.7444 31.2887 28.5331 31.3763C28.3218 31.4638 28.0953 31.5089 27.8666 31.5089H10.1333C9.90455 31.5089 9.67807 31.4638 9.46676 31.3763C9.25545 31.2887 9.06345 31.1605 8.90172 30.9987C8.74 30.837 8.6117 30.645 8.52418 30.4337C8.43665 30.2224 8.3916 29.9959 8.3916 29.7672V8.23385Z" fill="#777E94"/>
+<path d="M14.7246 17.579C14.7246 17.2851 14.8414 17.0032 15.0492 16.7953C15.2571 16.5875 15.539 16.4707 15.8329 16.4707H22.1663C22.3118 16.4707 22.456 16.4993 22.5905 16.555C22.725 16.6107 22.8472 16.6923 22.9501 16.7953C23.0531 16.8982 23.1347 17.0204 23.1904 17.1548C23.2461 17.2893 23.2748 17.4335 23.2748 17.579C23.2748 17.7246 23.2461 17.8687 23.1904 18.0032C23.1347 18.1377 23.0531 18.2599 22.9501 18.3628C22.8472 18.4657 22.725 18.5474 22.5905 18.6031C22.456 18.6587 22.3118 18.6874 22.1663 18.6874H15.8329C15.539 18.6874 15.2571 18.5706 15.0492 18.3627C14.8414 18.1549 14.7246 17.873 14.7246 17.579ZM14.7246 22.2689C14.7246 21.9749 14.8414 21.693 15.0492 21.4852C15.2571 21.2773 15.539 21.1605 15.8329 21.1605H22.1663C22.4602 21.1605 22.7421 21.2773 22.95 21.4852C23.1578 21.693 23.2746 21.9749 23.2746 22.2689C23.2746 22.5628 23.1578 22.8447 22.95 23.0526C22.7421 23.2604 22.4602 23.3772 22.1663 23.3772H15.8329C15.539 23.3772 15.2571 23.2604 15.0492 23.0526C14.8414 22.8447 14.7246 22.5628 14.7246 22.2689Z" fill="#777E94"/>
+<path d="M18.9997 5.54089C18.8957 5.54089 18.7928 5.56136 18.6967 5.60115C18.6007 5.64093 18.5134 5.69925 18.4399 5.77276C18.3664 5.84627 18.3081 5.93354 18.2683 6.02959C18.2285 6.12564 18.208 6.22859 18.208 6.33255V7.56755C18.208 7.8699 18.0879 8.15986 17.8741 8.37365C17.6603 8.58745 17.3704 8.70755 17.068 8.70755H15.6747V10.2909H22.3247V8.70755H20.9313C20.629 8.70755 20.339 8.58745 20.1252 8.37365C19.9114 8.15986 19.7913 7.8699 19.7913 7.56755V6.33255C19.7913 6.22859 19.7709 6.12564 19.7311 6.02959C19.6913 5.93354 19.633 5.84627 19.5595 5.77276C19.486 5.69925 19.3987 5.64093 19.3026 5.60115C19.2066 5.56136 19.1036 5.54089 18.9997 5.54089ZM15.9913 6.33255C15.9913 5.53469 16.3083 4.76951 16.8725 4.20534C17.4366 3.64117 18.2018 3.32422 18.9997 3.32422C19.7975 3.32422 20.5627 3.64117 21.1269 4.20534C21.6911 4.76951 22.008 5.53469 22.008 6.33255V6.49089H24.5413V10.7659C24.5413 10.9946 24.4963 11.2211 24.4088 11.4324C24.3212 11.6437 24.1929 11.8357 24.0312 11.9974C23.8695 12.1592 23.6775 12.2874 23.4662 12.375C23.2549 12.4625 23.0284 12.5076 22.7997 12.5076H15.1997C14.971 12.5076 14.7445 12.4625 14.5332 12.375C14.3219 12.2874 14.1299 12.1592 13.9681 11.9974C13.8064 11.8357 13.6781 11.6437 13.5906 11.4324C13.5031 11.2211 13.458 10.9946 13.458 10.7659V6.49089H15.9913V6.33255Z" fill="#1677FF"/>
+</svg>
diff --git a/static/icons_ui/icon_prod_line.svg b/static/icons_ui/icon_prod_line.svg
new file mode 100644
index 0000000..eabccd5
--- /dev/null
+++ b/static/icons_ui/icon_prod_line.svg
@@ -0,0 +1,12 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1566_19284)">
+<path d="M34 52.1899C34 50.983 34.2803 49.788 34.8248 48.6731C35.3694 47.5581 36.1675 46.545 37.1737 45.6917C38.1799 44.8383 39.3745 44.1614 40.6891 43.6995C42.0038 43.2377 43.4128 43 44.8358 43H72.4179V54.6962H47.791V163.304H152.209V54.6962H127.582V43H155.164C156.587 43 157.996 43.2377 159.311 43.6995C160.626 44.1614 161.82 44.8383 162.826 45.6917C163.832 46.545 164.631 47.5581 165.175 48.6731C165.72 49.788 166 50.983 166 52.1899V165.81C166 167.017 165.72 168.212 165.175 169.327C164.631 170.442 163.832 171.455 162.826 172.308C161.82 173.162 160.626 173.839 159.311 174.3C157.996 174.762 156.587 175 155.164 175H44.8358C43.4128 175 42.0038 174.762 40.6891 174.3C39.3745 173.839 38.1799 173.162 37.1737 172.308C36.1675 171.455 35.3694 170.442 34.8248 169.327C34.2803 168.212 34 167.017 34 165.81V52.1899Z" fill="#777E94"/>
+<path d="M99.5 37.8276C98.8528 37.8276 98.2119 37.9368 97.6139 38.1491C97.016 38.3614 96.4726 38.6726 96.015 39.0648C95.5573 39.4571 95.1943 39.9227 94.9466 40.4352C94.6989 40.9477 94.5714 41.497 94.5714 42.0517V48.6414C94.5714 50.2546 93.8237 51.8018 92.4927 52.9425C91.1618 54.0833 89.3566 54.7241 87.4743 54.7241H78.8V63.1724H120.2V54.7241H111.526C109.643 54.7241 107.838 54.0833 106.507 52.9425C105.176 51.8018 104.429 50.2546 104.429 48.6414V42.0517C104.429 41.497 104.301 40.9477 104.053 40.4352C103.806 39.9227 103.443 39.4571 102.985 39.0648C102.527 38.6726 101.984 38.3614 101.386 38.1491C100.788 37.9368 100.147 37.8276 99.5 37.8276V37.8276ZM80.7714 42.0517C80.7714 37.7945 82.7446 33.7117 86.2569 30.7014C89.7692 27.6912 94.5329 26 99.5 26C104.467 26 109.231 27.6912 112.743 30.7014C116.255 33.7117 118.229 37.7945 118.229 42.0517V42.8966H134V65.7069C134 66.9273 133.72 68.1357 133.175 69.2632C132.63 70.3907 131.831 71.4152 130.824 72.2781C129.817 73.1411 128.622 73.8256 127.307 74.2926C125.991 74.7596 124.581 75 123.157 75H75.8429C74.419 75 73.009 74.7596 71.6935 74.2926C70.378 73.8256 69.1827 73.1411 68.1758 72.2781C67.1689 71.4152 66.3703 70.3907 65.8254 69.2632C65.2805 68.1357 65 66.9273 65 65.7069V42.8966H80.7714V42.0517V42.0517Z" fill="#777E94"/>
+<path d="M80 104.048C76.96 110.939 73.1347 116.639 68.524 121.148L63.812 115.144C70.652 107.899 75.288 98.1707 77.72 85.96L85.092 87.252C84.332 90.748 83.496 94.016 82.584 97.056H96.72V84.288H103.94V97.056H128.336V104.048H103.94V119.78H126.816V126.772H103.94V144.1H133.2V151.244H65.788V144.1H96.72V126.772H74.984V119.78H96.72V104.048H80Z" fill="#1677FF"/>
+</g>
+<defs>
+<clipPath id="clip0_1566_19284">
+<rect width="200" height="200" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/static/icons_ui/icon_qiju_end.svg b/static/icons_ui/icon_qiju_end.svg
new file mode 100644
index 0000000..b1780e4
--- /dev/null
+++ b/static/icons_ui/icon_qiju_end.svg
@@ -0,0 +1,5 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M37.4167 144.283C38.8533 144.283 40.231 144.854 41.2468 145.87C42.2627 146.886 42.8333 148.263 42.8333 149.7V160.225H157V149.7C157 148.263 157.571 146.886 158.587 145.87C159.602 144.854 160.98 144.283 162.417 144.283C163.853 144.283 165.231 144.854 166.247 145.87C167.263 146.886 167.833 148.263 167.833 149.7V165.642C167.833 166.353 167.693 167.057 167.421 167.714C167.149 168.372 166.75 168.969 166.247 169.472C165.744 169.975 165.147 170.374 164.49 170.646C163.832 170.918 163.128 171.058 162.417 171.058H37.4167C36.7053 171.058 36.001 170.918 35.3438 170.646C34.6866 170.374 34.0895 169.975 33.5865 169.472C33.0835 168.969 32.6845 168.372 32.4123 167.714C32.1401 167.057 32 166.353 32 165.642V149.7C32 148.263 32.5707 146.886 33.5865 145.87C34.6023 144.854 35.9801 144.283 37.4167 144.283Z" fill="#777E94"/>
+<path d="M160 83C160 115.585 133.585 142 101 142C68.4152 142 42 115.585 42 83C42 50.4152 68.4152 24 101 24C133.585 24 160 50.4152 160 83Z" stroke="#777E94" stroke-width="12"/>
+<rect x="75" y="56" width="53" height="53" rx="5" fill="#035DFF"/>
+</svg>
diff --git a/static/icons_ui/icon_qiju_num.svg b/static/icons_ui/icon_qiju_num.svg
new file mode 100644
index 0000000..3879b8e
--- /dev/null
+++ b/static/icons_ui/icon_qiju_num.svg
@@ -0,0 +1,4 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M29.1411 141C30.7698 141 32.3318 141.725 33.4835 143.015C34.6352 144.305 35.2822 146.054 35.2822 147.878V161.243H164.718V147.878C164.718 146.054 165.365 144.305 166.516 143.015C167.668 141.725 169.23 141 170.859 141C172.488 141 174.05 141.725 175.201 143.015C176.353 144.305 177 146.054 177 147.878V168.122C177 169.025 176.841 169.919 176.533 170.754C176.224 171.588 175.772 172.347 175.201 172.985C174.631 173.624 173.954 174.131 173.209 174.476C172.464 174.822 171.665 175 170.859 175H29.1411C28.3346 175 27.5361 174.822 26.791 174.476C26.0459 174.131 25.3689 173.624 24.7987 172.985C24.2284 172.347 23.7761 171.588 23.4675 170.754C23.1588 169.919 23 169.025 23 168.122V147.878C23 146.054 23.647 144.305 24.7987 143.015C25.9504 141.725 27.5124 141 29.1411 141Z" fill="#777E94"/>
+<path d="M39.2063 104.375V58.75C39.4146 54.7917 41.3938 52.7083 45.1438 52.5C47.2271 52.7083 48.8938 53.6458 50.1438 55.3125L75.4563 89.0625H75.7688V58.75C75.9771 54.7917 77.9563 52.7083 81.7063 52.5C85.4563 52.7083 87.4354 54.7917 87.6438 58.75V104.375C87.4354 108.125 85.4563 110 81.7063 110C79.6229 110 77.9563 109.271 76.7063 107.812L51.3938 74.375H51.0813V104.375C50.8729 108.125 48.8938 110 45.1438 110C41.3938 110 39.4146 108.125 39.2063 104.375ZM118.719 100C128.302 99.5833 133.406 93.4375 134.031 81.5625C133.406 69.8958 128.302 63.75 118.719 63.125C109.344 63.75 104.344 69.8958 103.719 81.5625C104.344 93.2292 109.344 99.375 118.719 100ZM118.719 110.312C101.635 109.271 92.4688 99.6875 91.2188 81.5625C92.4688 63.2292 101.635 53.4375 118.719 52.1875C135.594 53.4375 144.76 63.2292 146.219 81.5625C144.969 99.8958 135.802 109.479 118.719 110.312ZM151.044 104.688C151.46 100.938 153.544 98.8542 157.294 98.4375C161.044 98.8542 163.127 100.938 163.544 104.688C163.335 108.229 161.252 110.104 157.294 110.312C153.335 110.104 151.252 108.229 151.044 104.688Z" fill="#1677FF"/>
+</svg>
diff --git a/static/icons_ui/icon_qiju_start.svg b/static/icons_ui/icon_qiju_start.svg
new file mode 100644
index 0000000..d2b3dc4
--- /dev/null
+++ b/static/icons_ui/icon_qiju_start.svg
@@ -0,0 +1,5 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M37.4167 146.283C38.8533 146.283 40.231 146.854 41.2468 147.87C42.2627 148.886 42.8333 150.263 42.8333 151.7V162.225H157V151.7C157 150.263 157.571 148.886 158.587 147.87C159.602 146.854 160.98 146.283 162.417 146.283C163.853 146.283 165.231 146.854 166.247 147.87C167.263 148.886 167.833 150.263 167.833 151.7V167.642C167.833 168.353 167.693 169.057 167.421 169.714C167.149 170.372 166.75 170.969 166.247 171.472C165.744 171.975 165.147 172.374 164.49 172.646C163.832 172.918 163.128 173.058 162.417 173.058H37.4167C36.7053 173.058 36.001 172.918 35.3438 172.646C34.6866 172.374 34.0895 171.975 33.5865 171.472C33.0835 170.969 32.6845 170.372 32.4123 169.714C32.1401 169.057 32 168.353 32 167.642V151.7C32 150.263 32.5707 148.886 33.5865 147.87C34.6023 146.854 35.9801 146.283 37.4167 146.283Z" fill="#777E94"/>
+<path d="M127.417 78.1699C130.75 80.0944 130.75 84.9056 127.417 86.8301L89.167 108.914C85.8337 110.838 81.667 108.433 81.667 104.584V60.4164C81.667 56.5674 85.8337 54.1617 89.167 56.0862L127.417 78.1699Z" fill="#035DFF"/>
+<circle cx="99.917" cy="83" r="59" stroke="#777E94" stroke-width="12"/>
+</svg>
diff --git a/static/icons_ui/icon_return_num.svg b/static/icons_ui/icon_return_num.svg
new file mode 100644
index 0000000..5677a55
--- /dev/null
+++ b/static/icons_ui/icon_return_num.svg
@@ -0,0 +1,12 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1411_18432)">
+<path d="M34 52.1899C34 50.983 34.2803 49.788 34.8248 48.6731C35.3694 47.5581 36.1675 46.545 37.1737 45.6917C38.1799 44.8383 39.3745 44.1614 40.6891 43.6995C42.0038 43.2377 43.4128 43 44.8358 43H72.4179V54.6962H47.791V163.304H152.209V54.6962H127.582V43H155.164C156.587 43 157.996 43.2377 159.311 43.6995C160.626 44.1614 161.82 44.8383 162.826 45.6917C163.832 46.545 164.631 47.5581 165.175 48.6731C165.72 49.788 166 50.983 166 52.1899V165.81C166 167.017 165.72 168.212 165.175 169.327C164.631 170.442 163.832 171.455 162.826 172.308C161.82 173.162 160.626 173.839 159.311 174.3C157.996 174.762 156.587 175 155.164 175H44.8358C43.4128 175 42.0038 174.762 40.6891 174.3C39.3745 173.839 38.1799 173.162 37.1737 172.308C36.1675 171.455 35.3694 170.442 34.8248 169.327C34.2803 168.212 34 167.017 34 165.81V52.1899Z" fill="#777E94"/>
+<path d="M99.5 37.8276C98.8528 37.8276 98.2119 37.9368 97.6139 38.1491C97.016 38.3614 96.4726 38.6726 96.015 39.0648C95.5573 39.4571 95.1943 39.9227 94.9466 40.4352C94.6989 40.9477 94.5714 41.497 94.5714 42.0517V48.6414C94.5714 50.2546 93.8237 51.8018 92.4927 52.9425C91.1618 54.0833 89.3566 54.7241 87.4743 54.7241H78.8V63.1724H120.2V54.7241H111.526C109.643 54.7241 107.838 54.0833 106.507 52.9425C105.176 51.8018 104.429 50.2546 104.429 48.6414V42.0517C104.429 41.497 104.301 40.9477 104.053 40.4352C103.806 39.9227 103.443 39.4571 102.985 39.0648C102.527 38.6726 101.984 38.3614 101.386 38.1491C100.788 37.9368 100.147 37.8276 99.5 37.8276V37.8276ZM80.7714 42.0517C80.7714 37.7945 82.7446 33.7117 86.2569 30.7014C89.7692 27.6912 94.5329 26 99.5 26C104.467 26 109.231 27.6912 112.743 30.7014C116.255 33.7117 118.229 37.7945 118.229 42.0517V42.8966H134V65.7069C134 66.9273 133.72 68.1357 133.175 69.2632C132.63 70.3907 131.831 71.4152 130.824 72.2781C129.817 73.1411 128.622 73.8256 127.307 74.2926C125.991 74.7596 124.581 75 123.157 75H75.8429C74.419 75 73.009 74.7596 71.6935 74.2926C70.378 73.8256 69.1827 73.1411 68.1758 72.2781C67.1689 71.4152 66.3703 70.3907 65.8254 69.2632C65.2805 68.1357 65 66.9273 65 65.7069V42.8966H80.7714V42.0517V42.0517Z" fill="#777E94"/>
+<path d="M71.336 84.44C76.6053 88.6453 80.8867 92.6227 84.18 96.372L78.936 101.54C75.9467 97.6893 71.7413 93.5853 66.32 89.228L71.336 84.44ZM114.504 152.536C112.021 152.536 107.537 152.485 101.052 152.384C96.2893 152.333 92.2867 151.903 89.044 151.092C86.156 150.231 83.5213 148.457 81.14 145.772C80.076 144.505 79.1387 143.872 78.328 143.872C76.7573 143.872 74.0213 147.292 70.12 154.132L64.8 149.192C68.6 143.011 72.02 139.16 75.06 137.64V116.132H64.876V109.444H81.824V138.248L82.888 139.312C84.6107 141.339 86.4093 142.859 88.284 143.872C90.6653 144.987 94.0093 145.62 98.316 145.772C103.991 145.873 109.057 145.924 113.516 145.924C115.948 145.924 119.799 145.873 125.068 145.772C128.513 145.721 131.528 145.595 134.112 145.392L132.288 152.536H114.504ZM107.208 117.424C111.109 119.552 114.757 121.832 118.152 124.264C120.787 121.832 122.965 119.527 124.688 117.348L129.856 121.376C128.032 123.555 125.879 125.784 123.396 128.064C126.993 130.749 130.236 133.485 133.124 136.272L128.64 141.592C121.851 134.651 113.339 128.241 103.104 122.364L107.208 117.424ZM97.556 103.972V109.444H121.04V103.972H97.556ZM121.04 98.044V92.572H97.556V98.044H121.04ZM97.556 115.828V133.84C102.268 132.979 106.752 131.889 111.008 130.572L112.604 137.108C106.169 138.78 98.5187 140.351 89.652 141.82L88.056 135.74C89.728 135.132 90.564 134.195 90.564 132.928V86.188H128.108V115.828H97.556Z" fill="#1677FF"/>
+</g>
+<defs>
+<clipPath id="clip0_1411_18432">
+<rect width="200" height="200" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/static/icons_ui/icon_scan_white.svg b/static/icons_ui/icon_scan_white.svg
new file mode 100644
index 0000000..a661468
--- /dev/null
+++ b/static/icons_ui/icon_scan_white.svg
@@ -0,0 +1,4 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19.5 8H12C10.6739 8 9.40215 8.52678 8.46447 9.46447C7.52678 10.4021 7 11.6739 7 13V20.5M52 20.5V13C52 11.6739 51.4732 10.4021 50.5355 9.46447C49.5979 8.52678 48.3261 8 47 8H39.5M39.5 53H47C48.3261 53 49.5979 52.4732 50.5355 51.5355C51.4732 50.5979 52 49.3261 52 48V40.5M7 40.5V48C7 49.3261 7.52678 50.5979 8.46447 51.5355C9.40215 52.4732 10.6739 53 12 53H19.5" stroke="white" stroke-width="6" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="4" y="28" width="51" height="5" rx="2.5" fill="white"/>
+</svg>
diff --git a/static/icons_ui/icon_send_request.svg b/static/icons_ui/icon_send_request.svg
new file mode 100644
index 0000000..f352b54
--- /dev/null
+++ b/static/icons_ui/icon_send_request.svg
@@ -0,0 +1,12 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1412_18434)">
+<path d="M34 52.1899C34 50.983 34.2803 49.788 34.8248 48.6731C35.3694 47.5581 36.1675 46.545 37.1737 45.6917C38.1799 44.8383 39.3745 44.1614 40.6891 43.6995C42.0038 43.2377 43.4128 43 44.8358 43H72.4179V54.6962H47.791V163.304H152.209V54.6962H127.582V43H155.164C156.587 43 157.996 43.2377 159.311 43.6995C160.626 44.1614 161.82 44.8383 162.826 45.6917C163.832 46.545 164.631 47.5581 165.175 48.6731C165.72 49.788 166 50.983 166 52.1899V165.81C166 167.017 165.72 168.212 165.175 169.327C164.631 170.442 163.832 171.455 162.826 172.308C161.82 173.162 160.626 173.839 159.311 174.3C157.996 174.762 156.587 175 155.164 175H44.8358C43.4128 175 42.0038 174.762 40.6891 174.3C39.3745 173.839 38.1799 173.162 37.1737 172.308C36.1675 171.455 35.3694 170.442 34.8248 169.327C34.2803 168.212 34 167.017 34 165.81V52.1899Z" fill="#777E94"/>
+<path d="M99.5 37.8276C98.8528 37.8276 98.2119 37.9368 97.6139 38.1491C97.016 38.3614 96.4726 38.6726 96.015 39.0648C95.5573 39.4571 95.1943 39.9227 94.9466 40.4352C94.6989 40.9477 94.5714 41.497 94.5714 42.0517V48.6414C94.5714 50.2546 93.8237 51.8018 92.4927 52.9425C91.1618 54.0833 89.3566 54.7241 87.4743 54.7241H78.8V63.1724H120.2V54.7241H111.526C109.643 54.7241 107.838 54.0833 106.507 52.9425C105.176 51.8018 104.429 50.2546 104.429 48.6414V42.0517C104.429 41.497 104.301 40.9477 104.053 40.4352C103.806 39.9227 103.443 39.4571 102.985 39.0648C102.527 38.6726 101.984 38.3614 101.386 38.1491C100.788 37.9368 100.147 37.8276 99.5 37.8276V37.8276ZM80.7714 42.0517C80.7714 37.7945 82.7446 33.7117 86.2569 30.7014C89.7692 27.6912 94.5329 26 99.5 26C104.467 26 109.231 27.6912 112.743 30.7014C116.255 33.7117 118.229 37.7945 118.229 42.0517V42.8966H134V65.7069C134 66.9273 133.72 68.1357 133.175 69.2632C132.63 70.3907 131.831 71.4152 130.824 72.2781C129.817 73.1411 128.622 73.8256 127.307 74.2926C125.991 74.7596 124.581 75 123.157 75H75.8429C74.419 75 73.009 74.7596 71.6935 74.2926C70.378 73.8256 69.1827 73.1411 68.1758 72.2781C67.1689 71.4152 66.3703 70.3907 65.8254 69.2632C65.2805 68.1357 65 66.9273 65 65.7069V42.8966H80.7714V42.0517V42.0517Z" fill="#777E94"/>
+<path d="M68.828 108.076L74.832 85.884L82.052 87.1L78.1 101.16H89.348C90.716 95.7893 91.8813 89.8613 92.844 83.376L100.216 84.288C99.3547 90.0133 98.24 95.6373 96.872 101.16H131.68V108.076H95.048C94.896 108.633 94.1107 111.015 92.692 115.22H123.092V121.3C121.116 127.583 117.341 133.207 111.768 138.172C117.493 141.364 124.46 144.328 132.668 147.064L128.944 153.904C119.875 150.611 112.148 146.937 105.764 142.884C99.7853 147.039 92.4133 150.839 83.648 154.284L79.848 147.444C87.3973 144.708 93.908 141.693 99.38 138.4C94.4147 134.448 90.716 130.217 88.284 125.708C82.812 136.905 75.9213 145.873 67.612 152.612L63.888 145.924C74.376 136.652 82.204 124.036 87.372 108.076H68.828ZM93.528 121.756C96.0613 126.265 100.013 130.42 105.384 134.22C110.197 130.319 113.668 126.164 115.796 121.756H93.528ZM112.984 83.452C118.152 87.3533 122.56 91.356 126.208 95.46L121.04 100.628C117.949 96.6253 113.643 92.496 108.12 88.24L112.984 83.452Z" fill="#1677FF"/>
+</g>
+<defs>
+<clipPath id="clip0_1412_18434">
+<rect width="200" height="200" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/static/icons_ui/icon_senditem.svg b/static/icons_ui/icon_senditem.svg
new file mode 100644
index 0000000..2f8404b
--- /dev/null
+++ b/static/icons_ui/icon_senditem.svg
@@ -0,0 +1,4 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M64.35 34.6333C62.936 34.6337 61.5782 35.187 60.5667 36.175L40.5417 55.725C39.9628 56.2235 39.4326 56.776 38.9583 57.375C37.2065 59.572 36.2517 62.2983 36.25 65.1083V153.183C36.25 159.683 41.35 165.375 48.15 165.375H151.85C158.65 165.375 163.75 159.692 163.75 153.183V65.1083C163.749 63.3342 163.367 61.5809 162.631 59.9666C161.895 58.3523 160.822 56.9145 159.483 55.75L139.433 36.1666C138.42 35.1817 137.063 34.6315 135.65 34.6333H64.35V34.6333ZM141.083 52.9166H58.925L66.5583 45.4666H133.442L141.075 52.9166H141.083ZM47.325 64.25L47.6667 63.9166C47.8091 63.8172 47.9765 63.7595 48.15 63.75H151.85C151.983 63.75 152.167 63.8 152.342 63.9166L152.667 64.2333C152.839 64.492 152.926 64.7978 152.917 65.1083V153.183C152.917 154.158 152.217 154.542 151.85 154.542H48.15C47.7833 154.542 47.0833 154.158 47.0833 153.183V65.1083C47.0758 64.8006 47.1631 64.498 47.3333 64.2416L47.325 64.25Z" fill="#777E94"/>
+<path d="M104.8 122.275C104.329 122.738 103.955 123.289 103.698 123.897C103.441 124.505 103.308 125.158 103.305 125.818C103.302 126.478 103.429 127.132 103.68 127.743C103.931 128.353 104.301 128.908 104.767 129.375C105.233 129.842 105.788 130.212 106.398 130.464C107.008 130.715 107.662 130.844 108.322 130.841C108.982 130.839 109.635 130.706 110.243 130.45C110.852 130.194 111.403 129.82 111.867 129.35L128.533 112.684C129.461 111.757 129.988 110.503 130 109.192V109.15V109.1C129.991 107.788 129.463 106.534 128.533 105.609L111.867 88.9419C111.403 88.4717 110.852 88.0978 110.243 87.8419C109.635 87.586 108.982 87.453 108.322 87.4507C107.662 87.4484 107.008 87.5768 106.398 87.8285C105.788 88.0802 105.233 88.4503 104.767 88.9172C104.301 89.3842 103.931 89.9389 103.68 90.5494C103.429 91.1598 103.302 91.8139 103.305 92.4739C103.308 93.134 103.441 93.7868 103.698 94.3949C103.955 95.003 104.329 95.5543 104.8 96.0169L112.933 104.15H75C73.6739 104.15 72.4022 104.677 71.4645 105.615C70.5268 106.552 70 107.824 70 109.15C70 110.476 70.5268 111.748 71.4645 112.686C72.4022 113.623 73.6739 114.15 75 114.15H112.933L104.8 122.275Z" fill="#035DFF"/>
+</svg>
diff --git a/static/icons_ui/icon_supplier.svg b/static/icons_ui/icon_supplier.svg
new file mode 100644
index 0000000..f0991f8
--- /dev/null
+++ b/static/icons_ui/icon_supplier.svg
@@ -0,0 +1,11 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1409_18426)">
+<circle cx="100" cy="100" r="70.4839" stroke="#777E94" stroke-width="11.0323"/>
+<path d="M87.8487 81.5651H97.1815V65.9848H104.586V81.5651H116.695V65.9848H124.023V81.5651H133.664V88.661H124.023V105.013H135.824V112.031H85.6891V105.013H97.1815V88.661H87.8487V81.5651ZM104.586 105.013H116.695V88.661H104.586V105.013ZM120.629 113.497C127.211 120.953 132.096 127.226 135.284 132.317L128.651 136.867C125.257 131.108 120.578 124.552 114.613 117.199L120.629 113.497ZM106.283 117.353C102.221 124.964 97.5157 131.571 92.168 137.176L85.8434 132.471C91.1396 127.38 95.716 121.261 99.5725 114.114L106.283 117.353ZM73.5026 96.0655C71.1887 98.8422 68.7976 101.542 66.3295 104.164L63.9384 96.374C71.8057 87.4784 77.6933 77.0401 81.6012 65.0592L88.5429 68.2987C86.5375 74.1606 83.9922 79.8168 80.907 85.2673V136.944H73.5026V96.0655Z" fill="#035DFF"/>
+</g>
+<defs>
+<clipPath id="clip0_1409_18426">
+<rect width="200" height="200" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/static/icons_ui/icon_take_photo.svg b/static/icons_ui/icon_take_photo.svg
new file mode 100644
index 0000000..e6421d3
--- /dev/null
+++ b/static/icons_ui/icon_take_photo.svg
@@ -0,0 +1,8 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="path-1-inside-1_1387_18302" fill="white">
+<rect x="29" y="43" width="141" height="114" rx="10"/>
+</mask>
+<rect x="29" y="43" width="141" height="114" rx="10" stroke="#777E94" stroke-width="23" mask="url(#path-1-inside-1_1387_18302)"/>
+<circle cx="85.5" cy="100.5" r="25.75" stroke="#1677FF" stroke-width="11.5"/>
+<rect x="128" y="67" width="25" height="10" rx="5" fill="#777E94"/>
+</svg>
diff --git a/static/icons_ui/icon_tasknum.svg b/static/icons_ui/icon_tasknum.svg
new file mode 100644
index 0000000..247dbf2
--- /dev/null
+++ b/static/icons_ui/icon_tasknum.svg
@@ -0,0 +1,4 @@
+<svg width="38" height="39" viewBox="0 0 38 39" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.2004 4.18164C15.791 4.18164 16.2691 4.65981 16.2691 5.25039V6.71497H21.7316V5.25039C21.7316 4.96694 21.8442 4.6951 22.0447 4.49467C22.2451 4.29424 22.5169 4.18164 22.8004 4.18164C23.0838 4.18164 23.3557 4.29424 23.5561 4.49467C23.7565 4.6951 23.8691 4.96694 23.8691 5.25039V6.71497H27.2337C28.5241 6.71497 29.5691 7.75997 29.5691 9.05039V29.3171C29.5691 30.6059 28.5241 31.6525 27.2337 31.6525H10.7671C9.47664 31.6525 8.43164 30.6075 8.43164 29.3171V9.05039C8.43164 7.75997 9.47664 6.71497 10.7671 6.71497H14.1316V5.25039C14.1316 4.65981 14.6098 4.18164 15.2004 4.18164ZM21.7316 8.85247H16.2691V9.05039C16.2691 9.33384 16.1565 9.60568 15.9561 9.80611C15.7557 10.0065 15.4838 10.1191 15.2004 10.1191C14.9169 10.1191 14.6451 10.0065 14.4447 9.80611C14.2442 9.60568 14.1316 9.33384 14.1316 9.05039V8.85247H10.7671C10.7411 8.85247 10.7153 8.85759 10.6913 8.86754C10.6673 8.87749 10.6455 8.89206 10.6271 8.91044C10.6087 8.92882 10.5942 8.95064 10.5842 8.97465C10.5743 8.99866 10.5691 9.0244 10.5691 9.05039V29.3171C10.5691 29.4263 10.6578 29.515 10.7671 29.515H27.2337C27.2597 29.515 27.2854 29.5099 27.3095 29.4999C27.3335 29.49 27.3553 29.4754 27.3737 29.457C27.392 29.4386 27.4066 29.4168 27.4166 29.3928C27.4265 29.3688 27.4316 29.343 27.4316 29.3171V9.05039C27.4316 9.0244 27.4265 8.99866 27.4166 8.97465C27.4066 8.95064 27.392 8.92882 27.3737 8.91044C27.3553 8.89206 27.3335 8.87749 27.3095 8.86754C27.2854 8.85759 27.2597 8.85247 27.2337 8.85247H23.8691V9.05039C23.8691 9.33384 23.7565 9.60568 23.5561 9.80611C23.3557 10.0065 23.0838 10.1191 22.8004 10.1191C22.5169 10.1191 22.2451 10.0065 22.0447 9.80611C21.8442 9.60568 21.7316 9.33384 21.7316 9.05039V8.85247Z" fill="#333333"/>
+<path d="M12.8643 14.7504C12.8643 14.1598 13.3424 13.6816 13.933 13.6816H24.0663C24.2067 13.6816 24.3457 13.7093 24.4753 13.763C24.605 13.8167 24.7228 13.8954 24.8221 13.9947C24.9213 14.0939 25 14.2117 25.0537 14.3414C25.1074 14.4711 25.1351 14.61 25.1351 14.7504C25.1351 14.8907 25.1074 15.0297 25.0537 15.1594C25 15.289 24.9213 15.4069 24.8221 15.5061C24.7228 15.6054 24.605 15.6841 24.4753 15.7378C24.3457 15.7915 24.2067 15.8191 24.0663 15.8191H13.933C13.6496 15.8191 13.3777 15.7065 13.1773 15.5061C12.9769 15.3057 12.8643 15.0338 12.8643 14.7504ZM12.8643 19.8171C12.8643 19.2265 13.3424 18.7483 13.933 18.7483H21.533C21.8165 18.7483 22.0883 18.8609 22.2887 19.0613C22.4892 19.2618 22.6018 19.5336 22.6018 19.8171C22.6018 20.1005 22.4892 20.3723 22.2887 20.5728C22.0883 20.7732 21.8165 20.8858 21.533 20.8858H13.933C13.6496 20.8858 13.3777 20.7732 13.1773 20.5728C12.9769 20.3723 12.8643 20.1005 12.8643 19.8171ZM13.933 23.815C13.6496 23.815 13.3777 23.9276 13.1773 24.128C12.9769 24.3284 12.8643 24.6003 12.8643 24.8837C12.8643 25.1672 12.9769 25.439 13.1773 25.6394C13.3777 25.8399 13.6496 25.9525 13.933 25.9525H18.9997C19.2831 25.9525 19.555 25.8399 19.7554 25.6394C19.9558 25.439 20.0684 25.1672 20.0684 24.8837C20.0684 24.6003 19.9558 24.3284 19.7554 24.128C19.555 23.9276 19.2831 23.815 18.9997 23.815H13.933Z" fill="#5A7CF3"/>
+</svg>
diff --git a/static/icons_ui/icon_tenant.svg b/static/icons_ui/icon_tenant.svg
new file mode 100644
index 0000000..7707804
--- /dev/null
+++ b/static/icons_ui/icon_tenant.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="1698288184845" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1806" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M362.666667 895.914667V639.850667c0-36.266667 33.109333-63.850667 72.533333-63.850667h153.6c39.253333 0 72.533333 27.648 72.533333 63.850667v256.064h59.904c61.269333 0 110.762667-47.957333 110.762667-106.730667V414.165333L557.162667 139.328a63.808 63.808 0 0 0-90.325334 0L192 414.165333v375.018667c0 58.88 49.386667 106.730667 110.762667 106.730667H362.666667z m42.666666 0h213.333334V639.850667c0-10.709333-12.586667-21.184-29.866667-21.184h-153.6c-17.408 0-29.866667 10.389333-29.866667 21.184v256.064z m469.333334-439.082667v332.352c0 82.645333-68.885333 149.397333-153.429334 149.397333H302.762667C218.133333 938.581333 149.333333 871.936 149.333333 789.184V456.832l-27.584 27.584a21.333333 21.333333 0 1 1-30.165333-30.165333L436.672 109.162667a106.474667 106.474667 0 0 1 150.656 0l345.088 345.088a21.333333 21.333333 0 0 1-30.165333 30.165333L874.666667 456.832z" fill="#5A7CF3" p-id="1807"></path></svg>
\ No newline at end of file
diff --git a/static/icons_ui/icon_time.svg b/static/icons_ui/icon_time.svg
new file mode 100644
index 0000000..a706317
--- /dev/null
+++ b/static/icons_ui/icon_time.svg
@@ -0,0 +1,5 @@
+<svg width="36" height="38" viewBox="0 0 36 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.29594 8.32031C8.5692 8.32031 8.83127 8.43708 9.02449 8.64494C9.21771 8.85279 9.32626 9.1347 9.32626 9.42865V12.3499H12.0434C12.1787 12.3499 12.3127 12.3785 12.4377 12.4342C12.5627 12.4899 12.6763 12.5715 12.772 12.6744C12.8677 12.7774 12.9436 12.8996 12.9954 13.034C13.0472 13.1685 13.0739 13.3127 13.0739 13.4582C13.0739 13.6038 13.0472 13.7479 12.9954 13.8824C12.9436 14.0169 12.8677 14.1391 12.772 14.242C12.6763 14.3449 12.5627 14.4266 12.4377 14.4823C12.3127 14.5379 12.1787 14.5666 12.0434 14.5666H8.29594C8.02269 14.5666 7.76062 14.4498 7.5674 14.2419C7.37418 14.0341 7.26563 13.7522 7.26562 13.4582V9.42865C7.26562 9.1347 7.37418 8.85279 7.5674 8.64494C7.76062 8.43708 8.02269 8.32031 8.29594 8.32031Z" fill="#777E94"/>
+<path d="M7.84759 12.9041C9.22202 10.3424 11.4153 8.40545 14.0189 7.45426C16.6225 6.50307 19.4587 6.60248 21.9992 7.73397C24.5396 8.86546 26.6111 10.9519 27.8276 13.6044C29.0441 16.257 29.3226 19.2949 28.6114 22.152C27.9001 25.0092 26.2475 27.4907 23.9615 29.1343C21.6755 30.778 18.912 31.4716 16.1859 31.0859C13.4597 30.7002 10.9569 29.2616 9.14364 27.0381C7.33041 24.8146 6.33045 21.9578 6.33008 19C6.33005 18.8544 6.35669 18.7103 6.40845 18.5758C6.46022 18.4413 6.53611 18.3191 6.63179 18.2161C6.72746 18.1132 6.84105 18.0315 6.96607 17.9758C7.09108 17.9201 7.22508 17.8914 7.3604 17.8914C7.49572 17.8914 7.62971 17.9201 7.75473 17.9758C7.87974 18.0315 7.99333 18.1132 8.08901 18.2161C8.18469 18.3191 8.26058 18.4413 8.31234 18.5758C8.36411 18.7103 8.39074 18.8544 8.39072 19C8.39136 21.42 9.20984 23.7573 10.6937 25.5763C12.1775 27.3953 14.2254 28.572 16.456 28.8872C18.6865 29.2023 20.9475 28.6345 22.8177 27.2893C24.6878 25.9442 26.0396 23.9136 26.6212 21.5759C27.2028 19.2381 26.9745 16.7526 25.9789 14.5825C24.9832 12.4124 23.2882 10.7056 21.2094 9.7802C19.1307 8.8548 16.8101 8.77389 14.6801 9.55253C12.55 10.3312 10.7557 11.9163 9.63152 14.0125C9.4945 14.2669 9.26912 14.4524 9.00495 14.5282C8.74079 14.6039 8.45949 14.5636 8.22292 14.4162C7.98636 14.2688 7.81392 14.0264 7.74353 13.7422C7.67314 13.458 7.71057 13.1554 7.84759 12.901V12.9041Z" fill="#777E94"/>
+<path d="M17.6646 12.9062C17.9379 12.9062 18.1999 13.023 18.3932 13.2309C18.5864 13.4387 18.6949 13.7206 18.6949 14.0146V18.5461L21.6681 21.746C21.8614 21.9539 21.9699 22.2358 21.9699 22.5298C21.9699 22.8237 21.8614 23.1056 21.6681 23.3135C21.4749 23.5214 21.2128 23.6381 20.9395 23.6381C20.6663 23.6381 20.4042 23.5214 20.211 23.3135L16.9345 19.789C16.8389 19.6861 16.763 19.5639 16.7112 19.4294C16.6594 19.2949 16.6328 19.1508 16.6328 19.0053V14.0146C16.6328 13.7206 16.7414 13.4387 16.9346 13.2309C17.1278 13.023 17.3899 12.9063 17.6631 12.9062H17.6646Z" fill="#1677FF"/>
+</svg>
diff --git a/static/icons_ui/icon_tm.svg b/static/icons_ui/icon_tm.svg
new file mode 100644
index 0000000..669bfcb
--- /dev/null
+++ b/static/icons_ui/icon_tm.svg
@@ -0,0 +1,5 @@
+<svg width="38" height="38" viewBox="0 0 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.10924 25.27C7.3822 25.27 7.64397 25.3784 7.83698 25.5715C8.02998 25.7645 8.13841 26.0262 8.13841 26.2992V28.2989H29.8301V26.2992C29.8301 26.0262 29.9385 25.7645 30.1315 25.5715C30.3245 25.3784 30.5863 25.27 30.8592 25.27C31.1322 25.27 31.394 25.3784 31.587 25.5715C31.78 25.7645 31.8884 26.0262 31.8884 26.2992V29.3281C31.8884 29.4633 31.8618 29.5971 31.8101 29.7219C31.7584 29.8468 31.6825 29.9603 31.587 30.0558C31.4914 30.1514 31.378 30.2272 31.2531 30.2789C31.1282 30.3306 30.9944 30.3573 30.8592 30.3573H7.10924C6.97409 30.3573 6.84026 30.3306 6.7154 30.2789C6.59054 30.2272 6.47708 30.1514 6.38151 30.0558C6.28595 29.9603 6.21014 29.8468 6.15842 29.7219C6.1067 29.5971 6.08008 29.4633 6.08008 29.3281V26.2992C6.08008 26.0262 6.18851 25.7645 6.38151 25.5715C6.57452 25.3784 6.83629 25.27 7.10924 25.27Z" fill="#7B8195"/>
+<path d="M11.3925 8.92622C11.3925 8.75207 11.3582 8.57963 11.2915 8.41874C11.2249 8.25784 11.1272 8.11165 11.0041 7.98851C10.8809 7.86537 10.7347 7.76769 10.5738 7.70104C10.4129 7.6344 10.2405 7.6001 10.0664 7.6001C9.89221 7.6001 9.71976 7.6344 9.55887 7.70104C9.39798 7.76769 9.25179 7.86537 9.12865 7.98851C9.0055 8.11165 8.90782 8.25784 8.84118 8.41874C8.77454 8.57963 8.74023 8.75207 8.74023 8.92622V20.714C8.74023 21.0657 8.87995 21.403 9.12865 21.6517C9.37734 21.9004 9.71465 22.0401 10.0664 22.0401C10.4181 22.0401 10.7554 21.9004 11.0041 21.6517C11.2528 21.403 11.3925 21.0657 11.3925 20.714V8.92622ZM15.9602 7.6001C16.693 7.6001 17.2864 8.19538 17.2864 8.92622V20.714C17.2864 21.0657 17.1466 21.403 16.8979 21.6517C16.6492 21.9004 16.3119 22.0401 15.9602 22.0401C15.6085 22.0401 15.2712 21.9004 15.0225 21.6517C14.7738 21.403 14.6341 21.0657 14.6341 20.714V8.92622C14.6341 8.19538 15.2274 7.6001 15.9602 7.6001ZM21.8541 7.6001C22.5869 7.6001 23.1802 8.19538 23.1802 8.92622V20.714C23.1802 21.0657 23.0405 21.403 22.7918 21.6517C22.5431 21.9004 22.2058 22.0401 21.8541 22.0401C21.5024 22.0401 21.1651 21.9004 20.9164 21.6517C20.6677 21.403 20.528 21.0657 20.528 20.714V8.92622C20.528 8.19538 21.1213 7.6001 21.8541 7.6001Z" fill="#5A7CF3"/>
+<path d="M17.2821 8.92622C17.2821 8.75207 17.2478 8.57963 17.1812 8.41874C17.1145 8.25784 17.0169 8.11165 16.8937 7.98851C16.7706 7.86537 16.6244 7.76769 16.4635 7.70104C16.3026 7.6344 16.1302 7.6001 15.956 7.6001C15.7819 7.6001 15.6094 7.6344 15.4485 7.70104C15.2876 7.76769 15.1414 7.86537 15.0183 7.98851C14.8952 8.11165 14.7975 8.25784 14.7308 8.41874C14.6642 8.57963 14.6299 8.75207 14.6299 8.92622V20.714C14.6299 21.0657 14.7696 21.403 15.0183 21.6517C15.267 21.9004 15.6043 22.0401 15.956 22.0401C16.3077 22.0401 16.645 21.9004 16.8937 21.6517C17.1424 21.403 17.2821 21.0657 17.2821 20.714V8.92622ZM21.8499 7.6001C22.5827 7.6001 23.176 8.19538 23.176 8.92622V20.714C23.176 21.0657 23.0363 21.403 22.7876 21.6517C22.5389 21.9004 22.2016 22.0401 21.8499 22.0401C21.4982 22.0401 21.1609 21.9004 20.9122 21.6517C20.6635 21.403 20.5238 21.0657 20.5238 20.714V8.92622C20.5238 8.19538 21.1171 7.6001 21.8499 7.6001ZM27.7438 7.6001C28.4766 7.6001 29.0699 8.19538 29.0699 8.92622V20.714C29.0699 21.0657 28.9302 21.403 28.6815 21.6517C28.4328 21.9004 28.0955 22.0401 27.7438 22.0401C27.3921 22.0401 27.0547 21.9004 26.8061 21.6517C26.5574 21.403 26.4176 21.0657 26.4176 20.714V8.92622C26.4176 8.19538 27.011 7.6001 27.7438 7.6001Z" fill="#5A7CF3"/>
+</svg>
diff --git a/static/icons_ui/icon_xm.svg b/static/icons_ui/icon_xm.svg
new file mode 100644
index 0000000..80425fc
--- /dev/null
+++ b/static/icons_ui/icon_xm.svg
@@ -0,0 +1,4 @@
+<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.75 5.26562C5.93021 5.26562 5.26562 5.93021 5.26562 6.75V9.875C5.26562 9.96734 5.28381 10.0588 5.31915 10.1441C5.35448 10.2294 5.40627 10.3069 5.47157 10.3722C5.53686 10.4375 5.61437 10.4893 5.69968 10.5246C5.78498 10.5599 5.87641 10.5781 5.96875 10.5781C6.06109 10.5781 6.15252 10.5599 6.23782 10.5246C6.32313 10.4893 6.40064 10.4375 6.46593 10.3722C6.53123 10.3069 6.58302 10.2294 6.61835 10.1441C6.65369 10.0588 6.67188 9.96734 6.67188 9.875V6.75C6.67188 6.70729 6.70729 6.67188 6.75 6.67188H9.875C10.0615 6.67188 10.2403 6.5978 10.3722 6.46593C10.504 6.33407 10.5781 6.15523 10.5781 5.96875C10.5781 5.78227 10.504 5.60343 10.3722 5.47157C10.2403 5.3397 10.0615 5.26562 9.875 5.26562H6.75V5.26562ZM6.67188 16.125C6.67188 15.9385 6.5978 15.7597 6.46593 15.6278C6.33407 15.496 6.15523 15.4219 5.96875 15.4219C5.78227 15.4219 5.60343 15.496 5.47157 15.6278C5.3397 15.7597 5.26562 15.9385 5.26562 16.125V19.25C5.26562 20.0698 5.93021 20.7344 6.75 20.7344H9.875C10.0615 20.7344 10.2403 20.6603 10.3722 20.5284C10.504 20.3966 10.5781 20.2177 10.5781 20.0313C10.5781 19.8448 10.504 19.6659 10.3722 19.5341C10.2403 19.4022 10.0615 19.3281 9.875 19.3281H6.75C6.72928 19.3281 6.70941 19.3199 6.69476 19.3052C6.68011 19.2906 6.67188 19.2707 6.67188 19.25V16.125ZM20.0313 15.4219C20.4198 15.4219 20.7344 15.7365 20.7344 16.125V19.25C20.7344 20.0698 20.0698 20.7344 19.25 20.7344H16.125C15.9385 20.7344 15.7597 20.6603 15.6278 20.5284C15.496 20.3966 15.4219 20.2177 15.4219 20.0313C15.4219 19.8448 15.496 19.6659 15.6278 19.5341C15.7597 19.4022 15.9385 19.3281 16.125 19.3281H19.25C19.2707 19.3281 19.2906 19.3199 19.3052 19.3052C19.3199 19.2906 19.3281 19.2707 19.3281 19.25V16.125C19.3281 15.7365 19.6427 15.4219 20.0313 15.4219V15.4219ZM16.125 5.26562C16.0327 5.26562 15.9412 5.28381 15.8559 5.31915C15.7706 5.35448 15.6931 5.40627 15.6278 5.47157C15.5625 5.53686 15.5107 5.61437 15.4754 5.69968C15.4401 5.78498 15.4219 5.87641 15.4219 5.96875C15.4219 6.06109 15.4401 6.15252 15.4754 6.23782C15.5107 6.32313 15.5625 6.40064 15.6278 6.46593C15.6931 6.53123 15.7706 6.58302 15.8559 6.61835C15.9412 6.65369 16.0327 6.67188 16.125 6.67188H19.25C19.2927 6.67188 19.3281 6.70729 19.3281 6.75V9.875C19.3281 10.0615 19.4022 10.2403 19.5341 10.3722C19.6659 10.504 19.8448 10.5781 20.0313 10.5781C20.2177 10.5781 20.3966 10.504 20.5284 10.3722C20.6603 10.2403 20.7344 10.0615 20.7344 9.875V6.75C20.7344 5.93021 20.0698 5.26562 19.25 5.26562H16.125V5.26562Z" fill="white"/>
+<path d="M10.5781 9.875C10.5781 9.78266 10.5599 9.69123 10.5246 9.60593C10.4893 9.52062 10.4375 9.44311 10.3722 9.37782C10.3069 9.31252 10.2294 9.26073 10.1441 9.2254C10.0588 9.19006 9.96734 9.17188 9.875 9.17188C9.78266 9.17188 9.69123 9.19006 9.60593 9.2254C9.52062 9.26073 9.44311 9.31252 9.37782 9.37782C9.31252 9.44311 9.26073 9.52062 9.2254 9.60593C9.19006 9.69123 9.17187 9.78266 9.17188 9.875V16.125C9.17188 16.3115 9.24595 16.4903 9.37782 16.6222C9.50968 16.754 9.68852 16.8281 9.875 16.8281C10.0615 16.8281 10.2403 16.754 10.3722 16.6222C10.504 16.4903 10.5781 16.3115 10.5781 16.125V9.875ZM13 9.17188C13.3885 9.17188 13.7031 9.4875 13.7031 9.875V16.125C13.7031 16.3115 13.629 16.4903 13.4972 16.6222C13.3653 16.754 13.1865 16.8281 13 16.8281C12.8135 16.8281 12.6347 16.754 12.5028 16.6222C12.371 16.4903 12.2969 16.3115 12.2969 16.125V9.875C12.2969 9.4875 12.6115 9.17188 13 9.17188V9.17188ZM16.125 9.17188C16.5135 9.17188 16.8281 9.4875 16.8281 9.875V16.125C16.8281 16.3115 16.754 16.4903 16.6222 16.6222C16.4903 16.754 16.3115 16.8281 16.125 16.8281C15.9385 16.8281 15.7597 16.754 15.6278 16.6222C15.496 16.4903 15.4219 16.3115 15.4219 16.125V9.875C15.4219 9.4875 15.7365 9.17188 16.125 9.17188V9.17188Z" fill="white"/>
+</svg>
diff --git a/static/icons_ui/icon_xm_blue.svg b/static/icons_ui/icon_xm_blue.svg
new file mode 100644
index 0000000..468012f
--- /dev/null
+++ b/static/icons_ui/icon_xm_blue.svg
@@ -0,0 +1,4 @@
+<svg width="38" height="38" viewBox="0 0 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.50039 7.24414C8.25431 7.24414 7.24414 8.25431 7.24414 9.50039V14.2504C7.24414 14.3907 7.27178 14.5297 7.32549 14.6594C7.3792 14.789 7.45793 14.9069 7.55717 15.0061C7.65641 15.1054 7.77423 15.1841 7.9039 15.2378C8.03356 15.2915 8.17254 15.3191 8.31289 15.3191C8.45324 15.3191 8.59222 15.2915 8.72188 15.2378C8.85155 15.1841 8.96937 15.1054 9.06861 15.0061C9.16785 14.9069 9.24658 14.789 9.30029 14.6594C9.354 14.5297 9.38164 14.3907 9.38164 14.2504V9.50039C9.38164 9.43547 9.43547 9.38164 9.50039 9.38164H14.2504C14.5338 9.38164 14.8057 9.26904 15.0061 9.06861C15.2065 8.86818 15.3191 8.59634 15.3191 8.31289C15.3191 8.02944 15.2065 7.7576 15.0061 7.55717C14.8057 7.35674 14.5338 7.24414 14.2504 7.24414H9.50039V7.24414ZM9.38164 23.7504C9.38164 23.4669 9.26904 23.1951 9.06861 22.9947C8.86818 22.7942 8.59634 22.6816 8.31289 22.6816C8.02944 22.6816 7.7576 22.7942 7.55717 22.9947C7.35674 23.1951 7.24414 23.4669 7.24414 23.7504V28.5004C7.24414 29.7465 8.25431 30.7566 9.50039 30.7566H14.2504C14.5338 30.7566 14.8057 30.644 15.0061 30.4436C15.2065 30.2432 15.3191 29.9713 15.3191 29.6879C15.3191 29.4044 15.2065 29.1326 15.0061 28.9322C14.8057 28.7317 14.5338 28.6191 14.2504 28.6191H9.50039C9.4689 28.6191 9.43869 28.6066 9.41642 28.5844C9.39415 28.5621 9.38164 28.5319 9.38164 28.5004V23.7504ZM29.6879 22.6816C30.2785 22.6816 30.7566 23.1598 30.7566 23.7504V28.5004C30.7566 29.7465 29.7465 30.7566 28.5004 30.7566H23.7504C23.4669 30.7566 23.1951 30.644 22.9947 30.4436C22.7942 30.2432 22.6816 29.9713 22.6816 29.6879C22.6816 29.4044 22.7942 29.1326 22.9947 28.9322C23.1951 28.7317 23.4669 28.6191 23.7504 28.6191H28.5004C28.5319 28.6191 28.5621 28.6066 28.5844 28.5844C28.6066 28.5621 28.6191 28.5319 28.6191 28.5004V23.7504C28.6191 23.1598 29.0973 22.6816 29.6879 22.6816V22.6816ZM23.7504 7.24414C23.61 7.24414 23.4711 7.27178 23.3414 7.32549C23.2117 7.3792 23.0939 7.45793 22.9947 7.55717C22.8954 7.65641 22.8167 7.77423 22.763 7.9039C22.7093 8.03356 22.6816 8.17254 22.6816 8.31289C22.6816 8.45324 22.7093 8.59222 22.763 8.72188C22.8167 8.85155 22.8954 8.96937 22.9947 9.06861C23.0939 9.16785 23.2117 9.24658 23.3414 9.30029C23.4711 9.354 23.61 9.38164 23.7504 9.38164H28.5004C28.5653 9.38164 28.6191 9.43547 28.6191 9.50039V14.2504C28.6191 14.5338 28.7317 14.8057 28.9322 15.0061C29.1326 15.2065 29.4044 15.3191 29.6879 15.3191C29.9713 15.3191 30.2432 15.2065 30.4436 15.0061C30.644 14.8057 30.7566 14.5338 30.7566 14.2504V9.50039C30.7566 8.25431 29.7465 7.24414 28.5004 7.24414H23.7504V7.24414Z" fill="#7B8195"/>
+<path d="M15.3191 14.2504C15.3191 14.11 15.2915 13.9711 15.2378 13.8414C15.1841 13.7117 15.1054 13.5939 15.0061 13.4947C14.9069 13.3954 14.789 13.3167 14.6594 13.263C14.5297 13.2093 14.3907 13.1816 14.2504 13.1816C14.11 13.1816 13.9711 13.2093 13.8414 13.263C13.7117 13.3167 13.5939 13.3954 13.4947 13.4947C13.3954 13.5939 13.3167 13.7117 13.263 13.8414C13.2093 13.9711 13.1816 14.11 13.1816 14.2504V23.7504C13.1816 24.0338 13.2942 24.3057 13.4947 24.5061C13.6951 24.7065 13.9669 24.8191 14.2504 24.8191C14.5338 24.8191 14.8057 24.7065 15.0061 24.5061C15.2065 24.3057 15.3191 24.0338 15.3191 23.7504V14.2504ZM19.0004 13.1816C19.591 13.1816 20.0691 13.6614 20.0691 14.2504V23.7504C20.0691 24.0338 19.9565 24.3057 19.7561 24.5061C19.5557 24.7065 19.2838 24.8191 19.0004 24.8191C18.7169 24.8191 18.4451 24.7065 18.2447 24.5061C18.0442 24.3057 17.9316 24.0338 17.9316 23.7504V14.2504C17.9316 13.6614 18.4098 13.1816 19.0004 13.1816V13.1816ZM23.7504 13.1816C24.341 13.1816 24.8191 13.6614 24.8191 14.2504V23.7504C24.8191 24.0338 24.7065 24.3057 24.5061 24.5061C24.3057 24.7065 24.0338 24.8191 23.7504 24.8191C23.4669 24.8191 23.1951 24.7065 22.9947 24.5061C22.7942 24.3057 22.6816 24.0338 22.6816 23.7504V14.2504C22.6816 13.6614 23.1598 13.1816 23.7504 13.1816V13.1816Z" fill="#5A7CF3"/>
+</svg>
diff --git a/static/icons_ui/icons_common_recceipt.svg b/static/icons_ui/icons_common_recceipt.svg
new file mode 100644
index 0000000..78ee356
--- /dev/null
+++ b/static/icons_ui/icons_common_recceipt.svg
@@ -0,0 +1,8 @@
+<svg width="56" height="45" viewBox="0 0 56 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.9">
+<path d="M35.8381 38.768C35.8381 41.9326 38.4151 44.5096 41.5797 44.5096C44.7442 44.5096 47.3213 41.9326 47.3213 38.768C47.3213 35.6035 44.7442 33.0264 41.5797 33.0264C38.4151 33.0264 35.8381 35.6035 35.8381 38.768ZM8.19165 38.6478C8.19165 41.8124 10.7687 44.3894 13.9332 44.3894C17.0978 44.3894 19.6748 41.8124 19.6748 38.6478C19.6748 35.4833 17.0978 32.9062 13.9332 32.9062C10.7687 32.9062 8.19165 35.4833 8.19165 38.6478Z" fill="#5A7CF3"/>
+<path d="M46.38 9.25331H37.0066V3.63189C37.0066 1.75586 35.9517 0.353842 34.0757 0H5.03391C2.92421 0 1.04817 1.05485 0 2.93088V36.5459H5.03391C5.96858 32.4467 9.60048 29.5158 13.9334 29.5158C18.2663 29.5158 21.8982 32.4467 22.8328 36.5459H32.5535C33.4882 32.4467 37.1201 29.5158 41.4529 29.5158C45.7858 29.5158 49.4177 32.4467 50.3524 36.5459H55.2728V25.6502L46.38 9.25331ZM37.2402 25.0627V13.5862H43.7963L50.3524 25.0627H37.2402Z" fill="#5A7CF3"/>
+<path d="M15.8155 14.5996H25.7847C27.0032 14.5996 28.0001 15.6796 28.0001 16.9996C28.0001 18.3196 27.0032 19.3996 25.7847 19.3996H15.8155C14.597 19.3996 13.6001 18.3196 13.6001 16.9996C13.6001 15.6796 14.597 14.5996 15.8155 14.5996Z" fill="#F5F5F5"/>
+<path d="M16.1599 11C16.7199 11 17.2799 11.2182 17.7279 11.6545C18.6239 12.5273 18.6239 13.8364 17.7279 14.7091L15.3759 17L17.7279 19.2909C18.6239 20.1636 18.6239 21.4727 17.7279 22.3455C16.8319 23.2182 15.4879 23.2182 14.5919 22.3455L10.6719 18.5273C10.2239 18.0909 9.9999 17.5455 9.9999 17C9.9999 16.4545 10.2239 15.9091 10.6719 15.4727L14.5919 11.6545C14.9279 11.2182 15.5999 11 16.1599 11Z" fill="#F5F5F5"/>
+</g>
+</svg>
diff --git a/static/icons_ui/icons_common_sjadd.svg b/static/icons_ui/icons_common_sjadd.svg
new file mode 100644
index 0000000..2f67b51
--- /dev/null
+++ b/static/icons_ui/icons_common_sjadd.svg
@@ -0,0 +1,9 @@
+<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.333252" y="78.1895" width="95.8124" height="8.25969" rx="4.12984" fill="#6989F5"/>
+<path opacity="0.9" d="M18.6421 5.50586H80.3145C83.9763 5.50586 87.0599 8.58948 87.0599 12.2513V79.7054C87.0599 83.3672 83.9763 86.4508 80.3145 86.4508H18.6421C14.9803 86.4508 11.8967 83.3672 11.8967 79.7054V12.2513C11.8967 8.58948 14.9803 5.50586 18.6421 5.50586Z" fill="#5A7CF3"/>
+<path d="M58.7014 73.5086C58.7014 78.9851 60.877 84.2373 64.7494 88.1098C68.6219 91.9823 73.8741 94.1578 79.3506 94.1578C84.8271 94.1578 90.0794 91.9823 93.9518 88.1098C97.8243 84.2373 99.9998 78.9851 99.9998 73.5086C99.9998 68.0321 97.8243 62.7799 93.9518 58.9074C90.0794 55.0349 84.8271 52.8594 79.3506 52.8594C73.8741 52.8594 68.6219 55.0349 64.7494 58.9074C60.877 62.7799 58.7014 68.0321 58.7014 73.5086Z" fill="#5FCB94"/>
+<path d="M82.9302 69.6747V83.3985C82.9302 85.0759 81.4434 86.4482 79.6263 86.4482C77.8092 86.4482 76.3224 85.0759 76.3224 83.3985V69.6747C76.3224 67.9974 77.8092 66.625 79.6263 66.625C81.4434 66.625 82.9302 67.9974 82.9302 69.6747Z" fill="#F5F5F5"/>
+<path d="M87.8861 70.1508C87.8861 70.9217 87.5857 71.6926 86.985 72.3093C85.7836 73.5427 83.9815 73.5427 82.7801 72.3093L79.6264 69.0715L76.4727 72.3093C75.2713 73.5427 73.4692 73.5427 72.2678 72.3093C71.0663 71.0758 71.0663 69.2257 72.2678 67.9922L77.5239 62.5959C78.1246 61.9792 78.8755 61.6708 79.6264 61.6708C80.3773 61.6708 81.1281 61.9792 81.7289 62.5959L86.985 67.9922C87.5857 68.4548 87.8861 69.3799 87.8861 70.1508Z" fill="#F5F5F5"/>
+<rect x="21.8086" y="31.9375" width="28.0829" height="6.60775" rx="3.30387" fill="#EEF2FE"/>
+<rect x="21.8086" y="48.4551" width="37.9946" height="6.60775" rx="3.30387" fill="#EEF2FE"/>
+</svg>
diff --git a/static/icons_ui/label_scx.svg b/static/icons_ui/label_scx.svg
new file mode 100644
index 0000000..31d0882
--- /dev/null
+++ b/static/icons_ui/label_scx.svg
@@ -0,0 +1,4 @@
+<svg width="38" height="38" viewBox="0 0 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M24.5426 7.70117C24.2595 7.701 23.9879 7.81318 23.7874 8.01309L20.9326 10.8678H12.932C12.6486 10.8678 12.3767 10.9804 12.1763 11.1809C11.9759 11.3813 11.8633 11.6531 11.8633 11.9366C11.8633 12.22 11.9759 12.4919 12.1763 12.6923C12.3767 12.8927 12.6486 13.0053 12.932 13.0053H20.9326L23.7874 15.8585C23.9876 16.059 24.2593 16.1718 24.5426 16.172H28.7654C29.0488 16.172 29.3207 16.0594 29.5211 15.859C29.7215 15.6585 29.8341 15.3867 29.8341 15.1033C29.8341 14.8198 29.7215 14.548 29.5211 14.3475C29.3207 14.1471 29.0488 14.0345 28.7654 14.0345H24.9859L22.888 11.9366L24.9859 9.83867H28.7654C29.0488 9.83867 29.3207 9.72607 29.5211 9.52564C29.7215 9.32521 29.8341 9.05337 29.8341 8.76992C29.8341 8.48647 29.7215 8.21463 29.5211 8.0142C29.3207 7.81377 29.0488 7.70117 28.7654 7.70117H24.5426Z" fill="#5A7CF3"/>
+<path d="M7.63867 11.9361C7.63884 11.4155 7.76684 10.9029 8.01143 10.4434C8.25602 9.98384 8.60972 9.59137 9.04145 9.30048C9.47319 9.00958 9.96975 8.82915 10.4875 8.77504C11.0053 8.72092 11.5284 8.79478 12.011 8.99012C12.4935 9.18547 12.9207 9.49632 13.2551 9.89537C13.5894 10.2944 13.8206 10.7695 13.9284 11.2788C14.0362 11.7881 14.0173 12.3161 13.8734 12.8164C13.7294 13.3166 13.4648 13.7739 13.1028 14.148L16.7761 21.9507H28.2347C29.4079 21.9507 30.3595 22.9007 30.3595 24.0755V27.7695C30.3595 28.0529 30.2469 28.3248 30.0465 28.5252C29.846 28.7256 29.5742 28.8382 29.2908 28.8382H9.23467C8.95122 28.8382 8.67938 28.7256 8.47895 28.5252C8.27852 28.3248 8.16592 28.0529 8.16592 27.7695V24.0755C8.16592 22.9023 9.11751 21.9507 10.2908 21.9507H14.4122L11.1853 15.0949C10.7398 15.1467 10.2883 15.1037 9.86052 14.9686C9.43277 14.8335 9.03845 14.6094 8.70347 14.3111C8.36849 14.0127 8.10043 13.6469 7.91691 13.2375C7.7334 12.8282 7.63857 12.3847 7.63867 11.9361ZM10.818 10.8927C10.5415 10.8927 10.2763 11.0026 10.0808 11.1981C9.88523 11.3936 9.77538 11.6588 9.77538 11.9353C9.77538 12.2119 9.88523 12.4771 10.0808 12.6726C10.2763 12.8681 10.5415 12.978 10.818 12.978C11.0945 12.978 11.3597 12.8681 11.5553 12.6726C11.7508 12.4771 11.8606 12.2119 11.8606 11.9353C11.8606 11.6588 11.7508 11.3936 11.5553 11.1981C11.3597 11.0026 11.0945 10.8927 10.818 10.8927ZM16.0778 24.0882H10.3034V26.7007H28.222V24.0882H16.0778Z" fill="#7B8195"/>
+</svg>
diff --git a/static/icons_ui/login_bg.png b/static/icons_ui/login_bg.png
new file mode 100644
index 0000000..a062de1
Binary files /dev/null and b/static/icons_ui/login_bg.png differ
diff --git a/static/icons_ui/popup_bot_bg.png b/static/icons_ui/popup_bot_bg.png
new file mode 100644
index 0000000..e024500
Binary files /dev/null and b/static/icons_ui/popup_bot_bg.png differ
diff --git a/static/images/banner/banner01.jpg b/static/images/banner/banner01.jpg
new file mode 100644
index 0000000..fdb1e16
Binary files /dev/null and b/static/images/banner/banner01.jpg differ
diff --git a/static/images/banner/banner02.jpg b/static/images/banner/banner02.jpg
new file mode 100644
index 0000000..1086afd
Binary files /dev/null and b/static/images/banner/banner02.jpg differ
diff --git a/static/images/banner/banner03.jpg b/static/images/banner/banner03.jpg
new file mode 100644
index 0000000..092a5fc
Binary files /dev/null and b/static/images/banner/banner03.jpg differ
diff --git a/static/images/banner/icon1.png b/static/images/banner/icon1.png
new file mode 100644
index 0000000..3678f06
Binary files /dev/null and b/static/images/banner/icon1.png differ
diff --git a/static/images/banner/icon2.png b/static/images/banner/icon2.png
new file mode 100644
index 0000000..34b0393
Binary files /dev/null and b/static/images/banner/icon2.png differ
diff --git a/static/images/banner/icon3.png b/static/images/banner/icon3.png
new file mode 100644
index 0000000..ddbe0f7
Binary files /dev/null and b/static/images/banner/icon3.png differ
diff --git a/static/images/banner/icon4.png b/static/images/banner/icon4.png
new file mode 100644
index 0000000..ef7a396
Binary files /dev/null and b/static/images/banner/icon4.png differ
diff --git a/static/images/banner/icon5.png b/static/images/banner/icon5.png
new file mode 100644
index 0000000..2a5546c
Binary files /dev/null and b/static/images/banner/icon5.png differ
diff --git a/static/images/banner/icon6.png b/static/images/banner/icon6.png
new file mode 100644
index 0000000..b4c0075
Binary files /dev/null and b/static/images/banner/icon6.png differ
diff --git a/static/images/banner/icon7.png b/static/images/banner/icon7.png
new file mode 100644
index 0000000..a9be572
Binary files /dev/null and b/static/images/banner/icon7.png differ
diff --git a/static/images/banner/login_banner.svg b/static/images/banner/login_banner.svg
new file mode 100644
index 0000000..caef463
--- /dev/null
+++ b/static/images/banner/login_banner.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="47px" height="66px" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient gradientUnits="userSpaceOnUse" x1="5.63807152481269" y1="62.1175381975164" x2="43.4328694937704" y2="1.76792360964131" id="LinearGradient40">
+      <stop id="Stop41" stop-color="#09005d" offset="0" />
+      <stop id="Stop42" stop-color="#1a0f91" offset="1" />
+    </linearGradient>
+  </defs>
+  <g transform="matrix(1 0 0 1 -97 -106 )">
+    <path d="M 36.7877623440973 1.59223308620249  C 37.7932710870804 0.0521044544140052  39.8698652301974 -0.408494762569467  41.450991297062 0.55588484798968  L 45.378304430887 2.95244014885682  C 46.9594304977516 3.91681975941597  47.4694711644821 5.96072878478014  46.5222527834112 7.54403859316083  L 11.8977778076482 65.9393830713469  L 0.95376235865917 59.2534975623212  C 0.0648343395002736 58.7137328549186  -0.197472289103991 57.5550379496946  0.37814503477759 56.6914144178506  L 36.7877623440973 1.59223308620249  Z " fill-rule="nonzero" fill="url(#LinearGradient40)" stroke="none" transform="matrix(1 0 0 1 97 106 )" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/static/images/banner/logo-banner.png b/static/images/banner/logo-banner.png
new file mode 100644
index 0000000..518b616
Binary files /dev/null and b/static/images/banner/logo-banner.png differ
diff --git a/static/images/banner/u2335.svg b/static/images/banner/u2335.svg
new file mode 100644
index 0000000..d2045d9
--- /dev/null
+++ b/static/images/banner/u2335.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="37px" height="37px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -200 -131 )">
+    <path d="M 1.8705291643251 26.4306710705829  C 0.0206628251877919 22.5581882283421  -0.41841050822613 18.2538299761859  0.58210085807772 14.1438156584916  C 0.733257251548091 13.5319921611116  0.91320533901281 12.9273665872301  1.12194512047189 12.3299389368472  C 1.1867264319592 12.1427929258839  1.25870566694509 11.9556469149206  1.33068490193098 11.7685009039573  C 1.69058107686042 10.8471666961379  2.12245648677576 9.95462418231291  2.6191132081784 9.11246713297802  C 2.62631113167697 9.09807128598083  2.63350905517557 9.09087336248225  2.64070697867417 9.07647751548507  C 2.66230074916992 9.04048789799212  2.67669659616711 9.01169620399777  2.69829036666286 8.97570658650483  C 2.73427998415581 8.91092527501753  2.77746752514735 8.84614396353023  2.81345714264029 8.78856057554152  C 2.91422807162054 8.62300833507397  3.10857200608242 8.55102910008808  3.28852009354714 8.59421664107961  C 3.33170763453868 8.6014145645782  3.37489517553022 8.62300833507396  3.41808271652174 8.64460210556974  C 3.62682249798082 8.77416472854433  3.68440588596954 9.04048789799212  3.56204118649352 9.2492276794512  C 2.90703014812193 10.3073224337438  2.36718588572777 11.4445943465208  1.9497063228096 12.6250538002894  C -0.130493568282595 18.4985593751379  1.1147471969733 24.7535548954117  4.69211517577197 29.3314342405142  C 6.67874206138249 31.8794991590147  9.39235922035051 33.9093135856167  12.6602164887099 35.060981345391  C 13.236050368597 35.2625232033514  13.8118842484841 35.4352733673176  14.3949160518698 35.5792318372894  C 18.3105864351022 36.5365556626017  22.4062049057992 36.1190760996835  26.0987396605753 34.3555848425293  C 30.3383166012442 32.3329683394258  33.5341946346176 28.7843920546214  35.0961440338114 24.3576691029893  C 38.3280116846779 15.2163062597814  33.5269967111191 5.15360920875412  24.3856338679112 1.9217415578877  C 23.8241958350213 1.72019969992721  23.2483619551341 1.55464745945966  22.672528075247 1.41068898948788  C 20.1748486212367 0.798865492107825  17.5692003147475 0.748480027617699  15.0427291667428 1.25953259601752  C 14.9779478552555 1.27392844301469  14.9131665437682 1.27392844301469  14.8555831557795 1.25233467251892  C 14.6972288388105 1.21634505502598  14.5676662158359 1.08678243205138  14.531676598343 0.914032268085244  C 14.4812911338529 0.676500792631811  14.6396454508218 0.446167240676965  14.8771769262753 0.395781776186839  C 17.526012773756 -0.144062486207328  20.2612237032198 -0.0864790982186222  22.8884657802047 0.554136093155797  C 23.4930913540862 0.698094563127572  24.090519004469 0.8780426505923  24.6879466548519 1.08678243205138  C 34.2827786784709 4.47700439988675  39.3213251274832 15.0507540193138  35.9311031596477 24.6383881194342  C 34.2899766019695 29.2882466995226  30.9285463281285 33.0095731482931  26.4802296060006 35.1329605803768  C 22.6077467637597 36.9828269195142  18.3105864351022 37.4219002529281  14.1933741939093 36.4213888866243  C 13.5815506965292 36.2702324931539  12.9769251226478 36.0902844056892  12.3722995487663 35.8815446242301  C 7.7224409686779 34.2404180665518  3.99391659640884 30.8789877927108  1.8705291643251 26.4306710705829  Z " fill-rule="nonzero" fill="#ffffff" stroke="none" transform="matrix(1 0 0 1 200 131 )" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/static/images/banner/u2450.svg b/static/images/banner/u2450.svg
new file mode 100644
index 0000000..76bdcd4
--- /dev/null
+++ b/static/images/banner/u2450.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="26px" height="30px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -47 -440 )">
+    <path d="M 0 5.43375  C 0 4.39821609406726  0.831471178885669 3.55875  1.85714285714286 3.55875  L 4.667 3.55875  L 4.667 9  L 20.6142857142857 9  L 20.6142857142857 3.55875  L 24.1428571428571 3.55875  C 25.1685288211143 3.55875  26 4.39821609406726  26 5.43375  L 26 28.125  C 26 29.1605339059327  25.1685288211143 30  24.1428571428571 30  L 1.85714285714286 30  C 0.831471178885669 30  0 29.1605339059327  0 28.125  L 0 5.43375  Z M 6.68571428571429 7.213125  L 6.68571428571429 2.638125  L 8.54657142857143 2.638125  C 8.54657142857143 1.18125  9.71657142857143 0  11.1614285714286 0  L 14.1328571428571 0  C 15.5758571428571 0  16.7458571428571 1.18125  16.7458571428571 2.638125  L 18.5714285714286 2.638125  L 18.5714285714286 7.213125  L 6.68571428571429 7.213125  Z M 10.8958571428571 3.178125  C 10.8958571428571 4.231875  11.726 5.085  12.753 5.085  C 13.7781428571429 5.085  14.6101428571429 4.231875  14.6101428571429 3.178125  C 14.6101428571429 2.124375  13.7781428571429 1.27125  12.753 1.27125  C 11.726 1.27125  10.8958571428571 2.124375  10.8958571428571 3.178125  Z M 21.7898571428571 12  L 4.21014285714286 12  L 4.21014285714286 14  L 21.7898571428571 14  L 21.7898571428571 12  Z M 4.21014285714286 15.76125  L 4.21014285714286 15.763125  L 4.21014285714286 17.5425  L 8.17142857142857 17.5425  L 8.17142857142857 15.76125  L 4.21014285714286 15.76125  Z M 4.21014285714286 19.83  L 4.21014285714286 19.831875  L 4.21014285714286 21.609375  L 8.17142857142857 21.609375  L 8.17142857142857 19.83  L 4.21014285714286 19.83  Z M 4.21014285714286 23.896875  L 4.21014285714286 23.89875  L 4.21014285714286 25.678125  L 9.16128571428571 25.678125  L 9.16128571428571 23.896875  L 4.21014285714286 23.896875  Z M 19.1007142857143 22.936875  C 18.6304250353497 23.601697854168  18.054348350795 24.1833137376127  17.3958571428571 24.658125  C 17.3499258944188 24.6907879240536  17.3226001725233 24.743965009545  17.3226001725233 24.800686363582  C 17.3226001725233 24.8471234159694  17.3409461471698 24.8916424010547  17.3735714285714 24.924375  L 19.955 27.530625  C 20.0943364195914 27.6714577822726  20.2834102728407 27.7505899923118  20.4805714285714 27.7505899923118  C 20.6777325843022 27.7505899923118  20.8668064375515 27.6714577822726  21.0061428571429 27.530625  L 21.9495714285714 26.578125  C 22.0890629462509 26.4374488071433  22.1674415161946 26.2465569360743  22.1674415161946 26.0475  C 22.1674415161946 25.8484430639257  22.0890629462509 25.6575511928567  21.9495714285714 25.516875  L 19.3718571428571 22.914375  C 19.3384169107129 22.8805790204336  19.2930418828892 22.8615897586197  19.2457262895471 22.8615897586197  C 19.1881881961978 22.8615897586197  19.1341869943616 22.8896253240047  19.1007142857143 22.936875  Z M 14.759255467994 24.5140374791424  C 15.8204396264006 24.5140374791424  16.8379731597654 24.0875460419895  17.5871428571429 23.32875  C 18.3393810181837 22.5713714085468  18.7621586915612 21.5428888032805  18.7621586915612 20.4703129946648  C 18.7621586915612 19.4014123902587  18.3422653206105 18.3761442986165  17.5945714285714 17.619375  C 16.4639051022835 16.4793931723658  14.7689506313882 16.1297666636769  13.286 16.730625  C 13.2322852506052 16.7522006308877  13.1970325664254 16.804665558827  13.1970325664254 16.8630310876505  C 13.1970325664254 16.9004978712548  13.2116477538362 16.9364572975827  13.2377142857143 16.963125  L 14.4857142857143 18.223125  C 14.702965366557 18.4427381600805  14.702965366557 18.7985118399195  14.4857142857143 19.018125  L 13.2637142857143 20.251875  C 13.1592443813362 20.3572532390508  13.017609951532 20.4164460384021  12.8699345449049 20.4164460384021  C 12.7186473849234 20.4164460384021  12.5738649451232 20.3543311831856  12.4688571428571 20.244375  L 11.2524285714286 18.97125  C 11.228278977567 18.9459814310735  11.1949935626667 18.9317087237978  11.160214266276 18.9317087237978  C 11.1072954788903 18.9317087237978  11.0598197467671 18.9645509214797  11.0407142857143 19.014375  C 10.8594350431001 19.4823089185733  10.7663983251369 19.9803341788901  10.7663983251369 20.4827874791424  C 10.7663983251369 22.7091853768978  12.5540613597411 24.5140374791424  14.759255467994 24.5140374791424  Z M 21.0771333988002 25.9865625  C 21.0771333988002 26.1605123044669  21.0088694902987 26.3273761781034  20.8872857142857 26.450625  C 20.7650596956061 26.5745248598445  20.5989889589728 26.6441731430195  20.4257857142857 26.6441731430195  C 20.0660563212907 26.6441731430195  19.7744380297712 26.3497508294661  19.7744380297712 25.9865625  C 19.7744380297712 25.8126126955331  19.8427019382728 25.6457488218966  19.9642857142857 25.5225  C 20.0865117329653 25.3986001401555  20.2525824695986 25.3289518569805  20.4257857142857 25.3289518569805  C 20.7855151072807 25.3289518569805  21.0771333988002 25.6233741705339  21.0771333988002 25.9865625  Z " fill-rule="nonzero" fill="#9bca63" stroke="none" transform="matrix(1 0 0 1 47 440 )" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/static/images/banner/u253_selected.svg b/static/images/banner/u253_selected.svg
new file mode 100644
index 0000000..1de51e0
--- /dev/null
+++ b/static/images/banner/u253_selected.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="20px" height="18px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -30 -16 )">
+    <path d="M 19.7374790983607 8.04830870454546  C 19.9665962704918 7.76331261818182  19.9137230737705 7.351651575  19.6317327254098 7.12646946818182  L 11.2566194672131 0.571559031818182  C 10.5410689754098 0.00508528636363643  9.42015733606558 0.00508528636363643  8.70460684426229 0.571559031818182  L 0.392941434426229 7.12998793636364  C 0.107426209016393 7.35517004318182  0.0616027868852459 7.76683108636364  0.28367018442623 8.048308725  C 0.505737581967213 8.32978636363636  0.921673340163934 8.37904493863636  1.20366368852459 8.1573813  L 1.47155450819672 7.94627306590909  L 1.47155450819672 15.8733869727273  C 1.47155450819672 16.9957790386364  2.63828956967213 17.8366934863636  3.68165383196721 17.8366934863636  L 16.7942048770492 17.8366934863636  C 17.8234696311475 17.8366934863636  18.5178708606557 17.0485561022727  18.5178708606557 15.8733869727273  L 18.5178708606557 7.92516225681818  L 18.8139607172131 8.1573813  C 18.9338066188525 8.25238000227273  19.0748017827869 8.29812010909091  19.2193218442623 8.29812010909091  C 19.413190204918 8.29812010909091  19.6070585655738 8.21367681136364  19.7374790983607 8.04830870454546  Z M 11.9651202254098 15.1591374818182  L 11.9651202254098 16.5243040159091  L 10.6538651229508 16.5243040159091  L 9.3426100204918 16.5243040159091  L 8.03135491803279 16.5243040159091  L 8.03135491803279 15.1591374818182  L 8.03135491803279 12.8615762863636  C 8.03135491803279 12.1015866681818  8.64820879098361 11.28178305  9.99823758196722 11.28178305  C 11.3517912295082 11.28178305  11.9651202459016 12.1015866681818  11.9651202459016 12.8615762863636  L 11.9651202254098 15.1591374818182  Z " fill-rule="nonzero" fill="#0052d9" stroke="none" transform="matrix(1 0 0 1 30 16 )" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/static/images/bg.jpg b/static/images/bg.jpg
new file mode 100644
index 0000000..df2ff67
Binary files /dev/null and b/static/images/bg.jpg differ
diff --git a/static/images/default.jpg b/static/images/default.jpg
new file mode 100644
index 0000000..aa0237b
Binary files /dev/null and b/static/images/default.jpg differ
diff --git a/static/images/icon1.png b/static/images/icon1.png
new file mode 100644
index 0000000..a2ffd47
Binary files /dev/null and b/static/images/icon1.png differ
diff --git a/static/images/icon1.svg b/static/images/icon1.svg
new file mode 100644
index 0000000..971098e
--- /dev/null
+++ b/static/images/icon1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="86" height="86" viewBox="0 0 86 86"><g><g><ellipse cx="43" cy="43" rx="43" ry="43" fill="#DAF9F4" fill-opacity="1"/></g><g><g><g><path d="M24.384619999999998,20L61.6154,20C63.5333,20,65,21.48571,65,23.42857L65,64.5714C65,66.51429999999999,63.5333,68,61.6154,68L24.384619999999998,68C22.46667,68,21,66.51429999999999,21,64.5714L21,23.42857C21,21.48571,22.46667,20,24.384619999999998,20Z" fill="#09D3B6" fill-opacity="1"/></g><g><path d="M37.85714,16.469839999999998C38.08571,14.01143,40.371430000000004,12,43,12C45.6286,12,47.8,14.01143,48.1429,16.469839999999998L52.7143,16.469839999999998C53.9714,16.469839999999998,55,17.47556,55,18.70476L55,22.0571C55,23.2863,53.9714,24.292099999999998,52.7143,24.292099999999998L33.28571,24.292099999999998C32.02857,24.292099999999998,31,23.2863,31,22.0571L31,18.70476C31,17.47556,32.02857,16.469839999999998,33.28571,16.469839999999998L37.85714,16.469839999999998Z" fill="#A5ECE2" fill-opacity="1"/></g><g><rect x="28" y="30" width="30" height="3" rx="1.5" fill="#A5ECE2" fill-opacity="1"/></g><g><rect x="28" y="39" width="30" height="3" rx="1.5" fill="#A5ECE2" fill-opacity="1"/></g><g><rect x="28" y="48" width="12" height="3" rx="1.5" fill="#A5ECE2" fill-opacity="1"/></g><g><rect x="28" y="57" width="12" height="3" rx="1.5" fill="#A5ECE2" fill-opacity="1"/></g></g><g><path d="M55.0518,55.0411C54.9959,55.1612,54.9345,55.28009,54.8672,55.39658L53.3279,58.085499999999996C55.0584,57.417699999999996,56.4,57.7078,57.3516,58.9561C57.4707,59.1125,57.4106,59.340199999999996,57.2301,59.4161L49.82228,62.5283C47.93876,63.438199999999995,45.6871,63.004999999999995,44.26822,61.4596C42.84935,59.9142,42.594156,57.6171,43.638749,55.79348L46.61558,50.593469999999996L48.69979,46.952854C49.03085,46.383296,49.75577,46.190005,50.32276,46.520105C50.88976,46.850204,51.08619,47.5799,50.76255,48.15378L51.65578,46.593775C51.986869999999996,46.0242674,52.71176,45.831011,53.2787,46.161094C53.8457,46.491177,54.0421,47.22083,53.7185,47.7947L54.314,46.754699C54.6451,46.185189,55.37,45.99193163,55.937,46.322016C56.5039,46.652101,56.7004,47.38175,56.3768,47.95563L55.7813,48.99563C56.1124,48.42603,56.8373,48.2327,57.4043,48.56281C57.9713,48.89293,58.1678,49.62267,57.8441,50.19656L55.1644,54.876580000000004C55.131,54.93542,55.0929,54.99066,55.0512,55.0411L55.0518,55.0411Z" fill="#A5ECE2" fill-opacity="1"/></g></g></g></svg>
\ No newline at end of file
diff --git a/static/images/icon2.png b/static/images/icon2.png
new file mode 100644
index 0000000..eedf475
Binary files /dev/null and b/static/images/icon2.png differ
diff --git a/static/images/icon2.svg b/static/images/icon2.svg
new file mode 100644
index 0000000..fa92acf
--- /dev/null
+++ b/static/images/icon2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="86" height="86" viewBox="0 0 86 86"><g><g><ellipse cx="43" cy="43" rx="43" ry="43" fill="#E6FBFF" fill-opacity="1"/></g><g><g><path d="M30.30769,23L55.6923,23C57,23,58,24.00816,58,25.326529999999998L58,53.2449C58,54.5633,57,55.5714,55.6923,55.5714L30.30769,55.5714C29,55.5714,28,54.5633,28,53.2449L28,25.326529999999998C28,24.00816,29,23,30.30769,23Z" fill="#B6F3FF" fill-opacity="1"/></g><g><path d="M39.49350199157715,22.03311C39.64935199157715,20.3649,41.207791991577146,19,43.00000199157715,19C44.79221199157715,19,46.272681991577144,20.3649,46.50648199157715,22.03311L49.62338199157715,22.03311C50.48048199157715,22.03311,51.181781991577154,22.71556,51.181781991577154,23.54966L51.181781991577154,25.82449C51.181781991577154,26.65859,50.48048199157715,27.34104,49.62338199157715,27.34104L36.376621991577146,27.34104C35.51948099157715,27.34104,34.81818199157715,26.65859,34.81818199157715,25.82449L34.81818199157715,23.54966C34.81818199157715,22.71556,35.51948099157715,22.03311,36.376621991577146,22.03311L39.49350199157715,22.03311Z" fill="#3DE0FF" fill-opacity="1"/></g><g><rect x="33" y="31" width="20" height="2" rx="1" fill="#3DE0FF" fill-opacity="1"/></g><g><rect x="33" y="37" width="20" height="2" rx="1" fill="#3DE0FF" fill-opacity="1"/></g><g><rect x="33" y="43" width="20" height="2" rx="1" fill="#3DE0FF" fill-opacity="1"/></g></g><g transform="matrix(-1,0,0,1,138,0)"><path d="M120.61500000000001,56.00189L109.4822,47.199679C109.3201,47.0712688,109.1128,47.000385522,108.8982,47L90.7964,47C90.1353,46.999822784,89.508,47.266946,89.0835,47.729443C87.8195,49.10784,88.4873,50.45466,91.0857,51.7699L99.1422,53.25935L94.9324,55.42017L84.7007,55.42017L75.10776,49.14758C73.7611,48.50881,72.7874,48.2103,72.18553,48.25309C69.0667771,48.47723,68.050643,50.52292,69.979067,52.71125L82.1682,62.4385L104.0754,62.4385L109.9545,66.7734C110.4137,67.1122,111.0826,67.0662,111.48089999999999,66.6685L120.7077,57.4587C121.13130000000001,57.0357,121.0894,56.37732,120.61500000000001,56.00189Z" fill="#3DE0FF" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/static/images/icon3.png b/static/images/icon3.png
new file mode 100644
index 0000000..e640911
Binary files /dev/null and b/static/images/icon3.png differ
diff --git a/static/images/icon3.svg b/static/images/icon3.svg
new file mode 100644
index 0000000..38e3fbf
--- /dev/null
+++ b/static/images/icon3.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="86" height="86" viewBox="0 0 86 86"><g><g><ellipse cx="43" cy="43" rx="43" ry="43" fill="#FFE5E3" fill-opacity="1"/></g><g><g><g><path d="M24.384619999999998,20L61.6154,20C63.5333,20,65,21.48571,65,23.42857L65,64.5714C65,66.51429999999999,63.5333,68,61.6154,68L24.384619999999998,68C22.46667,68,21,66.51429999999999,21,64.5714L21,23.42857C21,21.48571,22.46667,20,24.384619999999998,20Z" fill="#FC4F42" fill-opacity="1"/></g><g><path d="M37.85714,16.469839999999998C38.08571,14.01143,40.371430000000004,12,43,12C45.6286,12,47.8,14.01143,48.1429,16.469839999999998L52.7143,16.469839999999998C53.9714,16.469839999999998,55,17.47556,55,18.70476L55,22.0571C55,23.2863,53.9714,24.292099999999998,52.7143,24.292099999999998L33.28571,24.292099999999998C32.02857,24.292099999999998,31,23.2863,31,22.0571L31,18.70476C31,17.47556,32.02857,16.469839999999998,33.28571,16.469839999999998L37.85714,16.469839999999998Z" fill="#FABEB9" fill-opacity="1"/></g><g><rect x="28" y="30" width="30" height="3" rx="1.5" fill="#FABEB9" fill-opacity="1"/></g><g><rect x="28" y="39" width="30" height="3" rx="1.5" fill="#FABEB9" fill-opacity="1"/></g><g><rect x="28" y="48" width="12" height="3" rx="1.5" fill="#FABEB9" fill-opacity="1"/></g><g><rect x="28" y="57" width="12" height="3" rx="1.5" fill="#FABEB9" fill-opacity="1"/></g></g><g><g transform="matrix(0.7019045352935791,-0.7122711539268494,0.7122711539268494,0.7019045352935791,-22.868730311578474,50.437727685777645)"><path d="M48.82373046875 52.540191650390625C48.82373046875 52.540191650390625 48.82373046875 52.540191650390625 48.82373046875 52.540191650390625L51.98373055458069 52.540191650390625C51.98373055458069 52.540191650390625 51.98373055458069 52.540191650390625 51.98373055458069 52.540191650390625L51.98373055458069 65.49274146556854C51.98373055458069 66.36535139400269 51.27634044009949 67.07274150848389 50.403730511665344 67.07274150848389L50.403730511665344 67.07274150848389C49.5311205832312 67.07274150848389 48.82373046875 66.36535139400269 48.82373046875 65.49274146556854Z" fill="#FABEB9" fill-opacity="1"/></g><g><path d="M44.449065,48.02400002861023L46.53273,50.54400002861023L48.83194,48.24000002861023L46.38903,46.15200002861023C46.96383,45.86400002861023,47.61048,45.72000002861023,48.32899,45.72000002861023C50.70005,45.72000002861023,52.640010000000004,47.66400002861023,52.640010000000004,50.04000002861023C52.640010000000004,52.41600002861023,50.70005,54.36000002861023,48.32899,54.36000002861023C45.95792,54.36000002861023,44.0179626,52.41600002861023,44.0179626,50.04000002861023C43.9461122,49.32000002861023,44.089813,48.67200002861023,44.449065,48.02400002861023Z" fill="#FABEB9" fill-opacity="1"/></g><g><path d="M58.913470312499996,52.23621L52.1999803125,61.8521C51.3729503125,63.066199999999995,49.7188903125,63.357600000000005,48.5026703125,62.532L48.4053763125,62.4349C47.3351047125,61.609300000000005,47.0918613125,60.0066,47.9675383125,58.9382C48.0161873125,58.8896,48.0648353125,58.792500000000004,48.1621333125,58.7439L56.2864703125,50.24503L57.1135003125,46.69978L60.4702703125,45L62.9999703125,46.94261L62.1242703125,50.58499L58.913470312499996,52.23621Z" fill="#FABEB9" fill-opacity="1"/></g></g></g></g></svg>
\ No newline at end of file
diff --git a/static/images/icon4.svg b/static/images/icon4.svg
new file mode 100644
index 0000000..811c086
--- /dev/null
+++ b/static/images/icon4.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="86" height="86" viewBox="0 0 86 86"><g><g><ellipse cx="43" cy="43" rx="43" ry="43" fill="#DEECFF" fill-opacity="1"/></g><g><path d="M26.62857,62.7073L35.3143,62.7073C36.182900000000004,62.7073,36.9429,63.4585,36.9429,64.31710000000001L36.9429,65.3902C36.9429,66.2488,36.182900000000004,67,35.3143,67L26.62857,67C25.76,67,25,66.2488,25,65.3902L25,64.31710000000001C25,63.4585,25.76,62.7073,26.62857,62.7073ZM52.6857,62.7073L61.3714,62.7073C62.24,62.7073,63,63.4585,63,64.31710000000001L63,65.3902C63,66.2488,62.24,67,61.3714,67L52.6857,67C51.817099999999996,67,51.0571,66.2488,51.0571,65.3902L51.0571,64.31710000000001C51.0571,63.4585,51.817099999999996,62.7073,52.6857,62.7073ZM53.2286,23L63,23L63,28.365850000000002L53.2286,28.365850000000002L53.2286,23Z" fill="#82C0FF" fill-opacity="1"/></g><g><path d="M23.20455,28L63.7955,28C65.6114,28,67,29.37647,67,31.176470000000002L67,60.8235C67,62.6235,65.6114,64,63.7955,64L23.20455,64C21.38864,64,20,62.6235,20,60.8235L20,31.176470000000002C20,29.37647,21.38864,28,23.20455,28Z" fill="#409EFE" fill-opacity="1"/></g><g><path d="M29.19508,20L42.0616,20C43.3812,20,44.590900000000005,20.7875,45.1408,22.025L48,29L26.00594185,29L26.00594185,23.375C25.895972,21.4625,27.32559,20,29.19508,20Z" fill="#409EFE" fill-opacity="1"/></g><g><path d="M28.25,36L41.75,36C42.9875,36,44,36.99,44,38.2C44,39.41,42.9875,40.4,41.75,40.4L28.25,40.4C27.0125,40.4,26,39.41,26,38.2C26,36.99,27.0125,36,28.25,36ZM28.25,44.8L41.75,44.8C42.9875,44.8,44,45.79,44,47C44,48.21,42.9875,49.2,41.75,49.2L28.25,49.2C27.0125,49.2,26,48.21,26,47C26,45.79,27.0125,44.8,28.25,44.8ZM28.25,53.6L41.75,53.6C42.9875,53.6,44,54.59,44,55.8C44,57.010000000000005,42.9875,58,41.75,58L28.25,58C27.0125,58,26,57.010000000000005,26,55.8C26,54.59,27.0125,53.6,28.25,53.6Z" fill="#DEECFF" fill-opacity="1"/></g><g><path d="M64,46.5Q64,46.684110000000004,63.991,46.86801Q63.981899999999996,47.0519,63.9639,47.23513Q63.9458,47.41836,63.9188,47.60048Q63.8918,47.7826,63.8559,47.96318Q63.82,48.14375,63.7752,48.32235Q63.7305,48.50095,63.677099999999996,48.67713Q63.623599999999996,48.85332,63.5616,49.0267Q63.4996,49.2,63.4291,49.3701Q63.358599999999996,49.5402,63.2799,49.7067Q63.2012,49.8731,63.1144,50.0355Q63.0276,50.1978,62.933,50.3558Q62.838300000000004,50.5137,62.736000000000004,50.6668Q62.6337,50.819900000000004,62.524100000000004,50.9677Q62.4144,51.1156,62.2976,51.2579Q62.1808,51.4003,62.0571,51.536699999999996Q61.9335,51.6731,61.8033,51.8033Q61.6731,51.9335,61.536699999999996,52.0571Q61.4003,52.1808,61.2579,52.2976Q61.1156,52.4144,60.9677,52.524100000000004Q60.819900000000004,52.6337,60.6668,52.736000000000004Q60.5137,52.838300000000004,60.3558,52.933Q60.1978,53.0276,60.0355,53.1144Q59.8731,53.2012,59.7067,53.2799Q59.5402,53.358599999999996,59.3701,53.4291Q59.2,53.4996,59.0267,53.5616Q58.85332,53.623599999999996,58.67713,53.677099999999996Q58.50095,53.7305,58.32235,53.7752Q58.14375,53.82,57.96318,53.8559Q57.7826,53.8918,57.60048,53.9188Q57.41836,53.9458,57.23513,53.9639Q57.0519,53.981899999999996,56.86801,53.991Q56.684110000000004,54,56.5,54Q56.315889999999996,54,56.13199,53.991Q55.9481,53.981899999999996,55.76487,53.9639Q55.58164,53.9458,55.39952,53.9188Q55.2174,53.8918,55.03682,53.8559Q54.85625,53.82,54.67765,53.7752Q54.49905,53.7305,54.32286,53.677099999999996Q54.14668,53.623599999999996,53.97333,53.5616Q53.79997,53.4996,53.62987,53.4291Q53.45977,53.358599999999996,53.29334,53.2799Q53.1269,53.2012,52.96452,53.1144Q52.80215,53.0276,52.64423,52.933Q52.48631,52.838300000000004,52.33322,52.736000000000004Q52.18014,52.6337,52.03225,52.524100000000004Q51.88437,52.4144,51.74205,52.2976Q51.59973,52.1808,51.46331,52.0571Q51.32689,51.9335,51.1967,51.8033Q51.06651,51.6731,50.94287,51.536699999999996Q50.81922,51.4003,50.702420000000004,51.2579Q50.58562,51.1156,50.47594,50.9677Q50.36627,50.819900000000004,50.263980000000004,50.6668Q50.16169,50.5137,50.06704,50.3558Q49.972381,50.1978,49.88559,50.0355Q49.798799,49.8731,49.72008,49.7067Q49.641361,49.5402,49.570903,49.3701Q49.500446,49.2,49.438419,49.0267Q49.376393,48.85332,49.322947,48.67713Q49.269502,48.50095,49.224766,48.32235Q49.180029,48.14375,49.14411,47.96318Q49.108191,47.7826,49.0811762,47.60048Q49.0541609,47.41836,49.0361145,47.23513Q49.0180682,47.0519,49.00903408,46.86801Q49,46.684110000000004,49,46.5Q49,46.315889999999996,49.00903408,46.13199Q49.0180682,45.9481,49.0361145,45.76487Q49.0541609,45.58164,49.0811762,45.39952Q49.108191,45.2174,49.14411,45.03682Q49.180029,44.85625,49.224766,44.67765Q49.269502,44.49905,49.322947,44.32286Q49.376393,44.14668,49.438419,43.97333Q49.500446,43.79997,49.570903,43.62987Q49.641361,43.45977,49.72008,43.29334Q49.798799,43.1269,49.88559,42.96452Q49.972381,42.80215,50.06704,42.64423Q50.16169,42.48631,50.263980000000004,42.33322Q50.36627,42.18014,50.47594,42.03225Q50.58562,41.88437,50.702420000000004,41.74205Q50.81922,41.59973,50.94287,41.46331Q51.06651,41.32689,51.1967,41.1967Q51.32689,41.06651,51.46331,40.94287Q51.59973,40.81922,51.74205,40.702420000000004Q51.88437,40.58562,52.03225,40.47594Q52.18014,40.36627,52.33322,40.263980000000004Q52.48631,40.16169,52.64423,40.06704Q52.80215,39.972381,52.96452,39.88559Q53.1269,39.798799,53.29334,39.72008Q53.45977,39.641361,53.62987,39.570903Q53.79997,39.500446,53.97333,39.438419Q54.14668,39.376393,54.32287,39.322947Q54.49905,39.269502,54.67765,39.224766Q54.85625,39.180029,55.03682,39.14411Q55.2174,39.108191,55.39952,39.0811762Q55.58164,39.0541609,55.76487,39.0361145Q55.9481,39.0180682,56.13199,39.00903408Q56.315889999999996,39,56.5,39Q56.684110000000004,39,56.86801,39.00903408Q57.0519,39.0180682,57.23513,39.0361145Q57.41836,39.0541609,57.60048,39.0811762Q57.7826,39.108191,57.96318,39.14411Q58.14375,39.180029,58.32235,39.224766Q58.50095,39.269502,58.67713,39.322947Q58.85332,39.376393,59.0267,39.438419Q59.2,39.500446,59.3701,39.570903Q59.5402,39.641361,59.7067,39.72008Q59.8731,39.798799,60.0355,39.88559Q60.1978,39.972381,60.3558,40.06704Q60.5137,40.16169,60.6668,40.263980000000004Q60.819900000000004,40.36627,60.9677,40.47594Q61.1156,40.58562,61.2579,40.702420000000004Q61.4003,40.81922,61.536699999999996,40.94287Q61.6731,41.06651,61.8033,41.1967Q61.9335,41.32689,62.0571,41.46331Q62.1808,41.59973,62.2976,41.74205Q62.4144,41.88437,62.524100000000004,42.03225Q62.6337,42.18014,62.736000000000004,42.33322Q62.838300000000004,42.48631,62.933,42.64423Q63.0276,42.80215,63.1144,42.96452Q63.2012,43.1269,63.2799,43.29334Q63.358599999999996,43.45977,63.4291,43.62987Q63.4996,43.79997,63.5616,43.97333Q63.623599999999996,44.14668,63.677099999999996,44.32287Q63.7305,44.49905,63.7752,44.67765Q63.82,44.85625,63.8559,45.03682Q63.8918,45.2174,63.9188,45.39952Q63.9458,45.58164,63.9639,45.76487Q63.981899999999996,45.9481,63.991,46.13199Q64,46.315889999999996,64,46.5Z" fill="#DEECFF" fill-opacity="1"/></g><g><path d="M54,46L58,46C58.6,46,59,46.4,59,47C59,47.6,58.6,48,58,48L54,48C53.4,48,53,47.6,53,47C53,46.4,53.4,46,54,46Z" fill="#82C0FF" fill-opacity="1"/></g><g><path d="M53.15385,20L62.846199999999996,20C64.0308,20,65,20.9,65,22C65,23.1,64.0308,24,62.846199999999996,24L53.15385,24C51.969231,24,51,23.1,51,22C51,20.9,51.969231,20,53.15385,20Z" fill="#82C0FF" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/static/images/icon5.svg b/static/images/icon5.svg
new file mode 100644
index 0000000..61cc90a
--- /dev/null
+++ b/static/images/icon5.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="86" height="86" viewBox="0 0 86 86"><g><g><ellipse cx="43" cy="43" rx="43" ry="43" fill="#FFF3E2" fill-opacity="1"/></g><g><g><path d="M24.384619999999998,20L61.6154,20C63.5333,20,65,21.48571,65,23.42857L65,64.5714C65,66.51429999999999,63.5333,68,61.6154,68L24.384619999999998,68C22.46667,68,21,66.51429999999999,21,64.5714L21,23.42857C21,21.48571,22.46667,20,24.384619999999998,20Z" fill="#FBB03B" fill-opacity="1"/></g><g><path d="M37.85714,16.469839999999998C38.08571,14.01143,40.371430000000004,12,43,12C45.6286,12,47.8,14.01143,48.1429,16.469839999999998L52.7143,16.469839999999998C53.9714,16.469839999999998,55,17.47556,55,18.70476L55,22.0571C55,23.2863,53.9714,24.292099999999998,52.7143,24.292099999999998L33.28571,24.292099999999998C32.02857,24.292099999999998,31,23.2863,31,22.0571L31,18.70476C31,17.47556,32.02857,16.469839999999998,33.28571,16.469839999999998L37.85714,16.469839999999998Z" fill="#FFCE82" fill-opacity="1"/></g><g><rect x="28" y="30" width="30" height="3" rx="1.5" fill="#FFCE82" fill-opacity="1"/></g><g><rect x="28" y="39" width="30" height="3" rx="1.5" fill="#FFCE82" fill-opacity="1"/></g><g><rect x="28" y="48" width="12" height="3" rx="1.5" fill="#FFCE82" fill-opacity="1"/></g><g><rect x="28" y="57" width="12" height="3" rx="1.5" fill="#FFCE82" fill-opacity="1"/></g><g><g transform="matrix(0.7381733059883118,-0.6746111512184143,0.6746111512184143,0.7381733059883118,-23.766510171255504,48.81186932972196)"><path d="M51 55.0238037109375C51 55.0238037109375 51 55.0238037109375 51 55.0238037109375L54.00000023841858 55.0238037109375C54.00000023841858 55.0238037109375 54.00000023841858 55.0238037109375 54.00000023841858 55.0238037109375L54.00000023841858 63.66980063915253C54.00000023841858 64.4982278297362 53.32842730979295 65.16980075836182 52.50000011920929 65.16980075836182L52.50000011920929 65.16980075836182C51.67157292862563 65.16980075836182 51 64.4982278297362 51 63.66980063915253Z" fill="#FFCE82" fill-opacity="1"/></g><g><path d="M44.623701,49.2L47.51767,52.7L50.71102,49.5L47.31809,46.6C48.11642,46.2,49.01455,46,50.01247,46C53.30561,46,56,48.7,56,52C56,55.3,53.30561,58,50.01247,58C46.71933,58,44.024948,55.3,44.024948,52C43.9251559,51,44.12474,50.1,44.623701,49.2Z" fill="#FFCE82" fill-opacity="1"/></g></g></g></g></svg>
\ No newline at end of file
diff --git a/static/images/icon6.png b/static/images/icon6.png
new file mode 100644
index 0000000..761a86b
Binary files /dev/null and b/static/images/icon6.png differ
diff --git a/static/images/icon7.png b/static/images/icon7.png
new file mode 100644
index 0000000..40c58cb
Binary files /dev/null and b/static/images/icon7.png differ
diff --git a/static/images/icon8.png b/static/images/icon8.png
new file mode 100644
index 0000000..8c0dba3
Binary files /dev/null and b/static/images/icon8.png differ
diff --git a/static/images/mobile_bg.png b/static/images/mobile_bg.png
new file mode 100644
index 0000000..e0cccfe
Binary files /dev/null and b/static/images/mobile_bg.png differ
diff --git a/static/images/photo.png b/static/images/photo.png
new file mode 100644
index 0000000..52523a1
Binary files /dev/null and b/static/images/photo.png differ
diff --git a/static/images/profile.jpg b/static/images/profile.jpg
new file mode 100644
index 0000000..b3a940b
Binary files /dev/null and b/static/images/profile.jpg differ
diff --git a/static/images/tabbar/tab_act_icon1.png b/static/images/tabbar/tab_act_icon1.png
new file mode 100644
index 0000000..9d0de1d
Binary files /dev/null and b/static/images/tabbar/tab_act_icon1.png differ
diff --git a/static/images/tabbar/tab_act_icon2.png b/static/images/tabbar/tab_act_icon2.png
new file mode 100644
index 0000000..8c927dd
Binary files /dev/null and b/static/images/tabbar/tab_act_icon2.png differ
diff --git a/static/images/tabbar/tab_act_icon3.png b/static/images/tabbar/tab_act_icon3.png
new file mode 100644
index 0000000..e89d96a
Binary files /dev/null and b/static/images/tabbar/tab_act_icon3.png differ
diff --git a/static/images/tabbar/tab_act_icon4.png b/static/images/tabbar/tab_act_icon4.png
new file mode 100644
index 0000000..3ef0854
Binary files /dev/null and b/static/images/tabbar/tab_act_icon4.png differ
diff --git a/static/images/tabbar/tab_act_icon5.png b/static/images/tabbar/tab_act_icon5.png
new file mode 100644
index 0000000..f9aef6c
Binary files /dev/null and b/static/images/tabbar/tab_act_icon5.png differ
diff --git a/static/images/tabbar/tab_icon1.png b/static/images/tabbar/tab_icon1.png
new file mode 100644
index 0000000..d36711d
Binary files /dev/null and b/static/images/tabbar/tab_icon1.png differ
diff --git a/static/images/tabbar/tab_icon2.png b/static/images/tabbar/tab_icon2.png
new file mode 100644
index 0000000..6b16a35
Binary files /dev/null and b/static/images/tabbar/tab_icon2.png differ
diff --git a/static/images/tabbar/tab_icon3.png b/static/images/tabbar/tab_icon3.png
new file mode 100644
index 0000000..880aed5
Binary files /dev/null and b/static/images/tabbar/tab_icon3.png differ
diff --git a/static/images/tabbar/tab_icon4.png b/static/images/tabbar/tab_icon4.png
new file mode 100644
index 0000000..b9249bf
Binary files /dev/null and b/static/images/tabbar/tab_icon4.png differ
diff --git a/static/images/tabbar/tab_icon5.png b/static/images/tabbar/tab_icon5.png
new file mode 100644
index 0000000..a8ecfd9
Binary files /dev/null and b/static/images/tabbar/tab_icon5.png differ
diff --git a/static/login.png b/static/login.png
new file mode 100644
index 0000000..3cc9c2f
Binary files /dev/null and b/static/login.png differ
diff --git a/static/logo.png b/static/logo.png
new file mode 100644
index 0000000..b5771e2
Binary files /dev/null and b/static/logo.png differ
diff --git a/static/menus/bind_pallet.svg b/static/menus/bind_pallet.svg
new file mode 100644
index 0000000..b2f3cd5
--- /dev/null
+++ b/static/menus/bind_pallet.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="1703490735848" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="24609" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M368 112a16 16 0 0 1 16 16v768a16 16 0 0 1-16 16H192a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16h176m0-48H192a64 64 0 0 0-64 64v768a64 64 0 0 0 64 64h176a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64zM832 112a16 16 0 0 1 16 16v768a16 16 0 0 1-16 16H560a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16h272m0-48H560a64 64 0 0 0-64 64v768a64 64 0 0 0 64 64h272a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64z" fill="#3c9cff" p-id="24610"></path><path d="M328 432a24 24 0 0 0-24 24v112a24 24 0 0 0 48 0v-112a24 24 0 0 0-24-24zM600 432a24 24 0 0 0-24 24v112a24 24 0 0 0 48 0v-112a24 24 0 0 0-24-24z" fill="#3c9cff" p-id="24611"></path><path d="M736 224v80h-80v-80h80m0-32h-80a32 32 0 0 0-32 32v80a32 32 0 0 0 32 32h80a32 32 0 0 0 32-32v-80a32 32 0 0 0-32-32z" fill="#3c9cff" p-id="24612"></path></svg>
\ No newline at end of file
diff --git a/static/menus/count.svg b/static/menus/count.svg
new file mode 100644
index 0000000..12ee9bb
--- /dev/null
+++ b/static/menus/count.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="1703504873727" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7513" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M395.36 212.64a16 16 0 0 0-22.72 0l-113.12 113.12-56.48-56.48a16 16 0 1 0-22.72 22.56l67.84 68a17.76 17.76 0 0 0 6.56 3.68 18.08 18.08 0 0 0 10.88 0 19.04 19.04 0 0 0 5.28-3.52l124.48-124.48a16 16 0 0 0 0-22.88z" fill="#3c9cff" p-id="7514"></path><path d="M472 208h336a21.28 21.28 0 0 1 24 24 21.28 21.28 0 0 1-24 24h-336a21.28 21.28 0 0 1-24-24 21.28 21.28 0 0 1 24-24zM472 336h336a21.28 21.28 0 0 1 24 24 21.28 21.28 0 0 1-24 24h-336a21.28 21.28 0 0 1-24-24 21.28 21.28 0 0 1 24-24zM472 480h336a21.28 21.28 0 0 1 24 24 21.28 21.28 0 0 1-24 24h-336a21.28 21.28 0 0 1-24-24 21.28 21.28 0 0 1 24-24zM272 464a48 48 0 1 1-48 48 48 48 0 0 1 48-48z m0-32a80 80 0 1 0 80 80 80 80 0 0 0-80-80z m0 272a48 48 0 1 1-48 48 48 48 0 0 1 48-48z m0-32a80 80 0 1 0 80 80 80 80 0 0 0-80-80z" fill="#3c9cff" p-id="7515"></path><path d="M960 128v424a24 24 0 0 1-48 0V128a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16v768a16 16 0 0 0 16 16h392a24 24 0 0 1 0 48H128a64 64 0 0 1-64-64V128a64 64 0 0 1 64-64h768a64 64 0 0 1 64 64z" fill="#3c9cff" p-id="7516"></path><path d="M955.36 932.64l-96-96a160 160 0 1 0-22.56 22.56l96 96a16 16 0 0 0 22.72-22.72zM608 736a128 128 0 1 1 128 128 128 128 0 0 1-128-128z" fill="#3c9cff" p-id="7517"></path></svg>
\ No newline at end of file
diff --git a/static/menus/customer_return.svg b/static/menus/customer_return.svg
new file mode 100644
index 0000000..4c7f32c
--- /dev/null
+++ b/static/menus/customer_return.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="1703488623572" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="22515" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M768 96a160 160 0 1 1-160 160A160 160 0 0 1 768 96z m0-32a192 192 0 1 0 135.84 56.16A192 192 0 0 0 768 64z" fill="#3c9cff" p-id="22516"></path><path d="M298.88 269.12h-0.8 4.32l26.72 7.04 26.4 6.88a18.08 18.08 0 0 1 10.08 6.72c6.08 8.48 54.24 72.48 103.84 136.48 84.16 107.52 106.4 129.6 112 134.08 39.2 9.92 118.08 30.24 159.04 40.96 83.04 22.88 152 82.56 144 125.44-3.36 17.44-24.8 27.84-42.24 33.44a146.72 146.72 0 0 1-45.44 7.84 137.12 137.12 0 0 1-21.44-2.08h-0.96c-101.12-23.84-204.32-51.52-304-78.4-49.76-13.44-101.28-27.36-151.84-40.64a12.96 12.96 0 0 1-4.32-1.76c-24-13.6-55.84-31.04-86.56-48-94.08-52-123.04-69.12-132.96-77.92-24.96-16-35.04-42.24-24.96-61.76a33.12 33.12 0 0 1 30.88-17.44l-3.04-147.04a18.4 18.4 0 0 1 6.72-14.4 18.08 18.08 0 0 1 16-3.52l36.96 9.12a17.92 17.92 0 0 1 11.68 8.96l82.4 156.48 65.28 44.8 74.72 19.04h1.6c-44.32-88.48-93.76-186.08-110.72-218.08a17.76 17.76 0 0 1 1.92-19.36 17.92 17.92 0 0 1 14.72-6.88z m-150.88 86.24h0.8l1.76 83.68a48 48 0 0 1-14.08 35.04 58.4 58.4 0 0 1-10.72 8 11.04 11.04 0 0 1 2.08 1.76c8.64 7.2 64 37.92 123.84 71.2 29.44 16 59.84 32.96 83.68 46.56 49.44 12.96 100.16 26.56 148.16 39.68 99.36 26.72 201.76 54.4 301.92 77.76a77.92 77.92 0 0 0 12.16 0.96 110.88 110.88 0 0 0 30.72-4.8l5.92-2.24a199.84 199.84 0 0 0-106.08-64L569.76 608a51.68 51.68 0 0 1-18.08-8.96c-5.76-4.64-23.36-18.72-119.36-142.24-13.76-17.6-27.2-35.68-39.84-51.68l44 87.52a48 48 0 0 1-42.88 69.44 48 48 0 0 1-11.52-1.44h-0.96c-24.16-6.08-40.48-10.08-75.2-19.2a45.92 45.92 0 0 1-15.04-6.88l-65.28-44.8a48 48 0 0 1-16-17.12zM936 912h-848a24 24 0 0 0 0 48h848a24 24 0 0 0 0-48z" fill="#3c9cff" p-id="22517"></path><path d="M708.8 253.28l104.64-104.48a14.08 14.08 0 0 1 22.56 0 14.08 14.08 0 0 1 0 22.56l-104.48 104.64a14.24 14.24 0 0 1-22.72 0 14.24 14.24 0 0 1 0-22.72zM656 336a32 32 0 0 1 32-32h160a32 32 0 0 1 32 32z" fill="#3c9cff" p-id="22518"></path></svg>
\ No newline at end of file
diff --git a/static/menus/deliver.svg b/static/menus/deliver.svg
new file mode 100644
index 0000000..5148af0
--- /dev/null
+++ b/static/menus/deliver.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="1703488629730" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="22754" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M897.12 650.56l17.6 3.36z" fill="#3c9cff" p-id="22755"></path><path d="M897.12 650.56l17.6 8z" fill="#3c9cff" p-id="22756"></path><path d="M128 680.96L254.4 720a48 48 0 0 0 22.88 1.28l77.92-14.4a48 48 0 0 0 16-5.76c31.04-18.24 45.44-26.88 66.88-39.68a55.52 55.52 0 0 0 9.92-7.04 48 48 0 0 0-18.72-80L336 544c20.64 2.88 42.72 5.76 64.8 8.48 155.2 19.52 177.6 16.96 184.96 16a46.24 46.24 0 0 0 19.2-6.4c35.2-20.96 104.8-62.08 140.8-83.04a196.8 196.8 0 0 1 120.8-29.28c0 1.6-1.6 3.52-2.72 5.6A104.48 104.48 0 0 1 845.12 480a72.8 72.8 0 0 1-9.28 7.84c-87.52 54.4-179.84 107.36-268.48 158.72-43.68 24.96-88.64 50.88-132.8 76.64-26.56 7.36-59.84 16.96-92 26.24-66.24 19.2-126.72 36.32-138.08 37.28h-2.72a45.76 45.76 0 0 0 1.92-13.12 48 48 0 0 0-14.72-34.72z m45.28-166.88a18.08 18.08 0 0 0-5.28 14.72 18.4 18.4 0 0 0 12.48 16c35.2 10.88 138.56 44.64 232.48 75.84-21.28 12.8-35.52 21.28-66.24 39.36l-77.92 14.4-169.12-52.48a17.28 17.28 0 0 0-14.56 1.76l-32 19.68a13.92 13.92 0 0 0-3.36 2.72 17.76 17.76 0 0 0 0 25.6l106.24 101.92a33.28 33.28 0 0 0-9.6 34.08c6.56 20.96 32.8 32 61.28 26.24 13.44 0 45.76-9.28 149.28-39.2 33.6-9.6 68.48-19.68 96-27.04a12.96 12.96 0 0 0 4.32-1.76c45.12-26.4 91.36-52.96 136-78.72C682.24 635.68 774.72 582.4 864 528a145.12 145.12 0 0 0 16-13.76 151.2 151.2 0 0 0 27.04-37.28c8.32-16 16-38.88 6.24-53.44-24.64-36-115.68-29.6-190.88 13.44-36.48 21.28-106.56 62.72-141.44 83.36-7.04 0-38.4 0.96-173.44-16-80-9.92-160-21.44-169.92-23.04a17.44 17.44 0 0 0-12 2.4l-23.52 12.32-24.96 16a13.92 13.92 0 0 0-3.36 2.72zM936 912h-848a24 24 0 0 0 0 48h848a24 24 0 0 0 0-48z" fill="#3c9cff" p-id="22757"></path><path d="M256 96A160 160 0 1 1 96 256 160 160 0 0 1 256 96z m0-32a192 192 0 1 0 192 192A192 192 0 0 0 256 64z" fill="#3c9cff" p-id="22758"></path><path d="M196.64 253.28l104.64-104.64a14.08 14.08 0 0 1 22.56 0 14.24 14.24 0 0 1 0 22.72l-104.48 104.48a14.24 14.24 0 0 1-22.72 0 14.08 14.08 0 0 1 0-22.56zM144 336a32 32 0 0 1 32-32h160a32 32 0 0 1 32 32z" fill="#3c9cff" p-id="22759"></path></svg>
\ No newline at end of file
diff --git a/static/menus/hold_to_ok.svg b/static/menus/hold_to_ok.svg
new file mode 100644
index 0000000..bb22391
--- /dev/null
+++ b/static/menus/hold_to_ok.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="1703503429043" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6043" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M768 848H224a16 16 0 0 1-16-16 16 16 0 0 1 16-16h544a16 16 0 0 1 16 16 16 16 0 0 1-16 16zM496 720V192a16 16 0 0 1 16-16 16 16 0 0 1 16 16v528a16 16 0 0 1-16 16 16 16 0 0 1-16-16z" fill="#3c9cff" p-id="6044"></path><path d="M502.24 756.64l-135.68-135.68a16 16 0 0 1 0-22.72 16 16 0 0 1 22.56 0l124.48 124.48 124.48-124.48a16 16 0 0 1 22.56 0 16 16 0 0 1 0 22.72l-135.68 135.68a16 16 0 0 1-22.72 0z" fill="#3c9cff" p-id="6045"></path><path d="M896 112a16 16 0 0 1 16 16v768a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16z m0-48H128a64 64 0 0 0-64 64v768a64 64 0 0 0 64 64h768a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64z" fill="#3c9cff" p-id="6046"></path></svg>
\ No newline at end of file
diff --git a/static/menus/hold_to_scrap.svg b/static/menus/hold_to_scrap.svg
new file mode 100644
index 0000000..6e46345
--- /dev/null
+++ b/static/menus/hold_to_scrap.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="1703503744459" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6265" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M512 112A400 400 0 1 1 112 512 400 400 0 0 1 512 112z m0-48a448 448 0 1 0 448 448A448 448 0 0 0 512 64z" fill="#3c9cff" p-id="6266"></path><path d="M480 752a32 32 0 1 0 32-32 32 32 0 0 0-32 32zM592 313.92l-3.2 20.96L544 624a32 32 0 0 1-64 0l-44.8-289.12-3.2-20.96A77.12 77.12 0 0 1 512 240a77.12 77.12 0 0 1 80 73.92zM432 320l3.2 22.72A83.84 83.84 0 0 1 432 320z m160 0a83.84 83.84 0 0 1-3.2 22.72z" fill="#3c9cff" p-id="6267"></path></svg>
\ No newline at end of file
diff --git a/static/menus/inspect.svg b/static/menus/inspect.svg
new file mode 100644
index 0000000..a18cd65
--- /dev/null
+++ b/static/menus/inspect.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="1703486241927" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="19846" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M664 240h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48z m0 176h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48z m-160 176h-240a24 24 0 0 0 0 48h240a24 24 0 0 0 0-48z" fill="#3c9cff" p-id="19847"></path><path d="M928 840.16a32 32 0 0 1 32 33.6v32a9.76 9.76 0 0 1-10.08 10.24h-10.4v32.96A11.04 11.04 0 0 1 928 960H608a10.56 10.56 0 0 1-8-3.68 10.72 10.72 0 0 1-2.88-8.32v-32.96h-10.56a11.2 11.2 0 0 1-10.88-10.88v-32a32 32 0 0 1 32-32c43.84 0 116.8-36.32 116.8-75.2v-10.88c0-18.24 0-20.48-26.08-46.88a108.64 108.64 0 0 1-37.76-82.4 107.2 107.2 0 0 1 32-76.48 105.28 105.28 0 0 1 75.36-32v32a73.28 73.28 0 0 0-52.8 21.6 77.44 77.44 0 0 0 4.8 113.12l1.44 1.44c28.32 28.8 35.04 38.72 35.04 69.12v10.88c0 65.28-97.44 106.88-148.48 106.88V880h320v-9.12c-50.72 0-148.32-41.6-148.32-106.56v-14.24c0-27.52 7.2-37.76 35.2-66.08l1.92-1.92a77.28 77.28 0 0 0 4.64-112A73.92 73.92 0 0 0 768 548.32v-32a105.12 105.12 0 0 1 75.52 32 109.44 109.44 0 0 1-6.72 158.88c-26.08 26.24-26.08 28.64-26.08 43.84v14.08c0.48 38.72 73.28 75.04 117.28 75.04z m-20.8 75.84a9.12 9.12 0 0 1 0-2.88H629.12V928H907.2z" fill="#3c9cff" p-id="19848"></path><path d="M800 128v328a24 24 0 0 1-48 0V128a16 16 0 0 0-16-16H192a16 16 0 0 0-16 16v704a16 16 0 0 0 16 16h328a24 24 0 0 1 0 48h-432a24 24 0 0 1 0-48h42.08A60.16 60.16 0 0 1 128 832V128a64 64 0 0 1 64-64h544a64 64 0 0 1 64 64z" fill="#3c9cff" p-id="19849"></path></svg>
\ No newline at end of file
diff --git a/static/menus/inventory_move.svg b/static/menus/inventory_move.svg
new file mode 100644
index 0000000..e310f68
--- /dev/null
+++ b/static/menus/inventory_move.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="1703490945534" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="24847" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M64 464a34.08 34.08 0 0 1 8-21.44 50.24 50.24 0 0 0-8 26.4z" fill="#3c9cff" p-id="24848"></path><path d="M937.44 288L849.28 100.8A64 64 0 0 0 791.36 64H232.64a64 64 0 0 0-57.92 36.8L86.56 288l-16 35.04A64.96 64.96 0 0 0 64 350.4V896a64 64 0 0 0 64 64h768a64 64 0 0 0 64-64V350.4a64 64 0 0 0-6.08-27.2zM848 912H176a64 64 0 0 1-64-64V361.12a64 64 0 0 1 6.08-27.2l11.84-25.28 75.2-160A64 64 0 0 1 263.04 112h497.92a64 64 0 0 1 57.92 36.8l75.04 160 12 25.28a64 64 0 0 1 6.08 27.2V848a64 64 0 0 1-64 64z" fill="#3c9cff" p-id="24849"></path><path d="M339.2 752l64-80h-128z m266.4-265.44l7.2 4.16-23.68 23.68a66.56 66.56 0 0 0-7.52-3.84A160 160 0 0 0 355.2 656a88.64 88.64 0 0 0 0.96 16h-32a133.92 133.92 0 0 1-0.8-16 192 192 0 0 1 282.24-169.44zM684.8 544l-64 80h128zM418.4 809.44l-7.2-4.16 23.68-23.68a66.56 66.56 0 0 0 7.52 3.84A160 160 0 0 0 668.8 640a88.64 88.64 0 0 0-0.96-16h32a133.44 133.44 0 0 1 0 16 192 192 0 0 1-281.44 169.44z" fill="#3c9cff" p-id="24850"></path><path d="M64 336.16h896v48H64v-48z" fill="#3c9cff" p-id="24851"></path></svg>
\ No newline at end of file
diff --git a/static/menus/issue.svg b/static/menus/issue.svg
new file mode 100644
index 0000000..3222d1a
--- /dev/null
+++ b/static/menus/issue.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="1703486984065" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="21086" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M664 240h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48zM664 384h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48zM504 528h-240a24 24 0 0 0 0 48h240a24 24 0 0 0 0-48z" fill="#3c9cff" p-id="21087"></path><path d="M800 128v392a24 24 0 0 1-48 0V128a16 16 0 0 0-16-16H192a16 16 0 0 0-16 16v704a16 16 0 0 0 16 16h328a24 24 0 0 1 0 48h-432a24 24 0 0 1 0-48h42.08A58.56 58.56 0 0 1 128 832V128a64 64 0 0 1 64-64h544a64 64 0 0 1 64 64z" fill="#3c9cff" p-id="21088"></path><path d="M768 605.12a160 160 0 1 1-160 160 160 160 0 0 1 160-160m0-32a192 192 0 1 0 192 192 192 192 0 0 0-192-192z" fill="#3c9cff" p-id="21089"></path><path d="M875.36 788.64a16 16 0 0 0 3.36-5.12 16 16 0 0 0 0-12.32 16 16 0 0 0-3.36-5.12l-57.44-57.44a16 16 0 0 0-22.56 0 16 16 0 0 0 0 22.72l30.08 30.08H672a16 16 0 0 0 0 32h192a16 16 0 0 0 11.2-4.64z" fill="#3c9cff" p-id="21090"></path></svg>
\ No newline at end of file
diff --git a/static/menus/menu_search_lj.svg b/static/menus/menu_search_lj.svg
new file mode 100644
index 0000000..fb40fa7
--- /dev/null
+++ b/static/menus/menu_search_lj.svg
@@ -0,0 +1,6 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M98.7585 66.9285C99.0529 66.6341 99.4023 66.4006 99.7869 66.2413C100.171 66.082 100.584 66 101 66C101.416 66 101.829 66.082 102.213 66.2413C102.598 66.4006 102.947 66.6341 103.241 66.9285L112.162 75.8492H123.981C124.822 75.8492 125.628 76.1832 126.222 76.7776C126.817 77.3721 127.151 78.1783 127.151 79.019V90.8378L136.071 99.7585C136.366 100.053 136.599 100.402 136.759 100.787C136.918 101.171 137 101.584 137 102C137 102.416 136.918 102.829 136.759 103.213C136.599 103.598 136.366 103.947 136.071 104.241L127.151 113.162V124.981C127.151 125.822 126.817 126.628 126.222 127.222C125.628 127.817 124.822 128.151 123.981 128.151H112.162L103.241 137.071C102.947 137.366 102.598 137.599 102.213 137.759C101.829 137.918 101.416 138 101 138C100.584 138 100.171 137.918 99.7869 137.759C99.4023 137.599 99.0529 137.366 98.7585 137.071L89.8378 128.151H78.019C77.1783 128.151 76.3721 127.817 75.7776 127.222C75.1832 126.628 74.8492 125.822 74.8492 124.981V113.162L65.9285 104.241C65.6341 103.947 65.4006 103.598 65.2413 103.213C65.082 102.829 65 102.416 65 102C65 101.584 65.082 101.171 65.2413 100.787C65.4006 100.402 65.6341 100.053 65.9285 99.7585L74.8492 90.8378V79.019C74.8492 78.1783 75.1832 77.3721 75.7776 76.7776C76.3721 76.1832 77.1783 75.8492 78.019 75.8492H89.8378L98.7585 66.9285V66.9285ZM101 73.653L93.3925 81.2605C93.0981 81.5548 92.7487 81.7883 92.3641 81.9476C91.9795 82.1069 91.5673 82.1888 91.151 82.1888H81.1888V92.151C81.1888 92.5673 81.1069 92.9795 80.9476 93.3641C80.7883 93.7487 80.5548 94.0981 80.2605 94.3925L72.653 102L80.2605 109.607C80.5548 109.902 80.7883 110.251 80.9476 110.636C81.1069 111.021 81.1888 111.433 81.1888 111.849V121.811H91.151C91.5673 121.811 91.9795 121.893 92.3641 122.052C92.7487 122.212 93.0981 122.445 93.3925 122.739L101 130.347L108.607 122.739C108.902 122.445 109.251 122.212 109.636 122.052C110.021 121.893 110.433 121.811 110.849 121.811H120.811V111.849C120.811 111.433 120.893 111.021 121.052 110.636C121.212 110.251 121.445 109.902 121.739 109.607L129.347 102L121.739 94.3925C121.445 94.0981 121.212 93.7487 121.052 93.3641C120.893 92.9795 120.811 92.5673 120.811 92.151V82.1888H110.849C110.433 82.1888 110.021 82.1069 109.636 81.9476C109.251 81.7883 108.902 81.5548 108.607 81.2605L101 73.653Z" fill="#035DFF" stroke="#035DFF"/>
+<path d="M101 95.3304C99.2311 95.3304 97.5347 96.0331 96.2839 97.2839C95.0331 98.5347 94.3304 100.231 94.3304 102C94.3304 103.769 95.0331 105.465 96.2839 106.716C97.5347 107.967 99.2311 108.67 101 108.67C102.769 108.67 104.465 107.967 105.716 106.716C106.967 105.465 107.67 103.769 107.67 102C107.67 100.231 106.967 98.5347 105.716 97.2839C104.465 96.0331 102.769 95.3304 101 95.3304V95.3304ZM88 102C88 98.5522 89.3696 95.2456 91.8076 92.8076C94.2456 90.3696 97.5522 89 101 89C104.448 89 107.754 90.3696 110.192 92.8076C112.63 95.2456 114 98.5522 114 102C114 105.448 112.63 108.754 110.192 111.192C107.754 113.63 104.448 115 101 115C97.5522 115 94.2456 113.63 91.8076 111.192C89.3696 108.754 88 105.448 88 102V102Z" fill="#035DFF" stroke="#035DFF"/>
+<path d="M156 101C156 131.337 131.191 156 100.5 156C69.809 156 45 131.337 45 101C45 70.6634 69.809 46 100.5 46C131.191 46 156 70.6634 156 101Z" stroke="#2B2F36" stroke-width="10"/>
+<rect x="121.128" y="150.41" width="9.71" height="26.71" rx="4.855" transform="rotate(-36.6 121.128 150.41)" fill="#2B2F36"/>
+</svg>
diff --git a/static/menus/merge_package.svg b/static/menus/merge_package.svg
new file mode 100644
index 0000000..b2d27ad
--- /dev/null
+++ b/static/menus/merge_package.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="1703490403919" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="24131" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M416 112a16 16 0 0 1 16 16v288a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16z m0-48H128a64 64 0 0 0-64 64v288a64 64 0 0 0 64 64h288a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64z m480 48a16 16 0 0 1 16 16v288a16 16 0 0 1-16 16H608a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16z m0-48H608a64 64 0 0 0-64 64v288a64 64 0 0 0 64 64h288a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64zM416 592a16 16 0 0 1 16 16v288a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16V608a16 16 0 0 1 16-16z m0-48H128a64 64 0 0 0-64 64v288a64 64 0 0 0 64 64h288a64 64 0 0 0 64-64V608a64 64 0 0 0-64-64z" fill="#3c9cff" p-id="24132"></path><path d="M768 560a192 192 0 1 1-192 192 192 192 0 0 1 192-192z m0 32a160 160 0 1 0 160 160 160 160 0 0 0-160-160z" fill="#3c9cff" p-id="24133"></path><path d="M883.84 736h-157.28L768 695.36a16 16 0 1 0-22.72-22.56l-67.84 67.84a16 16 0 0 0 0 22.72L744.48 832A16 16 0 0 0 768 832a16 16 0 0 0 0-22.56L726.56 768h157.28a16 16 0 1 0 0-32z" fill="#3c9cff" p-id="24134"></path></svg>
\ No newline at end of file
diff --git a/static/menus/ok_to_hold.svg b/static/menus/ok_to_hold.svg
new file mode 100644
index 0000000..4f5d182
--- /dev/null
+++ b/static/menus/ok_to_hold.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="1703503377666" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5766" width="128" height="128" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M896 112a16 16 0 0 1 16 16v768a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16z m0-48H128a64 64 0 0 0-64 64v768a64 64 0 0 0 64 64h768a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64z" fill="#3c9cff" p-id="5767"></path><path d="M240 176h544a16 16 0 0 1 16 16 16 16 0 0 1-16 16H240a16 16 0 0 1-16-16 16 16 0 0 1 16-16zM512 304v528a16 16 0 0 1-16 16 16 16 0 0 1-16-16V304a16 16 0 0 1 16-16 16 16 0 0 1 16 16z" fill="#3c9cff" p-id="5768"></path><path d="M505.76 267.36l135.68 135.68a16 16 0 0 1 0 22.72 16 16 0 0 1-22.56 0l-124.48-124.48-124.48 124.48a16 16 0 0 1-22.56 0 16 16 0 0 1 0-22.72l135.68-135.68a16 16 0 0 1 22.72 0z" fill="#3c9cff" p-id="5769"></path></svg>
\ No newline at end of file
diff --git a/static/menus/ok_to_scrap.svg b/static/menus/ok_to_scrap.svg
new file mode 100644
index 0000000..1dee036
--- /dev/null
+++ b/static/menus/ok_to_scrap.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="1703504206573" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6663" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M64 464a34.08 34.08 0 0 1 8-21.44A49.28 49.28 0 0 0 64 468.8z" fill="#3c9cff" p-id="6664"></path><path d="M952.64 512l-109.28-224H760a24 24 0 0 0 0 48h53.44l85.76 176H124.8l85.76-176h53.44a24 24 0 0 0 0-48h-83.36L71.36 512 64 528v368a64 64 0 0 0 64 64h768a64 64 0 0 0 64-64V528zM848 912H176a64 64 0 0 1-64-64V560h800v288a64 64 0 0 1-64 64z" fill="#3c9cff" p-id="6665"></path><path d="M512 96a160 160 0 1 0 113.12 46.88A160 160 0 0 0 512 96z m0-32a192 192 0 1 1-192 192A192 192 0 0 1 512 64z" fill="#3c9cff" p-id="6666"></path><path d="M622.72 230.08a16 16 0 0 0 0-12.16 18.4 18.4 0 0 0-3.36-5.28l-33.92-33.92a16 16 0 0 0-16-4.16 16 16 0 0 0-11.36 11.36 16 16 0 0 0 4.16 16l6.72 6.56H416a16 16 0 0 0 0 32h192a16 16 0 0 0 5.92-1.28 16 16 0 0 0 8.8-9.12z m-221.44 51.84a16 16 0 0 0 0 12.16 18.4 18.4 0 0 0 3.36 5.28l33.92 33.92a16 16 0 0 0 22.72-22.72l-6.72-6.56H608a16 16 0 0 0 0-32H416a16 16 0 0 0-5.92 1.28 16 16 0 0 0-8.8 8.64z" fill="#3c9cff" p-id="6667"></path></svg>
\ No newline at end of file
diff --git a/static/menus/over_package.svg b/static/menus/over_package.svg
new file mode 100644
index 0000000..7a3c203
--- /dev/null
+++ b/static/menus/over_package.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="1703489744577" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="23943" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M416 112a16 16 0 0 1 16 16v288a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16z m0-48H128a64 64 0 0 0-64 64v288a64 64 0 0 0 64 64h288a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64z m0 528a16 16 0 0 1 16 16v288a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16V608a16 16 0 0 1 16-16z m0-48H128a64 64 0 0 0-64 64v288a64 64 0 0 0 64 64h288a64 64 0 0 0 64-64V608a64 64 0 0 0-64-64zM896 112a16 16 0 0 1 16 16v288a16 16 0 0 1-16 16H608a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16z m0-48H608a64 64 0 0 0-64 64v288a64 64 0 0 0 64 64h288a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64z" fill="#3c9cff" p-id="23944"></path><path d="M705.6 561.76h-1.44a18.08 18.08 0 0 1 13.28 5.92 62.88 62.88 0 0 0 44.16 20.64 54.08 54.08 0 0 0 44-19.68 21.28 21.28 0 0 1 14.56-6.88 16 16 0 0 1 6.08 1.28 179.04 179.04 0 0 1 64 38.4 18.56 18.56 0 0 1 5.76 20 61.28 61.28 0 0 0 44.48 78.24h0.96a17.92 17.92 0 0 1 14.08 16 284.96 284.96 0 0 1 4.48 38.56 192.8 192.8 0 0 1-3.68 38.4v0.96a25.92 25.92 0 0 1-12.32 14.08h-1.6a64 64 0 0 0-38.56 28.16 65.76 65.76 0 0 0-5.6 49.76 17.44 17.44 0 0 1-6.56 20.64A235.36 235.36 0 0 1 828.96 944a16 16 0 0 1-6.56 0.96 19.68 19.68 0 0 1-13.12-6.56 62.88 62.88 0 0 0-44.16-20.64 57.76 57.76 0 0 0-44 19.68 22.4 22.4 0 0 1-15.04 6.56H704c-1.76 0-2.72-0.96-3.68-0.96a168 168 0 0 1-64-38.4 18.56 18.56 0 0 1-5.76-20.64 61.28 61.28 0 0 0-44-76.8h-0.96a17.92 17.92 0 0 1-14.08-16 172.8 172.8 0 0 1-3.68-37.44 194.4 194.4 0 0 1 3.68-38.56v-0.96a26.56 26.56 0 0 1 12.16-13.92c0.96-0.96 0.96-0.96 1.92-0.96a64 64 0 0 0 38.4-28.48 65.12 65.12 0 0 0 5.76-49.76 17.92 17.92 0 0 1 6.56-20.64 244.16 244.16 0 0 1 62.72-37.44 23.04 23.04 0 0 1 6.56-1.28z m-3.84 33.76a204.16 204.16 0 0 0-40.96 24.48 96 96 0 0 1-10.4 65.92 94.4 94.4 0 0 1-50.24 40.8 177.12 177.12 0 0 0-1.92 26.08 154.08 154.08 0 0 0 1.76 24.32 94.08 94.08 0 0 1 61.76 107.84 140.8 140.8 0 0 0 40.8 24.32 90.4 90.4 0 0 1 62.4-24.48 92.8 92.8 0 0 1 60.96 24.48 198.24 198.24 0 0 0 39.52-23.84 91.68 91.68 0 0 1 60.48-106.72 145.92 145.92 0 0 0 2.08-24.96c0-8.8-1.12-17.6-2.24-26.4A94.08 94.08 0 0 1 864 619.52a144 144 0 0 0-39.68-23.84 87.52 87.52 0 0 1-62.08 24 91.36 91.36 0 0 1-60.48-24.16z" fill="#3c9cff" p-id="23945"></path><path d="M762.24 718.24A33.6 33.6 0 1 1 728.48 752a33.28 33.28 0 0 1 33.76-33.6z m0-32a64.96 64.96 0 1 0 46.56 19.04 65.76 65.76 0 0 0-46.56-18.88z" fill="#3c9cff" p-id="23946"></path></svg>
\ No newline at end of file
diff --git a/static/menus/product_dismantle.svg b/static/menus/product_dismantle.svg
new file mode 100644
index 0000000..26efa1f
--- /dev/null
+++ b/static/menus/product_dismantle.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="1703488939874" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="23232" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M544 64H352a64 64 0 0 0-64 64v80a64 64 0 0 0 64 64h192a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64z m16 144a16 16 0 0 1-16 16H352a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16h192a16 16 0 0 1 16 16z m40 144h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48z m-224 144h-176a24 24 0 0 0 0 48h176a24 24 0 0 0 0-48z m0 144h-176a24 24 0 0 0 0 48h176a24 24 0 0 0 0-48z" fill="#3c9cff" p-id="23233"></path><path d="M645.12 512a86.56 86.56 0 0 1 61.92 24.32 94.4 94.4 0 0 1 18.4 97.6l112 112a118.4 118.4 0 0 1 35.84-5.92 85.44 85.44 0 0 1 61.76 24.32 96 96 0 0 1 16 105.92 13.12 13.12 0 0 1-9.44 7.84h-2.72a13.12 13.12 0 0 1-9.12-3.84l-48-48a12.96 12.96 0 0 0-18.4 0L827.52 864a12.8 12.8 0 0 0 0 18.24l48 48a12.16 12.16 0 0 1 3.52 11.68 12.8 12.8 0 0 1-7.84 9.44 117.76 117.76 0 0 1-43.84 8.8 86.56 86.56 0 0 1-61.92-24.32 94.4 94.4 0 0 1-18.4-97.6l-112-112a112 112 0 0 1-35.68 5.92 86.56 86.56 0 0 1-61.92-24.32 96 96 0 0 1-16-105.76 12.8 12.8 0 0 1 9.44-7.84h2.56a12.48 12.48 0 0 1 9.12 3.84l48 48a13.76 13.76 0 0 0 18.24 0L644.48 608a12.96 12.96 0 0 0 0-18.4l-48-48a13.12 13.12 0 0 1 4.32-21.28 119.84 119.84 0 0 1 44.32-8.32z m0 32h-1.12l23.04 23.04a44.8 44.8 0 0 1 0 64l-36.48 36.16a45.44 45.44 0 0 1-64 0L544 644.16a56 56 0 0 0 14.88 40.32 54.4 54.4 0 0 0 39.36 14.88 78.4 78.4 0 0 0 25.76-4.32 29.92 29.92 0 0 1 9.92-1.6 32 32 0 0 1 22.56 9.44l112 112a32 32 0 0 1 7.84 32 64 64 0 0 0 10.72 65.12 53.44 53.44 0 0 0 39.2 14.88h0.96l-22.4-21.92a45.6 45.6 0 0 1 0-64l36.64-36.64a44.8 44.8 0 0 1 64 0L928 827.84a52.32 52.32 0 0 0-14.4-40 51.2 51.2 0 0 0-39.68-16 80 80 0 0 0-25.92 4.32 29.92 29.92 0 0 1-9.92 1.6 32 32 0 0 1-22.08-8.48l-112-112a32 32 0 0 1-7.68-32 63.04 63.04 0 0 0-10.56-65.28 53.76 53.76 0 0 0-40.64-16z" fill="#3c9cff" p-id="23234"></path><path d="M832 224v232a24 24 0 0 1-48 0V224a16 16 0 0 0-16-16H560v-48h208a64 64 0 0 1 64 64zM480 936a24 24 0 0 1-24 24H128a64 64 0 0 1-64-64V224a64 64 0 0 1 64-64h208v48H128a16 16 0 0 0-16 16v672a16 16 0 0 0 16 16h328a24 24 0 0 1 24 24z" fill="#3c9cff" p-id="23235"></path></svg>
\ No newline at end of file
diff --git a/static/menus/product_putaway.svg b/static/menus/product_putaway.svg
new file mode 100644
index 0000000..e14ec51
--- /dev/null
+++ b/static/menus/product_putaway.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="1703488932294" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="22994" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M288 184v461.6a54.24 54.24 0 0 0-48 0V184a24 24 0 0 1 48 0zM264 752a52.48 52.48 0 0 0 24-5.6v77.6a24 24 0 0 1-48 0v-77.6a52.48 52.48 0 0 0 24 5.6z" fill="#3c9cff" p-id="22995"></path><path d="M896 112a16 16 0 0 1 16 16v768a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16z m0-48H128a64 64 0 0 0-64 64v768a64 64 0 0 0 64 64h768a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64z" fill="#3c9cff" p-id="22996"></path><path d="M784 184v77.6a54.24 54.24 0 0 0-48 0V184a24 24 0 0 1 48 0zM760 368a52.48 52.48 0 0 0 24-5.6V824a24 24 0 0 1-48 0V362.4a52.48 52.48 0 0 0 24 5.6zM544 184v269.6a54.24 54.24 0 0 0-48 0V184a24 24 0 0 1 48 0zM520 560a52.48 52.48 0 0 0 24-5.6V824a24 24 0 0 1-48 0V554.4a52.48 52.48 0 0 0 24 5.6z" fill="#3c9cff" p-id="22997"></path><path d="M288 611.36a87.36 87.36 0 0 0-48 0 88 88 0 0 0 0 169.28 87.36 87.36 0 0 0 48 0 88 88 0 0 0 0-169.28z m0 135.04a54.24 54.24 0 0 1-48 0 55.68 55.68 0 0 1 0-100.8 54.24 54.24 0 0 1 48 0 55.68 55.68 0 0 1 0 100.8zM784 227.36a87.36 87.36 0 0 0-48 0 88 88 0 0 0 0 169.28 87.36 87.36 0 0 0 48 0 88 88 0 0 0 0-169.28z m0 135.04a54.24 54.24 0 0 1-48 0 55.68 55.68 0 0 1 0-100.8 54.24 54.24 0 0 1 48 0 55.68 55.68 0 0 1 0 100.8zM544 419.36a87.36 87.36 0 0 0-48 0 88 88 0 0 0 0 169.28 87.36 87.36 0 0 0 48 0 88 88 0 0 0 0-169.28z m0 135.04a54.24 54.24 0 0 1-48 0 55.68 55.68 0 0 1 0-100.8 54.24 54.24 0 0 1 48 0 55.68 55.68 0 0 1 0 100.8z" fill="#3c9cff" p-id="22998"></path></svg>
\ No newline at end of file
diff --git a/static/menus/product_receipt.svg b/static/menus/product_receipt.svg
new file mode 100644
index 0000000..bb318a2
--- /dev/null
+++ b/static/menus/product_receipt.svg
@@ -0,0 +1,5 @@
+<?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="1703487001565" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="21325" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128">
+<path d="M664 240h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48zM664 384h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48zM504 528h-240a24 24 0 0 0 0 48h240a24 24 0 0 0 0-48z" fill="#3c9cff" p-id="21326"></path>
+<path d="M800 128v392a24 24 0 0 1-48 0V128a16 16 0 0 0-16-16H192a16 16 0 0 0-16 16v704a16 16 0 0 0 16 16h328a24 24 0 0 1 0 48h-432a24 24 0 0 1 0-48h42.08A58.56 58.56 0 0 1 128 832V128a64 64 0 0 1 64-64h544a64 64 0 0 1 64 64z" fill="#3c9cff" p-id="21327"></path><path d="M768 925.12a160 160 0 1 1 160-160 160 160 0 0 1-160 160m0 32a192 192 0 1 0-192-192 192 192 0 0 0 192 192z" fill="#3c9cff" p-id="21328"></path><path d="M864 736.8H672a16 16 0 0 0-11.2 4.64 16 16 0 0 0-3.36 5.12 16 16 0 0 0 0 12.32 16 16 0 0 0 3.36 5.12l57.44 57.44a16 16 0 0 0 22.56 0 16 16 0 0 0 0-22.72l-30.08-30.08H864a16 16 0 0 0 0-32z" fill="#3c9cff" p-id="21329"></path></svg>
\ No newline at end of file
diff --git a/static/menus/production_receipt.svg b/static/menus/production_receipt.svg
new file mode 100644
index 0000000..bb318a2
--- /dev/null
+++ b/static/menus/production_receipt.svg
@@ -0,0 +1,5 @@
+<?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="1703487001565" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="21325" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128">
+<path d="M664 240h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48zM664 384h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48zM504 528h-240a24 24 0 0 0 0 48h240a24 24 0 0 0 0-48z" fill="#3c9cff" p-id="21326"></path>
+<path d="M800 128v392a24 24 0 0 1-48 0V128a16 16 0 0 0-16-16H192a16 16 0 0 0-16 16v704a16 16 0 0 0 16 16h328a24 24 0 0 1 0 48h-432a24 24 0 0 1 0-48h42.08A58.56 58.56 0 0 1 128 832V128a64 64 0 0 1 64-64h544a64 64 0 0 1 64 64z" fill="#3c9cff" p-id="21327"></path><path d="M768 925.12a160 160 0 1 1 160-160 160 160 0 0 1-160 160m0 32a192 192 0 1 0-192-192 192 192 0 0 0 192 192z" fill="#3c9cff" p-id="21328"></path><path d="M864 736.8H672a16 16 0 0 0-11.2 4.64 16 16 0 0 0-3.36 5.12 16 16 0 0 0 0 12.32 16 16 0 0 0 3.36 5.12l57.44 57.44a16 16 0 0 0 22.56 0 16 16 0 0 0 0-22.72l-30.08-30.08H864a16 16 0 0 0 0-32z" fill="#3c9cff" p-id="21329"></path></svg>
\ No newline at end of file
diff --git a/static/menus/production_return.svg b/static/menus/production_return.svg
new file mode 100644
index 0000000..86ab315
--- /dev/null
+++ b/static/menus/production_return.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="1703488099884" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="22227" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M741.92 741.28v96a32 32 0 0 0 32 32 32 32 0 0 0 22.72-9.92l154.08-160a32 32 0 0 0 0-44.32l-154.08-160a32 32 0 0 0-22.72-9.92 32 32 0 0 0-32 32v112.96h32v-112L928 676.8l-154.08 160v-96" fill="#3c9cff" p-id="22228"></path><path d="M453.76 917.28a317.76 317.76 0 0 0 3.04 42.72 336 336 0 0 1 285.12-186.24v-32a366.08 366.08 0 0 0-248.8 112 290.72 290.72 0 0 1 248.8-224v-30.4a320 320 0 0 0-288 317.92z" fill="#3c9cff" p-id="22229"></path><path d="M824 256h-624a24 24 0 0 0 0 48h624a24 24 0 0 0 0-48z m-336 176h-288a24 24 0 0 0 0 48h288a24 24 0 0 0 0-48z m0 176h-288a24 24 0 0 0 0 48h288a24 24 0 0 0 0-48z" fill="#3c9cff" p-id="22230"></path><path d="M960 128v296a24 24 0 0 1-48 0V128a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16v768a16 16 0 0 0 16 16h264a24 24 0 0 1 0 48H128a64 64 0 0 1-64-64V128a64 64 0 0 1 64-64h768a64 64 0 0 1 64 64z" fill="#3c9cff" p-id="22231"></path></svg>
\ No newline at end of file
diff --git a/static/menus/purchase_receipt.svg b/static/menus/purchase_receipt.svg
new file mode 100644
index 0000000..b2d972f
--- /dev/null
+++ b/static/menus/purchase_receipt.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="1703485840142" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="19180" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M664 240h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48z m0 176h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48z m-160 176h-240a24 24 0 0 0 0 48h240a24 24 0 0 0 0-48z" fill="#3c9cff" p-id="19181"></path><path d="M768 576a192 192 0 1 1-192 192 192 192 0 0 1 192-192z m0 32a160 160 0 1 0 160 160 160 160 0 0 0-160-160z" fill="#3c9cff" p-id="19182"></path><path d="M883.84 752h-157.28L768 711.36a16 16 0 1 0-22.72-22.56l-67.84 67.84a16 16 0 0 0 0 22.72L744.48 848A16 16 0 0 0 768 848a16 16 0 0 0 0-22.56L726.56 784h157.28a16 16 0 1 0 0-32z" fill="#3c9cff" p-id="19183"></path><path d="M800 128v392a24 24 0 0 1-48 0V128a16 16 0 0 0-16-16H192a16 16 0 0 0-16 16v704a16 16 0 0 0 16 16h328a24 24 0 0 1 0 48h-432a24 24 0 0 1 0-48h42.08A60.16 60.16 0 0 1 128 832V128a64 64 0 0 1 64-64h544a64 64 0 0 1 64 64z" fill="#3c9cff" p-id="19184"></path></svg>
\ No newline at end of file
diff --git a/static/menus/purchase_return.svg b/static/menus/purchase_return.svg
new file mode 100644
index 0000000..1dcb2cf
--- /dev/null
+++ b/static/menus/purchase_return.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="1703485846235" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="19369" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M768 608a160 160 0 1 0 160 160 160 160 0 0 0-160-160z m0-32a192 192 0 1 1-192 192 192 192 0 0 1 192-192z" fill="#3c9cff" p-id="19370"></path><path d="M652.16 752h157.28l-40.64-40.64a16 16 0 1 1 22.72-22.56l67.84 67.84a16 16 0 0 1 0 22.72L791.52 848a16 16 0 0 1-22.72-22.56L809.44 784h-157.28a16 16 0 1 1 0-32z" fill="#3c9cff" p-id="19371"></path><path d="M664 240h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48zM664 416h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48zM504 592h-240a24 24 0 0 0 0 48h240a24 24 0 0 0 0-48z" fill="#3c9cff" p-id="19372"></path><path d="M800 128v392a24 24 0 0 1-48 0V128a16 16 0 0 0-16-16H192a16 16 0 0 0-16 16v704a16 16 0 0 0 16 16h328a24 24 0 0 1 0 48h-432a24 24 0 0 1 0-48h42.08A60.16 60.16 0 0 1 128 832V128a64 64 0 0 1 64-64h544a64 64 0 0 1 64 64z" fill="#3c9cff" p-id="19373"></path></svg>
\ No newline at end of file
diff --git a/static/menus/putaway.svg b/static/menus/putaway.svg
new file mode 100644
index 0000000..aeafb4f
--- /dev/null
+++ b/static/menus/putaway.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="1703486792598" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="20687" width="128" height="128" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M832 480h-96v32h96a32 32 0 0 1 32 32v288a32 32 0 0 1-32 32H192a32 32 0 0 1-32-32V544a32 32 0 0 1 32-32h96v-32h-96a64 64 0 0 0-64 64v288a60.16 60.16 0 0 0 2.08 16A64 64 0 0 0 192 896h640a64 64 0 0 0 61.92-48 60.16 60.16 0 0 0 2.08-16V544a64 64 0 0 0-64-64z" fill="#3c9cff" p-id="20688"></path><path d="M88 848h848a24 24 0 0 1 0 48h-848a24 24 0 0 1 0-48z" fill="#3c9cff" p-id="20689"></path><path d="M720 128H304a67.04 67.04 0 0 0-64 69.76v628.48a72.16 72.16 0 0 0 2.08 17.44 73.92 73.92 0 0 0 6.56 17.44A63.04 63.04 0 0 0 304 896h416a63.04 63.04 0 0 0 55.36-34.88 73.92 73.92 0 0 0 6.56-17.44 72.16 72.16 0 0 0 2.08-17.44V197.76A67.04 67.04 0 0 0 720 128z m16 698.24a16.8 16.8 0 0 1-16 17.44H304a16.8 16.8 0 0 1-16-17.44V197.76a16.8 16.8 0 0 1 16-17.44h416a16.8 16.8 0 0 1 16 17.44z" fill="#3c9cff" p-id="20690"></path><path d="M672 368H352v48h320z m0 176H352v48h320z m0 144H352v48h320z" fill="#3c9cff" p-id="20691"></path></svg>
\ No newline at end of file
diff --git a/static/menus/query_container.svg b/static/menus/query_container.svg
new file mode 100644
index 0000000..23278b2
--- /dev/null
+++ b/static/menus/query_container.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="1703484981484" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18183" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M696 240h-496a24 24 0 0 0 0 48h496a24 24 0 0 0 0-48z m-144 144h-352a24 24 0 0 0 0 48h352a24 24 0 0 0 0-48z m0 144h-352a24 24 0 0 0 0 48h352a24 24 0 0 0 0-48z" fill="#3c9cff" p-id="18184"></path><path d="M832 128v392a24 24 0 0 1-48 0V128a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16v768a16 16 0 0 0 16 16h392a24 24 0 0 1 0 48H128a64 64 0 0 1-64-64V128a64 64 0 0 1 64-64h640a64 64 0 0 1 64 64z" fill="#3c9cff" p-id="18185"></path><path d="M955.36 932.64l-96-96a160 160 0 1 0-22.56 22.56l96 96a16 16 0 0 0 22.72-22.72zM608 736a128 128 0 1 1 128 128 128 128 0 0 1-128-128z" fill="#3c9cff" p-id="18186"></path></svg>
\ No newline at end of file
diff --git a/static/menus/query_inspect.svg b/static/menus/query_inspect.svg
new file mode 100644
index 0000000..cecb013
--- /dev/null
+++ b/static/menus/query_inspect.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="1703485187505" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18700" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M952.96 919.04L865.92 832l-1.92-1.12A161.76 161.76 0 1 0 830.88 864l1.12 1.28 87.04 87.04a24 24 0 0 0 33.92-33.92zM736 864a128 128 0 1 1 102.4-51.36l-10.88 14.88-15.04 11.04A125.92 125.92 0 0 1 736 864z" fill="#3c9cff" p-id="18701"></path><path d="M544 936a24 24 0 0 1-24 24H128a64 64 0 0 1-64-64V256a64 64 0 0 1 64-64h64v48H128a16 16 0 0 0-16 16v640a16 16 0 0 0 16 16h392a24 24 0 0 1 24 24z" fill="#3c9cff" p-id="18702"></path><path d="M192 192V128a64 64 0 0 1 64-64h640a64 64 0 0 1 64 64v392a24 24 0 0 1-48 0V128a16 16 0 0 0-16-16H256a16 16 0 0 0-16 16v112h-48z" fill="#3c9cff" p-id="18703"></path><path d="M232 304h320a24 24 0 0 1 24 24 24 24 0 0 1-24 24h-320a24 24 0 0 1-24-24 24 24 0 0 1 24-24z" fill="#3c9cff" p-id="18704"></path><path d="M664 304a24 24 0 1 0 24 24 24 24 0 0 0-24-24zM64 416h768v48H64z" fill="#3c9cff" p-id="18705"></path><path d="M832 256v264a24 24 0 0 1-48 0V256a16 16 0 0 0-16-16H240v-48h528a64 64 0 0 1 64 64z" fill="#3c9cff" p-id="18706"></path></svg>
\ No newline at end of file
diff --git a/static/menus/query_issue_request.svg b/static/menus/query_issue_request.svg
new file mode 100644
index 0000000..112a70d
--- /dev/null
+++ b/static/menus/query_issue_request.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="1703485180148" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18512" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M544 112a16 16 0 0 1 16 16v80a16 16 0 0 1-16 16H352a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16z m0-48H352a64 64 0 0 0-64 64v80a64 64 0 0 0 64 64h192a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64zM248 384h-48a24 24 0 0 0 0 48h48a24 24 0 0 0 0-48z m448 0h-336a24 24 0 0 0 0 48h336a24 24 0 0 0 0-48z m-448 176h-48a24 24 0 0 0 0 48h48a24 24 0 0 0 0-48z m304 0h-192a24 24 0 0 0 0 48h192a24 24 0 0 0 0-48z m-304 176h-48a24 24 0 0 0 0 48h48a24 24 0 0 0 0-48z m240 0h-128a24 24 0 0 0 0 48h128a24 24 0 0 0 0-48zM832 208v312a24 24 0 0 1-48 0V208a16 16 0 0 0-16-16h-40a24 24 0 0 1 0-48H768a64 64 0 0 1 64 64z" fill="#3c9cff" p-id="18513"></path><path d="M955.36 932.64l-96-96a160 160 0 1 0-22.56 22.56l96 96a16 16 0 0 0 22.72-22.72zM608 736a128 128 0 1 1 128 128 128 128 0 0 1-128-128z" fill="#3c9cff" p-id="18514"></path><path d="M544 936a24 24 0 0 1-24 24H128a64 64 0 0 1-64-64V208a64 64 0 0 1 64-64h56a24 24 0 0 1 0 48H128a16 16 0 0 0-16 16v688a16 16 0 0 0 16 16h392a24 24 0 0 1 24 24z" fill="#3c9cff" p-id="18515"></path></svg>
\ No newline at end of file
diff --git a/static/menus/query_item.svg b/static/menus/query_item.svg
new file mode 100644
index 0000000..bdbb713
--- /dev/null
+++ b/static/menus/query_item.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="1703484615572" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="17995" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M424 352h-224a24 24 0 0 0 0 48h224a24 24 0 0 0 0-48z m272 208h-496a24 24 0 0 0 0 48h496a24 24 0 0 0 0-48z m0 208h-496a24 24 0 0 0 0 48h496a24 24 0 0 0 0-48z" fill="#3c9cff" p-id="17996"></path><path d="M832 504V896a64 64 0 0 1-64 64H128a64 64 0 0 1-64-64V128a64 64 0 0 1 64-64h392a24 24 0 0 1 0 48H128a16 16 0 0 0-16 16v768a16 16 0 0 0 16 16h640a16 16 0 0 0 16-16V504a24 24 0 0 1 48 0z" fill="#3c9cff" p-id="17997"></path><path d="M955.36 420.64l-96-96a160 160 0 1 0-22.56 22.56l96 96a16 16 0 1 0 22.72-22.72zM608 224a128 128 0 1 1 128 128 128 128 0 0 1-128-128z" fill="#3c9cff" p-id="17998"></path></svg>
\ No newline at end of file
diff --git a/static/menus/query_location.svg b/static/menus/query_location.svg
new file mode 100644
index 0000000..3b1587a
--- /dev/null
+++ b/static/menus/query_location.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="1703484220493" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16753" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M896 208a16 16 0 0 1 16 16v672a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16V224a16 16 0 0 1 16-16h768m0-48H128a64 64 0 0 0-64 64v672a64 64 0 0 0 64 64h768a64 64 0 0 0 64-64V224a64 64 0 0 0-64-64z" fill="#3C9CFF" p-id="16754"></path><path d="M328 64A24 24 0 0 0 304 88v176a24 24 0 0 0 48 0v-176A24 24 0 0 0 328 64zM696 64A24 24 0 0 0 672 88v176a24 24 0 0 0 48 0v-176A24 24 0 0 0 696 64zM424 416h-240a24 24 0 0 0 0 48h240a24 24 0 0 0 0-48zM424 560h-240a24 24 0 0 0 0 48h240a24 24 0 0 0 0-48zM552 704h-368a24 24 0 0 0 0 48h368a24 24 0 0 0 0-48z" fill="#3C9CFF" p-id="16755"></path><path d="M875.36 724.64l-96-96a160 160 0 1 0-22.56 22.56l96 96a16 16 0 0 0 22.72-22.72zM528 528a128 128 0 1 1 128 128 128 128 0 0 1-128-128z" fill="#3C9CFF" p-id="16756"></path></svg>
\ No newline at end of file
diff --git a/static/menus/query_supplier_deliver.svg b/static/menus/query_supplier_deliver.svg
new file mode 100644
index 0000000..b100017
--- /dev/null
+++ b/static/menus/query_supplier_deliver.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="1703485215987" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18941" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M528 64H272a32 32 0 0 0-32 32v144a32 32 0 0 0 32 32h256a32 32 0 0 0 32-32V96a32 32 0 0 0-32-32z m-16 160H288V112h224z" fill="#3c9cff" p-id="18942"></path><path d="M736 224v296a24 24 0 0 1-48 0V224a16 16 0 0 0-16-16H512v-48h160a64 64 0 0 1 64 64zM544 936a24 24 0 0 1-24 24H128a64 64 0 0 1-64-64V224a64 64 0 0 1 64-64h160v48H128a16 16 0 0 0-16 16v672a16 16 0 0 0 16 16h392a24 24 0 0 1 24 24z" fill="#3c9cff" p-id="18943"></path><path d="M955.36 932.64l-96-96a160 160 0 1 0-22.56 22.56l96 96a16 16 0 0 0 22.72-22.72zM608 736a128 128 0 1 1 128 128 128 128 0 0 1-128-128z" fill="#3c9cff" p-id="18944"></path><path d="M200 352h144a21.28 21.28 0 0 1 24 24 21.28 21.28 0 0 1-24 24h-144a21.28 21.28 0 0 1-24-24 21.28 21.28 0 0 1 24-24zM456 352h144a21.28 21.28 0 0 1 24 24 21.28 21.28 0 0 1-24 24h-144a21.28 21.28 0 0 1-24-24 21.28 21.28 0 0 1 24-24zM200 496h144a21.28 21.28 0 0 1 24 24 21.28 21.28 0 0 1-24 24h-144a21.28 21.28 0 0 1-24-24 21.28 21.28 0 0 1 24-24zM456 496h144a21.28 21.28 0 0 1 24 24 21.28 21.28 0 0 1-24 24h-144a21.28 21.28 0 0 1-24-24 21.28 21.28 0 0 1 24-24zM200 640h144a24 24 0 0 1 0 48h-144a24 24 0 0 1 0-48zM200 784h144a24 24 0 0 1 0 48h-144a24 24 0 0 1 0-48z" fill="#3c9cff" p-id="18945"></path></svg>
\ No newline at end of file
diff --git a/static/menus/repleinsh.svg b/static/menus/repleinsh.svg
new file mode 100644
index 0000000..afaf5f9
--- /dev/null
+++ b/static/menus/repleinsh.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="1703487195087" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="21565" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M544 112a16 16 0 0 1 16 16v80a16 16 0 0 1-16 16H352a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16z m0-48H352a64 64 0 0 0-64 64v80a64 64 0 0 0 64 64h192a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64zM248 384h-48a24 24 0 0 0 0 48h48a24 24 0 0 0 0-48z m0 176h-48a24 24 0 0 0 0 48h48a24 24 0 0 0 0-48z m0 176h-48a24 24 0 0 0 0 48h48a24 24 0 0 0 0-48z m448-352h-336a24 24 0 0 0 0 48h336a24 24 0 0 0 0-48z m-144 176h-192a24 24 0 0 0 0 48h192a24 24 0 0 0 0-48z m-64 176h-128a24 24 0 0 0 0 48h128a24 24 0 0 0 0-48zM832 208v312a24 24 0 0 1-48 0V208a16 16 0 0 0-16-16h-40a24 24 0 0 1 0-48H768a64 64 0 0 1 64 64z" fill="#3c9cff" p-id="21566"></path><path d="M544 936a24 24 0 0 1-24 24H128a64 64 0 0 1-64-64V208a64 64 0 0 1 64-64h56a24 24 0 0 1 0 48H128a16 16 0 0 0-16 16v688a16 16 0 0 0 16 16h392a24 24 0 0 1 24 24z" fill="#3c9cff" p-id="21567"></path><path d="M768 608a160 160 0 1 0 160 160 160 160 0 0 0-160-160z m0-32a192 192 0 1 1-192 192 192 192 0 0 1 192-192z" fill="#3c9cff" p-id="21568"></path><path d="M892.48 620.96l22.56 22.56-271.52 271.52-22.56-22.56 271.52-271.52z" fill="#3c9cff" p-id="21569"></path><path d="M620.96 643.52l22.56-22.56 271.52 271.52-22.56 22.56-271.52-271.52z" fill="#3c9cff" p-id="21570"></path></svg>
\ No newline at end of file
diff --git a/static/menus/return_to_hold.svg b/static/menus/return_to_hold.svg
new file mode 100644
index 0000000..9faa33d
--- /dev/null
+++ b/static/menus/return_to_hold.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="1703505952280" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7911" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M555.04 177.76l360.64 307.36a35.52 35.52 0 0 1 0 53.76L555.04 846.24v-149.28a32 32 0 0 0-32-32H320V375.84h203.04a32 32 0 0 0 32-32zM540 128a16.96 16.96 0 0 0-16.96 16.8v199.04H288v353.12h235.04V880a16.96 16.96 0 0 0 16.96 16 16 16 0 0 0 10.72-4l385.6-328.8a67.2 67.2 0 0 0 0-102.4L550.72 132a16 16 0 0 0-10.72-4z" fill="#3c9cff" p-id="7912"></path><path d="M80 360.64c10.72 0 16 8 16 24V640c0 16-5.28 24-16 24S64 656 64 640V384c0-16 5.28-23.36 16-23.36zM192 360.64c10.72 0 16 8 16 24V640c0 16-5.28 24-16 24s-16-8-16-24V384c0-16 5.28-23.36 16-23.36z" fill="#3c9cff" p-id="7913"></path></svg>
\ No newline at end of file
diff --git a/static/menus/return_to_store.svg b/static/menus/return_to_store.svg
new file mode 100644
index 0000000..71349db
--- /dev/null
+++ b/static/menus/return_to_store.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="1703487479682" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="21804" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M832 160H637.92a60.16 60.16 0 0 1 2.08 16 64 64 0 0 1-8.64 32H832a16 16 0 0 1 16 16v672a16 16 0 0 1-16 16H192a16 16 0 0 1-16-16V224a16 16 0 0 1 16-16h152.64a64 64 0 0 1-8.64-32 60.16 60.16 0 0 1 2.08-16H192a64 64 0 0 0-64 64v672a64 64 0 0 0 64 64h640a64 64 0 0 0 64-64V224a64 64 0 0 0-64-64z" fill="#3c9cff" p-id="21805"></path><path d="M686.72 160A112 112 0 0 0 576 64H400a112 112 0 0 0-110.72 96 88.8 88.8 0 0 0-1.28 16 113.76 113.76 0 0 0 4.64 32A112 112 0 0 0 400 288h176a112 112 0 0 0 107.36-80 113.76 113.76 0 0 0 4.64-32 88.8 88.8 0 0 0-1.28-16zM576 240H400a64 64 0 0 1-64-64 60.16 60.16 0 0 1 2.08-16A64 64 0 0 1 400 112h176a64 64 0 0 1 61.92 48 60.16 60.16 0 0 1 2.08 16 64 64 0 0 1-64 64z" fill="#3c9cff" p-id="21806"></path><path d="M413.6 461.28h234.24a112 112 0 0 1 0 224h-240a16 16 0 1 1 0-32h240a80 80 0 0 0 0-160H413.6V512a8 8 0 0 1-3.84 7.04 8.32 8.32 0 0 1-8.16 0l-61.76-35.68a8.32 8.32 0 0 1-3.84-7.04 8 8 0 0 1 3.84-6.88l61.76-35.68a8 8 0 0 1 8 0 7.52 7.52 0 0 1 4 6.88z" fill="#3c9cff" p-id="21807"></path></svg>
\ No newline at end of file
diff --git a/static/menus/scrap.svg b/static/menus/scrap.svg
new file mode 100644
index 0000000..d17ef49
--- /dev/null
+++ b/static/menus/scrap.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="1703504783302" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7337" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M96 192h224a28.32 28.32 0 0 1 32 32 28.32 28.32 0 0 1-32 32H96a28.32 28.32 0 0 1-32-32 28.32 28.32 0 0 1 32-32z" fill="#3c9cff" p-id="7338"></path><path d="M96 512h224a28.32 28.32 0 0 1 32 32 28.32 28.32 0 0 1-32 32H96a28.32 28.32 0 0 1-32-32 28.32 28.32 0 0 1 32-32zM96 832h832a32 32 0 0 1 0 64H96a32 32 0 0 1 0-64z" fill="#3c9cff" p-id="7339"></path><path d="M741.92 385.12v96a32 32 0 0 0 32 32 32 32 0 0 0 22.72-9.92l154.08-160a32 32 0 0 0 0-44.32l-154.08-160a31.04 31.04 0 0 0-22.4-10.88 32 32 0 0 0-32 32v112.96h32V160L928 320l-154.08 160v-96M453.76 561.12a317.6 317.6 0 0 0 2.88 42.72A336 336 0 0 1 741.92 417.6v-32a366.08 366.08 0 0 0-248.8 112 290.72 290.72 0 0 1 248.8-224v-30.4a320 320 0 0 0-288 317.92z" fill="#3c9cff" p-id="7340"></path></svg>
\ No newline at end of file
diff --git a/static/menus/scrap_to_hold.svg b/static/menus/scrap_to_hold.svg
new file mode 100644
index 0000000..92777a5
--- /dev/null
+++ b/static/menus/scrap_to_hold.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="1703503805734" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6487" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M512 64a448 448 0 1 0 316.8 131.2A448 448 0 0 0 512 64z m0 848a400 400 0 1 1 282.88-117.12A400 400 0 0 1 512 912z" fill="#3c9cff" p-id="6488"></path><path d="M704 376h-64v-48a64 64 0 0 0-64-64h-128a64 64 0 0 0-64 64v48h-64a64 64 0 0 0-64 64v256a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-256a64 64 0 0 0-64-64z m-288-48a32 32 0 0 1 32-32h128a32 32 0 0 1 32 32v48H416z m320 368a32 32 0 0 1-32 32H320a32 32 0 0 1-32-32v-256a32 32 0 0 1 32-32h384a32 32 0 0 1 32 32z" fill="#3c9cff" p-id="6489"></path><path d="M562.72 480a51.84 51.84 0 0 1 17.28 41.44 57.92 57.92 0 0 1-9.92 35.36c-2.56 2.88-11.04 10.72-24.8 22.88a42.08 42.08 0 0 0-11.52 14.4 39.68 39.68 0 0 0-4.32 18.72v4H496v-4a61.6 61.6 0 0 1 5.76-28.32 155.84 155.84 0 0 1 33.76-36.48l3.36-4.16a30.08 30.08 0 0 0 6.24-33.76 29.76 29.76 0 0 0-29.6-17.12 29.76 29.76 0 0 0-27.04 11.68 48 48 0 0 0-7.2 28.32H448a65.6 65.6 0 0 1 18.72-50.56A68.16 68.16 0 0 1 517.28 464a64.8 64.8 0 0 1 45.44 16zM528 636.96a22.08 22.08 0 0 1 6.72 16 22.72 22.72 0 0 1-6.72 16 23.68 23.68 0 0 1-32 0 20.8 20.8 0 0 1-6.24-16 20.48 20.48 0 0 1 6.24-16 24 24 0 0 1 32 0z" fill="#3c9cff" p-id="6490"></path></svg>
\ No newline at end of file
diff --git a/static/menus/split_package.svg b/static/menus/split_package.svg
new file mode 100644
index 0000000..5a4b0a3
--- /dev/null
+++ b/static/menus/split_package.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="1703489539378" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="23657" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M416 112a16 16 0 0 1 16 16v288a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16z m0-48H128a64 64 0 0 0-64 64v288a64 64 0 0 0 64 64h288a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64z m480 48a16 16 0 0 1 16 16v288a16 16 0 0 1-16 16H608a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16z m0-48H608a64 64 0 0 0-64 64v288a64 64 0 0 0 64 64h288a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64zM416 592a16 16 0 0 1 16 16v288a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16V608a16 16 0 0 1 16-16z m0-48H128a64 64 0 0 0-64 64v288a64 64 0 0 0 64 64h288a64 64 0 0 0 64-64V608a64 64 0 0 0-64-64z" fill="#3c9cff" p-id="23658"></path><path d="M768 560a192 192 0 1 1-192 192 192 192 0 0 1 192-192z m0 32a160 160 0 1 0 160 160 160 160 0 0 0-160-160z" fill="#3c9cff" p-id="23659"></path><path d="M652.16 736h157.28l-40.64-40.64a16 16 0 1 1 22.72-22.56l67.84 67.84a16 16 0 0 1 0 22.72L791.52 832a16 16 0 0 1-22.72-22.56L809.44 768h-157.28a16 16 0 1 1 0-32z" fill="#3c9cff" p-id="23660"></path></svg>
\ No newline at end of file
diff --git a/static/menus/transfer_deliver.svg b/static/menus/transfer_deliver.svg
new file mode 100644
index 0000000..acd90f7
--- /dev/null
+++ b/static/menus/transfer_deliver.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="1703504683328" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6936" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M336 432v64h-64v-64z m0-32h-64a32 32 0 0 0-32 32v64a32 32 0 0 0 32 32h64a32 32 0 0 0 32-32v-64a32 32 0 0 0-32-32z m160 32v64h-64v-64z m0-32h-64a32 32 0 0 0-32 32v64a32 32 0 0 0 32 32h64a32 32 0 0 0 32-32v-64a32 32 0 0 0-32-32zM336 608v64h-64v-64z m0-32h-64a32 32 0 0 0-32 32v64a32 32 0 0 0 32 32h64a32 32 0 0 0 32-32v-64a32 32 0 0 0-32-32z m160 32v64h-64v-64z m0-32h-64a32 32 0 0 0-32 32v64a32 32 0 0 0 32 32h64a32 32 0 0 0 32-32v-64a32 32 0 0 0-32-32zM336 784v64h-64v-64z m0-32h-64a32 32 0 0 0-32 32v64a32 32 0 0 0 32 32h64a32 32 0 0 0 32-32v-64a32 32 0 0 0-32-32z m160 32v64h-64v-64z m0-32h-64a32 32 0 0 0-32 32v64a32 32 0 0 0 32 32h64a32 32 0 0 0 32-32v-64a32 32 0 0 0-32-32z" fill="#3c9cff" p-id="6937"></path><path d="M768 576a192 192 0 1 1-192 192 192 192 0 0 1 192-192z m0 32a160 160 0 1 0 160 160 160 160 0 0 0-160-160z" fill="#3c9cff" p-id="6938"></path><path d="M652.16 752h157.28l-40.64-40.64a16 16 0 1 1 22.72-22.56l67.84 67.84a16 16 0 0 1 0 22.72L791.52 848a16 16 0 0 1-22.72-22.56L809.44 784h-157.28a16 16 0 1 1 0-32z" fill="#3c9cff" p-id="6939"></path><path d="M955.36 408.64a23.84 23.84 0 0 1-33.44 5.28L864 371.68v148.32a24.16 24.16 0 0 1-48 0V336.8L512 115.84 206.56 337.92V912h312.64a24 24 0 0 1 0 48h-336A24 24 0 0 1 160 936V372.96l-57.76 40.96A23.68 23.68 0 0 1 78.4 416a24 24 0 0 1-4.48-41.44L496 68.64a33.12 33.12 0 0 1 33.12 0l420.96 306.4a24 24 0 0 1 9.6 16 23.68 23.68 0 0 1-4.32 17.6z" fill="#3c9cff" p-id="6940"></path></svg>
\ No newline at end of file
diff --git a/static/menus/transfer_receipt.svg b/static/menus/transfer_receipt.svg
new file mode 100644
index 0000000..007cc6d
--- /dev/null
+++ b/static/menus/transfer_receipt.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="1703504688232" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7113" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M336 432v64h-64v-64z m0-32h-64a32 32 0 0 0-32 32v64a32 32 0 0 0 32 32h64a32 32 0 0 0 32-32v-64a32 32 0 0 0-32-32z m160 32v64h-64v-64z m0-32h-64a32 32 0 0 0-32 32v64a32 32 0 0 0 32 32h64a32 32 0 0 0 32-32v-64a32 32 0 0 0-32-32zM336 608v64h-64v-64z m0-32h-64a32 32 0 0 0-32 32v64a32 32 0 0 0 32 32h64a32 32 0 0 0 32-32v-64a32 32 0 0 0-32-32z m160 32v64h-64v-64z m0-32h-64a32 32 0 0 0-32 32v64a32 32 0 0 0 32 32h64a32 32 0 0 0 32-32v-64a32 32 0 0 0-32-32zM336 784v64h-64v-64z m0-32h-64a32 32 0 0 0-32 32v64a32 32 0 0 0 32 32h64a32 32 0 0 0 32-32v-64a32 32 0 0 0-32-32z m160 32v64h-64v-64z m0-32h-64a32 32 0 0 0-32 32v64a32 32 0 0 0 32 32h64a32 32 0 0 0 32-32v-64a32 32 0 0 0-32-32z" fill="#3c9cff" p-id="7114"></path><path d="M768 576a192 192 0 1 1-192 192 192 192 0 0 1 192-192z m0 32a160 160 0 1 0 160 160 160 160 0 0 0-160-160z" fill="#3c9cff" p-id="7115"></path><path d="M883.84 752h-157.28L768 711.36a16 16 0 1 0-22.72-22.56l-67.84 67.84a16 16 0 0 0 0 22.72L744.48 848A16 16 0 0 0 768 848a16 16 0 0 0 0-22.56L726.56 784h157.28a16 16 0 1 0 0-32z" fill="#3c9cff" p-id="7116"></path><path d="M955.36 408.64a23.84 23.84 0 0 1-33.44 5.28L864 371.68v148.32a24.16 24.16 0 0 1-48 0V336.8L512 115.84 206.56 337.92V912h312.64a24 24 0 0 1 0 48h-336A24 24 0 0 1 160 936V372.96l-57.76 40.96A23.68 23.68 0 0 1 78.4 416a24 24 0 0 1-4.48-41.44L496 68.64a33.12 33.12 0 0 1 33.12 0l420.96 306.4a24 24 0 0 1 9.6 16 23.68 23.68 0 0 1-4.32 17.6z" fill="#3c9cff" p-id="7117"></path></svg>
\ No newline at end of file
diff --git a/static/menus/unbind_pallet.svg b/static/menus/unbind_pallet.svg
new file mode 100644
index 0000000..2849d84
--- /dev/null
+++ b/static/menus/unbind_pallet.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="1703490727477" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="24370" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M304 64H128a64 64 0 0 0-64 64v768a64 64 0 0 0 64 64h176a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64z m16 832a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16h176a16 16 0 0 1 16 16z" fill="#3c9cff" p-id="24371"></path><path d="M264 432a24 24 0 0 0-24 24v112a24 24 0 0 0 48 0v-112a24 24 0 0 0-24-24z m272 0a24 24 0 0 0-24 24v112a24 24 0 0 0 48 0v-112a24 24 0 0 0-24-24zM672 192h-80a32 32 0 0 0-32 32v80a32 32 0 0 0 32 32h80a32 32 0 0 0 32-32v-80a32 32 0 0 0-32-32z m0 112h-80v-80h80z" fill="#3c9cff" p-id="24372"></path><path d="M832 128v392a24 24 0 0 1-48 0V128a16 16 0 0 0-16-16H496a16 16 0 0 0-16 16v768a16 16 0 0 0 16 16h24a24 24 0 0 1 0 48H496a64 64 0 0 1-64-64V128a64 64 0 0 1 64-64h272a64 64 0 0 1 64 64z" fill="#3c9cff" p-id="24373"></path><path d="M768 576a192 192 0 1 1-192 192 192 192 0 0 1 192-192z m0 32a160 160 0 1 0 160 160 160 160 0 0 0-160-160z" fill="#3c9cff" p-id="24374"></path><path d="M652.16 752h157.28l-40.64-40.64a16 16 0 1 1 22.72-22.56l67.84 67.84a16 16 0 0 1 0 22.72L791.52 848a16 16 0 0 1-22.72-22.56L809.44 784h-157.28a16 16 0 1 1 0-32z" fill="#3c9cff" p-id="24375"></path></svg>
\ No newline at end of file
diff --git a/static/menus/unplanned_issue.svg b/static/menus/unplanned_issue.svg
new file mode 100644
index 0000000..1eb8765
--- /dev/null
+++ b/static/menus/unplanned_issue.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="1703491090426" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="25326" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M964.16 464v4.96a50.24 50.24 0 0 0-8-26.4 34.08 34.08 0 0 1 8 21.44z" fill="#3c9cff" p-id="25327"></path><path d="M352 256A160 160 0 1 0 512 96a160 160 0 0 0-160 160z m-32 0a192 192 0 1 1 192 192 192 192 0 0 1-192-192z" fill="#3c9cff" p-id="25328"></path><path d="M496 371.84v-157.28L455.36 256a16 16 0 1 1-22.56-22.72l67.84-67.84a16 16 0 0 1 22.72 0L592 232.48A16 16 0 1 1 569.44 256L528 214.56v157.28a16 16 0 0 1-32 0z" fill="#3c9cff" p-id="25329"></path><path d="M64 464a34.08 34.08 0 0 1 8-21.44A49.28 49.28 0 0 0 64 468.8z" fill="#3c9cff" p-id="25330"></path><path d="M952.64 512l-109.28-224H760a24 24 0 0 0 0 48h53.44l85.76 176H124.8l85.76-176h53.44a24 24 0 0 0 0-48h-83.36L71.36 512 64 528v368a64 64 0 0 0 64 64h768a64 64 0 0 0 64-64V528zM848 912H176a64 64 0 0 1-64-64V560h800v288a64 64 0 0 1-64 64z" fill="#3c9cff" p-id="25331"></path></svg>
\ No newline at end of file
diff --git a/static/menus/unplanned_receipt.svg b/static/menus/unplanned_receipt.svg
new file mode 100644
index 0000000..29dc3a1
--- /dev/null
+++ b/static/menus/unplanned_receipt.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="1703491084926" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="25086" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M352 256a160 160 0 1 1 160 160 160 160 0 0 1-160-160z m-32 0A192 192 0 1 0 512 64a192 192 0 0 0-192 192z" fill="#3c9cff" p-id="25087"></path><path d="M496 140.16v157.28l-40.64-40.64a16 16 0 1 0-22.56 22.72l67.84 67.84a16 16 0 0 0 22.72 0L592 279.52a16 16 0 1 0-22.56-22.72L528 297.44V140.16a16 16 0 1 0-32 0z" fill="#3c9cff" p-id="25088"></path><path d="M64 464a61.28 61.28 0 0 1 3.84-21.44A90.56 90.56 0 0 0 64 468.8z m896 0v4.96a92.48 92.48 0 0 0-3.84-26.4A61.28 61.28 0 0 1 960 464z" fill="#3c9cff" p-id="25089"></path><path d="M952.64 512l-109.28-224H760a24 24 0 0 0 0 48h53.44l85.76 176H124.8l85.76-176h53.44a24 24 0 0 0 0-48h-83.36L71.36 512 64 528v368a64 64 0 0 0 64 64h768a64 64 0 0 0 64-64V528zM848 912H176a64 64 0 0 1-64-64V560h800v288a64 64 0 0 1-64 64z" fill="#3c9cff" p-id="25090"></path></svg>
\ No newline at end of file
diff --git a/static/no_more.png b/static/no_more.png
new file mode 100644
index 0000000..8bca5fe
Binary files /dev/null and b/static/no_more.png differ
diff --git a/static/refresher_loading.gif b/static/refresher_loading.gif
new file mode 100644
index 0000000..1ee754f
Binary files /dev/null and b/static/refresher_loading.gif differ
diff --git a/static/search.svg b/static/search.svg
new file mode 100644
index 0000000..8238711
--- /dev/null
+++ b/static/search.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="1701072244680" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4277" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M1024 963.7L756.8 696.5c60.2-73.6 96.5-167.5 96.5-269.8C853.3 191.4 661.9 0 426.7 0S0 191.4 0 426.7s191.4 426.7 426.7 426.7c102.3 0 196.3-36.3 269.8-96.5L963.7 1024l60.3-60.3zM426.7 768C238.5 768 85.3 614.9 85.3 426.7S238.5 85.3 426.7 85.3 768 238.5 768 426.7 614.9 768 426.7 768z" fill="#333333" p-id="4278"></path></svg>
\ No newline at end of file
diff --git a/static/uni.ttf b/static/uni.ttf
new file mode 100644
index 0000000..60a1968
Binary files /dev/null and b/static/uni.ttf differ
diff --git a/store/index.ts b/store/index.ts
new file mode 100644
index 0000000..bd65527
--- /dev/null
+++ b/store/index.ts
@@ -0,0 +1 @@
+export { default as useCountStore } from './modules/countStore'
diff --git a/store/modules/countStore.ts b/store/modules/countStore.ts
new file mode 100644
index 0000000..d152f09
--- /dev/null
+++ b/store/modules/countStore.ts
@@ -0,0 +1,121 @@
+import { defineStore } from 'pinia'
+import {
+	login,
+	logout,
+	getInfo,
+	getPermissionInfo
+} from '@/api/login'
+import {
+	setToken,
+	removeToken
+} from '@/utils/auth'
+const baseUrl = import.meta.env.VITE_BASE_URL
+const useStore = defineStore('storeId', {
+	state: () => ({
+		id: '', // 用户编号
+		name: '',
+		avatar: '',
+		roles: [],
+		permissions: '',
+		role: '',
+		post: '',
+		dept: '',
+		menus1: [],
+		menus2: [],
+	}),
+	getters: {
+		// isEven: (state) => state.count % 2 === 0
+	},
+	actions: {
+		// 登录
+		Login(userInfo) {
+			const username = userInfo.username.trim()
+			const password = userInfo.password
+			const captchaVerification = userInfo.captchaVerification
+			const tenantName = userInfo.tenantName
+			const rememberMe = userInfo.rememberMe
+			const code = userInfo.code
+			const uuid = userInfo.uuid
+			return new Promise((resolve, reject) => {
+				login(username, password, captchaVerification, tenantName, rememberMe, code, uuid).then(
+					res => {
+						res = res.data;
+						// 设置 token
+						setToken(res)
+						resolve(res)
+					}).catch(error => {
+						reject(error)
+					})
+			})
+		},
+		// 获取权限
+		GetPermissionInfo() {
+			return new Promise((resolve, reject) => {
+				getPermissionInfo().then(res => {
+					res = res.data; // 读取 data 数据
+					if (res.roles && res.roles.length > 0) {
+						this.roles = res.roles
+						this.role = res.roles.filter(item => item == 'all_approve' || item == 'normal_approve')[0]
+						this.permissions = res.permissions
+						let menus = []
+						res.menus.forEach(item => {
+							if (item.path == '/pda') {
+								menus = item.children
+							}
+						})
+						this.menus1 = menus.filter(item => item.path !== 'itemOut')
+						this.menus2 = menus.filter(item => item.path === 'itemOut')
+					} else {
+						this.roles = []
+						this.role = ''
+					}
+					resolve(res)
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		},
+		// 获取权限
+		GetInfo() {
+			return new Promise((resolve, reject) => {
+				getInfo().then(res => {
+					res = res.data; // 读取 data 数据
+					this.avatar = res.avatar
+					this.name = res.nickname
+					this.id = res.id
+					this.avatar = res.avatar
+					this.dept = res.dept
+					if (res.posts && res.posts.length > 0) {
+						this.post = res.posts.filter(item => item.code == 'worker' || item.code == 'engineer')[0]
+					} else {
+						this.post = ''
+					}
+					resolve(res)
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		},
+		// 获取权限
+		LogOut() {
+			return new Promise((resolve, reject) => {
+				logout().then(res => {
+					this.id = ''// 用户编号
+					this.name = ''
+					this.avatar = ''
+					this.roles = ''
+					this.permissions = ''
+					this.role = ''
+					this.post = ''
+					this.dept = ''
+					removeToken()
+					resolve(res)
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		},
+	}
+})
+
+export default useStore
\ No newline at end of file
diff --git a/styles/vars/_base.less b/styles/vars/_base.less
new file mode 100644
index 0000000..6bb66aa
--- /dev/null
+++ b/styles/vars/_base.less
@@ -0,0 +1,2 @@
+@title-size: 40rpx;
+@title-color: #47caff;
diff --git a/styles/vars/_base.scss b/styles/vars/_base.scss
new file mode 100644
index 0000000..19eb9f1
--- /dev/null
+++ b/styles/vars/_base.scss
@@ -0,0 +1,2 @@
+$title-size: 40rpx;
+$title-color: #bd34fe;
diff --git a/uni.scss b/uni.scss
new file mode 100644
index 0000000..38cc172
--- /dev/null
+++ b/uni.scss
@@ -0,0 +1,77 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+
+@import 'vk-uview-ui/theme.scss';
+/* 颜色变量 */
+
+/* 行为相关颜色 */
+$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;
diff --git a/uni_modules/uni-badge/changelog.md b/uni_modules/uni-badge/changelog.md
new file mode 100644
index 0000000..544ecc1
--- /dev/null
+++ b/uni_modules/uni-badge/changelog.md
@@ -0,0 +1,29 @@
+## 1.2.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-badge](https://uniapp.dcloud.io/component/uniui/uni-badge)
+## 1.1.7（2021-11-08）
+- 优化 升级ui
+- 修改 size 属性默认值调整为 small
+- 修改 type 属性，默认值调整为 error，info 替换 default
+## 1.1.6（2021-09-22）
+- 修复 在字节小程序上样式不生效的 bug
+## 1.1.5（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.4（2021-07-29）
+- 修复 去掉 nvue 不支持css 的 align-self 属性，nvue 下不暂支持 absolute 属性
+## 1.1.3（2021-06-24）
+- 优化 示例项目
+## 1.1.1（2021-05-12）
+- 新增 组件示例地址
+## 1.1.0（2021-05-12）
+- 新增 uni-badge 的 absolute 属性，支持定位
+- 新增 uni-badge 的 offset 属性，支持定位偏移
+- 新增 uni-badge 的 is-dot 属性，支持仅显示有一个小点
+- 新增 uni-badge 的 max-num 属性，支持自定义封顶的数字值，超过 99 显示99+
+- 优化 uni-badge 属性 custom-style， 支持以对象形式自定义样式
+## 1.0.7（2021-05-07）
+- 修复 uni-badge 在 App 端，数字小于10时不是圆形的bug
+- 修复 uni-badge 在父元素不是 flex 布局时，宽度缩小的bug
+- 新增 uni-badge 属性 custom-style， 支持自定义样式
+## 1.0.6（2021-02-04）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-badge/components/uni-badge/uni-badge.vue b/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
new file mode 100644
index 0000000..1981b4e
--- /dev/null
+++ b/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
@@ -0,0 +1,268 @@
+<template>
+	<view class="uni-badge--x">
+		<slot />
+		<text v-if="text" :class="classNames" :style="[badgeWidth, positionStyle, customStyle, dotStyle]"
+			class="uni-badge" @click="onClick()">{{displayValue}}</text>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Badge 数字角标
+	 * @description 数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=21
+	 * @property {String} text 角标内容
+	 * @property {String} size = [normal|small] 角标内容
+	 * @property {String} type = [info|primary|success|warning|error] 颜色类型
+	 * 	@value info 灰色
+	 * 	@value primary 蓝色
+	 * 	@value success 绿色
+	 * 	@value warning 黄色
+	 * 	@value error 红色
+	 * @property {String} inverted = [true|false] 是否无需背景颜色
+	 * @property {Number} maxNum 展示封顶的数字值，超过 99 显示 99+
+	 * @property {String} absolute = [rightTop|rightBottom|leftBottom|leftTop] 开启绝对定位, 角标将定位到其包裹的标签的四角上		
+	 * 	@value rightTop 右上
+	 * 	@value rightBottom 右下
+	 * 	@value leftTop 左上
+	 * 	@value leftBottom 左下
+	 * @property {Array[number]} offset	距定位角中心点的偏移量，只有存在 absolute 属性时有效，例如：[-10, -10] 表示向外偏移 10px，[10, 10] 表示向 absolute 指定的内偏移 10px
+	 * @property {String} isDot = [true|false] 是否显示为一个小点
+	 * @event {Function} click 点击 Badge 触发事件
+	 * @example <uni-badge text="1"></uni-badge>
+	 */
+
+	export default {
+		name: 'UniBadge',
+		emits: ['click'],
+		props: {
+			type: {
+				type: String,
+				default: 'error'
+			},
+			inverted: {
+				type: Boolean,
+				default: false
+			},
+			isDot: {
+				type: Boolean,
+				default: false
+			},
+			maxNum: {
+				type: Number,
+				default: 99
+			},
+			absolute: {
+				type: String,
+				default: ''
+			},
+			offset: {
+				type: Array,
+				default () {
+					return [0, 0]
+				}
+			},
+			text: {
+				type: [String, Number],
+				default: ''
+			},
+			size: {
+				type: String,
+				default: 'small'
+			},
+			customStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {};
+		},
+		computed: {
+			width() {
+				return String(this.text).length * 8 + 12
+			},
+			classNames() {
+				const {
+					inverted,
+					type,
+					size,
+					absolute
+				} = this
+				return [
+					inverted ? 'uni-badge--' + type + '-inverted' : '',
+					'uni-badge--' + type,
+					'uni-badge--' + size,
+					absolute ? 'uni-badge--absolute' : ''
+				].join(' ')
+			},
+			positionStyle() {
+				if (!this.absolute) return {}
+				let w = this.width / 2,
+					h = 10
+				if (this.isDot) {
+					w = 5
+					h = 5
+				}
+				const x = `${- w  + this.offset[0]}px`
+				const y = `${- h + this.offset[1]}px`
+
+				const whiteList = {
+					rightTop: {
+						right: x,
+						top: y
+					},
+					rightBottom: {
+						right: x,
+						bottom: y
+					},
+					leftBottom: {
+						left: x,
+						bottom: y
+					},
+					leftTop: {
+						left: x,
+						top: y
+					}
+				}
+				const match = whiteList[this.absolute]
+				return match ? match : whiteList['rightTop']
+			},
+			badgeWidth() {
+				return {
+					width: `${this.width}px`
+				}
+			},
+			dotStyle() {
+				if (!this.isDot) return {}
+				return {
+					width: '10px',
+					height: '10px',
+					borderRadius: '10px'
+				}
+			},
+			displayValue() {
+				const {
+					isDot,
+					text,
+					maxNum
+				} = this
+				return isDot ? '' : (Number(text) > maxNum ? `${maxNum}+` : text)
+			}
+		},
+		methods: {
+			onClick() {
+				this.$emit('click');
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	$uni-primary: #2979ff !default;
+	$uni-success: #4cd964 !default;
+	$uni-warning: #f0ad4e !default;
+	$uni-error: #dd524d !default;
+	$uni-info: #909399 !default;
+
+
+	$bage-size: 12px;
+	$bage-small: scale(0.8);
+
+	.uni-badge--x {
+		/* #ifdef APP-NVUE */
+		// align-self: flex-start;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		display: inline-block;
+		/* #endif */
+		position: relative;
+	}
+
+	.uni-badge--absolute {
+		position: absolute;
+	}
+
+	.uni-badge--small {
+		transform: $bage-small;
+		transform-origin: center center;
+	}
+
+	.uni-badge {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		overflow: hidden;
+		box-sizing: border-box;
+		/* #endif */
+		justify-content: center;
+		flex-direction: row;
+		height: 20px;
+		line-height: 18px;
+		color: #fff;
+		border-radius: 100px;
+		background-color: $uni-info;
+		background-color: transparent;
+		border: 1px solid #fff;
+		text-align: center;
+		font-family: 'Helvetica Neue', Helvetica, sans-serif;
+		font-size: $bage-size;
+		/* #ifdef H5 */
+		z-index: 999;
+		cursor: pointer;
+		/* #endif */
+
+		&--info {
+			color: #fff;
+			background-color: $uni-info;
+		}
+
+		&--primary {
+			background-color: $uni-primary;
+		}
+
+		&--success {
+			background-color: $uni-success;
+		}
+
+		&--warning {
+			background-color: $uni-warning;
+		}
+
+		&--error {
+			background-color: $uni-error;
+		}
+
+		&--inverted {
+			padding: 0 5px 0 0;
+			color: $uni-info;
+		}
+
+		&--info-inverted {
+			color: $uni-info;
+			background-color: transparent;
+		}
+
+		&--primary-inverted {
+			color: $uni-primary;
+			background-color: transparent;
+		}
+
+		&--success-inverted {
+			color: $uni-success;
+			background-color: transparent;
+		}
+
+		&--warning-inverted {
+			color: $uni-warning;
+			background-color: transparent;
+		}
+
+		&--error-inverted {
+			color: $uni-error;
+			background-color: transparent;
+		}
+
+	}
+</style>
diff --git a/uni_modules/uni-badge/package.json b/uni_modules/uni-badge/package.json
new file mode 100644
index 0000000..7ba6d2f
--- /dev/null
+++ b/uni_modules/uni-badge/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-badge",
+  "displayName": "uni-badge 数字角标",
+  "version": "1.2.0",
+  "description": "数字角标（徽章）组件，在元素周围展示消息提醒，一般用于列表、九宫格、按钮等地方。",
+  "keywords": [
+    "",
+    "badge",
+    "uni-ui",
+    "uniui",
+    "数字角标",
+    "徽章"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": "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"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-badge/readme.md b/uni_modules/uni-badge/readme.md
new file mode 100644
index 0000000..bdf175d
--- /dev/null
+++ b/uni_modules/uni-badge/readme.md
@@ -0,0 +1,10 @@
+## Badge 数字角标
+> **组件名：uni-badge**
+> 代码块： `uBadge`
+
+数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景，
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-badge)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-breadcrumb/changelog.md b/uni_modules/uni-breadcrumb/changelog.md
new file mode 100644
index 0000000..016e6ce
--- /dev/null
+++ b/uni_modules/uni-breadcrumb/changelog.md
@@ -0,0 +1,6 @@
+## 0.1.2（2022-06-08）
+- 修复 微信小程序 separator 不显示问题
+## 0.1.1（2022-06-02）
+- 新增 支持 uni.scss 修改颜色
+## 0.1.0（2022-04-21）
+- 初始化
diff --git a/uni_modules/uni-breadcrumb/components/uni-breadcrumb-item/uni-breadcrumb-item.vue b/uni_modules/uni-breadcrumb/components/uni-breadcrumb-item/uni-breadcrumb-item.vue
new file mode 100644
index 0000000..b9edbd6
--- /dev/null
+++ b/uni_modules/uni-breadcrumb/components/uni-breadcrumb-item/uni-breadcrumb-item.vue
@@ -0,0 +1,121 @@
+<template>
+	<view class="uni-breadcrumb-item">
+		<view :class="{
+			'uni-breadcrumb-item--slot': true,
+			'uni-breadcrumb-item--slot-link': to && currentPage !== to
+			}" @click="navTo">
+			<slot />
+		</view>
+		<i v-if="separatorClass" class="uni-breadcrumb-item--separator" :class="separatorClass" />
+		<text v-else class="uni-breadcrumb-item--separator">{{ separator }}</text>
+	</view>
+</template>
+<script>
+	/**
+	 * BreadcrumbItem 面包屑导航子组件
+	 * @property {String/Object} to 路由跳转页面路径/对象
+	 * @property {Boolean} replace 在使用 to 进行路由跳转时，启用 replace 将不会向 history 添加新记录(仅 h5 支持）
+	 */
+	export default {
+		data() {
+			return {
+				currentPage: ""
+			}
+		},
+		options: {
+			virtualHost: true
+		},
+		props: {
+			to: {
+				type: String,
+				default: ''
+			},
+			replace:{
+				type: Boolean,
+				default: false
+			}
+		},
+		inject: {
+			uniBreadcrumb: {
+				from: "uniBreadcrumb",
+				default: null
+			}
+		},
+		created(){
+			const pages = getCurrentPages()
+			const page = pages[pages.length-1]
+
+			if(page){
+				this.currentPage = `/${page.route}`
+			}
+		},
+		computed: {
+			separator() {
+				return this.uniBreadcrumb.separator
+			},
+			separatorClass() {
+				return this.uniBreadcrumb.separatorClass
+			}
+		},
+		methods: {
+			navTo() {
+				const { to } = this
+
+				if (!to || this.currentPage === to){
+					return
+				}
+
+				if(this.replace){
+					uni.redirectTo({
+						url:to
+					})
+				}else{
+					uni.navigateTo({
+						url:to
+					})
+				}
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	$uni-primary: #2979ff !default;
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #3a3a3a !default;
+	.uni-breadcrumb-item {
+		display: flex;
+		align-items: center;
+		white-space: nowrap;
+		font-size: 14px;
+
+		&--slot {
+			color: $uni-base-color;
+			padding: 0 10px;
+
+			&-link {
+				color: $uni-main-color;
+				font-weight: bold;
+				/* #ifndef APP-NVUE */
+				cursor: pointer;
+				/* #endif */
+
+				&:hover {
+					color: $uni-primary;
+				}
+			}
+		}
+
+		&--separator {
+			font-size: 12px;
+			color: $uni-base-color;
+		}
+
+		&:first-child &--slot {
+			padding-left: 0;
+		}
+		
+		&:last-child &--separator {
+			display: none;
+		}
+	}
+</style>
diff --git a/uni_modules/uni-breadcrumb/components/uni-breadcrumb/uni-breadcrumb.vue b/uni_modules/uni-breadcrumb/components/uni-breadcrumb/uni-breadcrumb.vue
new file mode 100644
index 0000000..94493a2
--- /dev/null
+++ b/uni_modules/uni-breadcrumb/components/uni-breadcrumb/uni-breadcrumb.vue
@@ -0,0 +1,41 @@
+<template>
+	<view class="uni-breadcrumb">
+		<slot />
+	</view>
+</template>
+<script>
+	/**
+	 * Breadcrumb 面包屑导航父组件
+	 * @description 显示当前页面的路径，快速返回之前的任意页面
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} separator 分隔符，默认为斜杠'/'
+	 * @property {String} separatorClass 图标分隔符 class
+	 */
+	export default {
+		options: {
+			virtualHost: true
+		},
+		props: {
+			separator: {
+				type: String,
+				default: '/'
+			},
+			separatorClass: {
+				type: String,
+				default: ''
+			}
+		},
+
+		provide() {
+			return {
+				uniBreadcrumb: this
+			}
+		}
+
+	}
+</script>
+<style lang="scss">
+	.uni-breadcrumb {
+		display: flex;
+	}
+</style>
diff --git a/uni_modules/uni-breadcrumb/package.json b/uni_modules/uni-breadcrumb/package.json
new file mode 100644
index 0000000..e5f33e8
--- /dev/null
+++ b/uni_modules/uni-breadcrumb/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "uni-breadcrumb",
+  "displayName": "uni-breadcrumb 面包屑",
+  "version": "0.1.2",
+  "description": "Breadcrumb  面包屑",
+  "keywords": [
+    "uni-breadcrumb",
+    "breadcrumb",
+    "uni-ui",
+    "面包屑导航",
+    "面包屑"
+],
+  "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": "y",
+          "app-nvue": "n"
+        },
+        "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",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+        "QQ": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-breadcrumb/readme.md b/uni_modules/uni-breadcrumb/readme.md
new file mode 100644
index 0000000..6976b8d
--- /dev/null
+++ b/uni_modules/uni-breadcrumb/readme.md
@@ -0,0 +1,66 @@
+
+## breadcrumb 面包屑导航
+> **组件名：uni-breadcrumb**
+> 代码块： `ubreadcrumb`
+
+显示当前页面的路径，快速返回之前的任意页面。
+
+### 安装方式
+
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
+
+### 基本用法
+
+在 ``template`` 中使用组件
+
+```html
+<uni-breadcrumb separator="/">
+	<uni-breadcrumb-item v-for="(route,index) in routes" :key="index" :to="route.to">{{route.name}}</uni-breadcrumb-item>
+</uni-breadcrumb>
+```
+
+```js
+export default {
+		name: "uni-stat-breadcrumb",
+		data() {
+			return {
+				routes: [{
+					to: '/A',
+					name: 'A页面'
+				}, {
+					to: '/B',
+					name: 'B页面'
+				}, {
+					to: '/C',
+					name: 'C页面'
+				}]
+			};
+		}
+	}
+```
+
+
+## API
+
+### Breadcrumb Props
+
+|属性名			|类型	|默认值	|说明				|
+|:-:			|:-:	|:-:	|:-:				|
+|separator		|String	|斜杠'/' |分隔符				|
+|separatorClass	|String	|		|图标分隔符 class	    |
+
+### Breadcrumb Item Props
+
+|属性名	|类型			|默认值	|说明																			|
+|:-:	|:-:			|:-:	|:-:																			|
+|to		|String     	|		|路由跳转页面路径           														|
+|replace|Boolean		|		|在使用 to 进行路由跳转时，启用 replace 将不会向 history 添加新记录(仅 h5 支持）         |
+
+
+
+
+## 组件示例
+
+点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/breadcrumb/breadcrumb](https://hellouniapp.dcloud.net.cn/pages/extUI/breadcrumb/breadcrumb)
\ No newline at end of file
diff --git a/uni_modules/uni-calendar/changelog.md b/uni_modules/uni-calendar/changelog.md
new file mode 100644
index 0000000..6df4493
--- /dev/null
+++ b/uni_modules/uni-calendar/changelog.md
@@ -0,0 +1,16 @@
+## 1.4.5（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式
+## 1.4.4（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式
+## 1.4.3（2021-09-22）
+- 修复 startDate、 endDate 属性失效的 bug
+## 1.4.2（2021-08-24）
+- 新增 支持国际化
+## 1.4.1（2021-08-05）
+- 修复 弹出层被 tabbar 遮盖 bug
+## 1.4.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.3.16（2021-05-12）
+- 新增 组件示例地址
+## 1.3.15（2021-02-04）
+- 调整为uni_modules目录规范 
diff --git a/uni_modules/uni-calendar/components/uni-calendar/calendar.js b/uni_modules/uni-calendar/components/uni-calendar/calendar.js
new file mode 100644
index 0000000..b8d7d6f
--- /dev/null
+++ b/uni_modules/uni-calendar/components/uni-calendar/calendar.js
@@ -0,0 +1,546 @@
+/**
+* @1900-2100区间内的公历、农历互转
+* @charset UTF-8
+* @github  https://github.com/jjonline/calendar.js
+* @Author  Jea杨(JJonline@JJonline.Cn)
+* @Time    2014-7-21
+* @Time    2016-8-13 Fixed 2033hex、Attribution Annals
+* @Time    2016-9-25 Fixed lunar LeapMonth Param Bug
+* @Time    2017-7-24 Fixed use getTerm Func Param Error.use solar year,NOT lunar year
+* @Version 1.0.3
+* @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
+* @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
+*/
+/* eslint-disable */
+var calendar = {
+
+  /**
+      * 农历1900-2100的润大小信息表
+      * @Array Of Property
+      * @return Hex
+      */
+  lunarInfo: [0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2, // 1900-1909
+    0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
+    0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
+    0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
+    0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
+    0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
+    0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
+    0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
+    0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
+    0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
+    0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
+    0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
+    0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
+    0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
+    0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
+    /** Add By JJonline@JJonline.Cn**/
+    0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
+    0x0a2e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
+    0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
+    0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
+    0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
+    0x0d520], // 2100
+
+  /**
+      * 公历每个月份的天数普通表
+      * @Array Of Property
+      * @return Number
+      */
+  solarMonth: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
+
+  /**
+      * 天干地支之天干速查表
+      * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
+      * @return Cn string
+      */
+  Gan: ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678'],
+
+  /**
+      * 天干地支之地支速查表
+      * @Array Of Property
+      * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
+      * @return Cn string
+      */
+  Zhi: ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149', '\u620c', '\u4ea5'],
+
+  /**
+      * 天干地支之地支速查表<=>生肖
+      * @Array Of Property
+      * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
+      * @return Cn string
+      */
+  Animals: ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21', '\u72d7', '\u732a'],
+
+  /**
+      * 24节气速查表
+      * @Array Of Property
+      * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
+      * @return Cn string
+      */
+  solarTerm: ['\u5c0f\u5bd2', '\u5927\u5bd2', '\u7acb\u6625', '\u96e8\u6c34', '\u60ca\u86f0', '\u6625\u5206', '\u6e05\u660e', '\u8c37\u96e8', '\u7acb\u590f', '\u5c0f\u6ee1', '\u8292\u79cd', '\u590f\u81f3', '\u5c0f\u6691', '\u5927\u6691', '\u7acb\u79cb', '\u5904\u6691', '\u767d\u9732', '\u79cb\u5206', '\u5bd2\u9732', '\u971c\u964d', '\u7acb\u51ac', '\u5c0f\u96ea', '\u5927\u96ea', '\u51ac\u81f3'],
+
+  /**
+      * 1900-2100各年的24节气日期速查表
+      * @Array Of Property
+      * @return 0x string For splice
+      */
+  sTermInfo: ['9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f',
+    '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f',
+    'b027097bd097c36b0b6fc9274c91aa', '9778397bd19801ec9210c965cc920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd197c36c9210c9274c91aa',
+    '97b6b97bd19801ec95f8c965cc920e', '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec95f8c965cc920e', '97bcf97c3598082c95f8e1cfcc920f',
+    '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f',
+    '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd097bd07f595b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9210c8dc2', '9778397bd19801ec9210c9274c920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b97bd19801ec95f8c965cc920f', '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bd07f1487f595b0b0bc920fb0722',
+    '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b97bd197c36c9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36b0b70c9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '977837f0e37f149b0723b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c35b0b6fc9210c8dc2',
+    '977837f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '977837f0e37f14998082b0723b06bd', '7f07e7f0e37f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f595b0b0bb0b6fb0722', '7f0e37f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e37f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f149b0723b0787b0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0723b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722', '7f0e37f0e366aa89801eb072297c35',
+    '7ec967f0e37f14998082b0723b06bd', '7f07e7f0e37f14998083b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14898082b0723b02d5', '7f07e7f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66aa89801e9808297c35', '665f67f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66a449801e9808297c35',
+    '665f67f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e36665b66a449801e9808297c35', '665f67f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e26665b66a449801e9808297c35', '665f67f0e37f1489801eb072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722'],
+
+  /**
+      * 数字转中文速查表
+      * @Array Of Property
+      * @trans ['日','一','二','三','四','五','六','七','八','九','十']
+      * @return Cn string
+      */
+  nStr1: ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341'],
+
+  /**
+      * 日期转农历称呼速查表
+      * @Array Of Property
+      * @trans ['初','十','廿','卅']
+      * @return Cn string
+      */
+  nStr2: ['\u521d', '\u5341', '\u5eff', '\u5345'],
+
+  /**
+      * 月份转农历称呼速查表
+      * @Array Of Property
+      * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
+      * @return Cn string
+      */
+  nStr3: ['\u6b63', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341', '\u51ac', '\u814a'],
+
+  /**
+      * 返回农历y年一整年的总天数
+      * @param lunar Year
+      * @return Number
+      * @eg:var count = calendar.lYearDays(1987) ;//count=387
+      */
+  lYearDays: function (y) {
+    var i; var sum = 348
+    for (i = 0x8000; i > 0x8; i >>= 1) { sum += (this.lunarInfo[y - 1900] & i) ? 1 : 0 }
+    return (sum + this.leapDays(y))
+  },
+
+  /**
+      * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
+      * @param lunar Year
+      * @return Number (0-12)
+      * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+      */
+  leapMonth: function (y) { // 闰字编码 \u95f0
+    return (this.lunarInfo[y - 1900] & 0xf)
+  },
+
+  /**
+      * 返回农历y年闰月的天数 若该年没有闰月则返回0
+      * @param lunar Year
+      * @return Number (0、29、30)
+      * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+      */
+  leapDays: function (y) {
+    if (this.leapMonth(y)) {
+      return ((this.lunarInfo[y - 1900] & 0x10000) ? 30 : 29)
+    }
+    return (0)
+  },
+
+  /**
+      * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
+      * @param lunar Year
+      * @return Number (-1、29、30)
+      * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+      */
+  monthDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 }// 月份参数从1至12，参数错误返回-1
+    return ((this.lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29)
+  },
+
+  /**
+      * 返回公历(!)y年m月的天数
+      * @param solar Year
+      * @return Number (-1、28、29、30、31)
+      * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+      */
+  solarDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var ms = m - 1
+    if (ms == 1) { // 2月份的闰平规律测算后确认返回28或29
+      return (((y % 4 == 0) && (y % 100 != 0) || (y % 400 == 0)) ? 29 : 28)
+    } else {
+      return (this.solarMonth[ms])
+    }
+  },
+
+  /**
+     * 农历年份转换为干支纪年
+     * @param  lYear 农历年的年份数
+     * @return Cn string
+     */
+  toGanZhiYear: function (lYear) {
+    var ganKey = (lYear - 3) % 10
+    var zhiKey = (lYear - 3) % 12
+    if (ganKey == 0) ganKey = 10// 如果余数为0则为最后一个天干
+    if (zhiKey == 0) zhiKey = 12// 如果余数为0则为最后一个地支
+    return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
+  },
+
+  /**
+     * 公历月、日判断所属星座
+     * @param  cMonth [description]
+     * @param  cDay [description]
+     * @return Cn string
+     */
+  toAstro: function (cMonth, cDay) {
+    var s = '\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
+    var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
+    return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7'// 座
+  },
+
+  /**
+      * 传入offset偏移量返回干支
+      * @param offset 相对甲子的偏移量
+      * @return Cn string
+      */
+  toGanZhi: function (offset) {
+    return this.Gan[offset % 10] + this.Zhi[offset % 12]
+  },
+
+  /**
+      * 传入公历(!)y年获得该年第n个节气的公历日期
+      * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
+      * @return day Number
+      * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+      */
+  getTerm: function (y, n) {
+    if (y < 1900 || y > 2100) { return -1 }
+    if (n < 1 || n > 24) { return -1 }
+    var _table = this.sTermInfo[y - 1900]
+    var _info = [
+      parseInt('0x' + _table.substr(0, 5)).toString(),
+      parseInt('0x' + _table.substr(5, 5)).toString(),
+      parseInt('0x' + _table.substr(10, 5)).toString(),
+      parseInt('0x' + _table.substr(15, 5)).toString(),
+      parseInt('0x' + _table.substr(20, 5)).toString(),
+      parseInt('0x' + _table.substr(25, 5)).toString()
+    ]
+    var _calday = [
+      _info[0].substr(0, 1),
+      _info[0].substr(1, 2),
+      _info[0].substr(3, 1),
+      _info[0].substr(4, 2),
+
+      _info[1].substr(0, 1),
+      _info[1].substr(1, 2),
+      _info[1].substr(3, 1),
+      _info[1].substr(4, 2),
+
+      _info[2].substr(0, 1),
+      _info[2].substr(1, 2),
+      _info[2].substr(3, 1),
+      _info[2].substr(4, 2),
+
+      _info[3].substr(0, 1),
+      _info[3].substr(1, 2),
+      _info[3].substr(3, 1),
+      _info[3].substr(4, 2),
+
+      _info[4].substr(0, 1),
+      _info[4].substr(1, 2),
+      _info[4].substr(3, 1),
+      _info[4].substr(4, 2),
+
+      _info[5].substr(0, 1),
+      _info[5].substr(1, 2),
+      _info[5].substr(3, 1),
+      _info[5].substr(4, 2)
+    ]
+    return parseInt(_calday[n - 1])
+  },
+
+  /**
+      * 传入农历数字月份返回汉语通俗表示法
+      * @param lunar month
+      * @return Cn string
+      * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+      */
+  toChinaMonth: function (m) { // 月 => \u6708
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var s = this.nStr3[m - 1]
+    s += '\u6708'// 加上月字
+    return s
+  },
+
+  /**
+      * 传入农历日期数字返回汉字表示法
+      * @param lunar day
+      * @return Cn string
+      * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+      */
+  toChinaDay: function (d) { // 日 => \u65e5
+    var s
+    switch (d) {
+      case 10:
+        s = '\u521d\u5341'; break
+      case 20:
+        s = '\u4e8c\u5341'; break
+        break
+      case 30:
+        s = '\u4e09\u5341'; break
+        break
+      default :
+        s = this.nStr2[Math.floor(d / 10)]
+        s += this.nStr1[d % 10]
+    }
+    return (s)
+  },
+
+  /**
+      * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
+      * @param y year
+      * @return Cn string
+      * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+      */
+  getAnimal: function (y) {
+    return this.Animals[(y - 4) % 12]
+  },
+
+  /**
+      * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+      * @param y  solar year
+      * @param m  solar month
+      * @param d  solar day
+      * @return JSON object
+      * @eg:console.log(calendar.solar2lunar(1987,11,01));
+      */
+  solar2lunar: function (y, m, d) { // 参数区间1900.1.31~2100.12.31
+    // 年份限定、上限
+    if (y < 1900 || y > 2100) {
+      return -1// undefined转换为数字变为NaN
+    }
+    // 公历传参最下限
+    if (y == 1900 && m == 1 && d < 31) {
+      return -1
+    }
+    // 未传参  获得当天
+    if (!y) {
+      var objDate = new Date()
+    } else {
+      var objDate = new Date(y, parseInt(m) - 1, d)
+    }
+    var i; var leap = 0; var temp = 0
+    // 修正ymd参数
+    var y = objDate.getFullYear()
+    var m = objDate.getMonth() + 1
+    var d = objDate.getDate()
+    var offset = (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) - Date.UTC(1900, 0, 31)) / 86400000
+    for (i = 1900; i < 2101 && offset > 0; i++) {
+      temp = this.lYearDays(i)
+      offset -= temp
+    }
+    if (offset < 0) {
+      offset += temp; i--
+    }
+
+    // 是否今天
+    var isTodayObj = new Date()
+    var isToday = false
+    if (isTodayObj.getFullYear() == y && isTodayObj.getMonth() + 1 == m && isTodayObj.getDate() == d) {
+      isToday = true
+    }
+    // 星期几
+    var nWeek = objDate.getDay()
+    var cWeek = this.nStr1[nWeek]
+    // 数字表示周几顺应天朝周一开始的惯例
+    if (nWeek == 0) {
+      nWeek = 7
+    }
+    // 农历年
+    var year = i
+    var leap = this.leapMonth(i) // 闰哪个月
+    var isLeap = false
+
+    // 效验闰月
+    for (i = 1; i < 13 && offset > 0; i++) {
+      // 闰月
+      if (leap > 0 && i == (leap + 1) && isLeap == false) {
+        --i
+        isLeap = true; temp = this.leapDays(year) // 计算农历闰月天数
+      } else {
+        temp = this.monthDays(year, i)// 计算农历普通月天数
+      }
+      // 解除闰月
+      if (isLeap == true && i == (leap + 1)) { isLeap = false }
+      offset -= temp
+    }
+    // 闰月导致数组下标重叠取反
+    if (offset == 0 && leap > 0 && i == leap + 1) {
+      if (isLeap) {
+        isLeap = false
+      } else {
+        isLeap = true; --i
+      }
+    }
+    if (offset < 0) {
+      offset += temp; --i
+    }
+    // 农历月
+    var month = i
+    // 农历日
+    var day = offset + 1
+    // 天干地支处理
+    var sm = m - 1
+    var gzY = this.toGanZhiYear(year)
+
+    // 当月的两个节气
+    // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
+    var firstNode = this.getTerm(y, (m * 2 - 1))// 返回当月「节」为几日开始
+    var secondNode = this.getTerm(y, (m * 2))// 返回当月「节」为几日开始
+
+    // 依据12节气修正干支月
+    var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
+    if (d >= firstNode) {
+      gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
+    }
+
+    // 传入的日期的节气与否
+    var isTerm = false
+    var Term = null
+    if (firstNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 2]
+    }
+    if (secondNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 1]
+    }
+    // 日柱 当月一日与 1900/1/1 相差天数
+    var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
+    var gzD = this.toGanZhi(dayCyclical + d - 1)
+    // 该日期所属的星座
+    var astro = this.toAstro(m, d)
+
+    return { 'lYear': year, 'lMonth': month, 'lDay': day, 'Animal': this.getAnimal(year), 'IMonthCn': (isLeap ? '\u95f0' : '') + this.toChinaMonth(month), 'IDayCn': this.toChinaDay(day), 'cYear': y, 'cMonth': m, 'cDay': d, 'gzYear': gzY, 'gzMonth': gzM, 'gzDay': gzD, 'isToday': isToday, 'isLeap': isLeap, 'nWeek': nWeek, 'ncWeek': '\u661f\u671f' + cWeek, 'isTerm': isTerm, 'Term': Term, 'astro': astro }
+  },
+
+  /**
+      * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
+      * @param y  lunar year
+      * @param m  lunar month
+      * @param d  lunar day
+      * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
+      * @return JSON object
+      * @eg:console.log(calendar.lunar2solar(1987,9,10));
+      */
+  lunar2solar: function (y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
+    var isLeapMonth = !!isLeapMonth
+    var leapOffset = 0
+    var leapMonth = this.leapMonth(y)
+    var leapDay = this.leapDays(y)
+    if (isLeapMonth && (leapMonth != m)) { return -1 }// 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
+    if (y == 2100 && m == 12 && d > 1 || y == 1900 && m == 1 && d < 31) { return -1 }// 超出了最大极限值
+    var day = this.monthDays(y, m)
+    var _day = day
+    // bugFix 2016-9-25
+    // if month is leap, _day use leapDays method
+    if (isLeapMonth) {
+      _day = this.leapDays(y, m)
+    }
+    if (y < 1900 || y > 2100 || d > _day) { return -1 }// 参数合法性效验
+
+    // 计算农历的时间差
+    var offset = 0
+    for (var i = 1900; i < y; i++) {
+      offset += this.lYearDays(i)
+    }
+    var leap = 0; var isAdd = false
+    for (var i = 1; i < m; i++) {
+      leap = this.leapMonth(y)
+      if (!isAdd) { // 处理闰月
+        if (leap <= i && leap > 0) {
+          offset += this.leapDays(y); isAdd = true
+        }
+      }
+      offset += this.monthDays(y, i)
+    }
+    // 转换闰月农历 需补充该年闰月的前一个月的时差
+    if (isLeapMonth) { offset += day }
+    // 1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
+    var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
+    var calObj = new Date((offset + d - 31) * 86400000 + stmap)
+    var cY = calObj.getUTCFullYear()
+    var cM = calObj.getUTCMonth() + 1
+    var cD = calObj.getUTCDate()
+
+    return this.solar2lunar(cY, cM, cD)
+  }
+}
+
+export default calendar
diff --git a/uni_modules/uni-calendar/components/uni-calendar/i18n/en.json b/uni_modules/uni-calendar/components/uni-calendar/i18n/en.json
new file mode 100644
index 0000000..fcbd13c
--- /dev/null
+++ b/uni_modules/uni-calendar/components/uni-calendar/i18n/en.json
@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "ok",
+	"uni-calender.cancel": "cancel",
+	"uni-calender.today": "today",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN"
+}
diff --git a/uni_modules/uni-calendar/components/uni-calendar/i18n/index.js b/uni_modules/uni-calendar/components/uni-calendar/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-calendar/components/uni-calendar/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-calendar/components/uni-calendar/i18n/zh-Hans.json b/uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hans.json
new file mode 100644
index 0000000..1ca43de
--- /dev/null
+++ b/uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hans.json
@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "确定",
+	"uni-calender.cancel": "取消",
+	"uni-calender.today": "今日",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}
diff --git a/uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hant.json b/uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hant.json
new file mode 100644
index 0000000..e0fe33b
--- /dev/null
+++ b/uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hant.json
@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "確定",
+	"uni-calender.cancel": "取消",
+	"uni-calender.today": "今日",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}
diff --git a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
new file mode 100644
index 0000000..0353011
--- /dev/null
+++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
@@ -0,0 +1,181 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+		'uni-calendar-item--checked':(calendar.fullDate === weeks.fullDate && !weeks.isDay) ,
+		'uni-calendar-item--before-checked':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked':weeks.afterMultiple,
+		}"
+	 @click="choiceDate(weeks)">
+		<view class="uni-calendar-item__weeks-box-item">
+			<text v-if="selected&&weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text" :class="{
+				'uni-calendar-item--isDay-text': weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.date}}</text>
+			<text v-if="!lunar&&!weeks.extraInfo && weeks.isDay" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				}">{{todayText}}</text>
+			<text v-if="lunar&&!weeks.extraInfo" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.isDay ? todayText : (weeks.lunar.IDayCn === '初一'?weeks.lunar.IMonthCn:weeks.lunar.IDayCn)}}</text>
+			<text v-if="weeks.extraInfo&&weeks.extraInfo.info" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--extra':weeks.extraInfo.info,
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.extraInfo.info}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	export default {
+		emits:['change'],
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			}
+		},
+		computed: {
+			todayText() {
+				return t("uni-calender.today")
+			},
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: $uni-font-size-base;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar-item__weeks-lunar-text {
+		font-size: $uni-font-size-sm;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 100rpx;
+		height: 100rpx;
+	}
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: $uni-color-error;
+
+	}
+
+	.uni-calendar-item--disable {
+		background-color: rgba(249, 249, 249, $uni-opacity-disabled);
+		color: $uni-text-color-disable;
+	}
+
+	.uni-calendar-item--isDay-text {
+		color: $uni-color-primary;
+	}
+
+	.uni-calendar-item--isDay {
+		background-color: $uni-color-primary;
+		opacity: 0.8;
+		color: #fff;
+	}
+
+	.uni-calendar-item--extra {
+		color: $uni-color-error;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--checked {
+		background-color: $uni-color-primary;
+		color: #fff;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color: $uni-color-primary;
+		color: #fff;
+		opacity: 0.8;
+	}
+	.uni-calendar-item--before-checked {
+		background-color: #ff5a5f;
+		color: #fff;
+	}
+	.uni-calendar-item--after-checked {
+		background-color: #ff5a5f;
+		color: #fff;
+	}
+</style>
diff --git a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
new file mode 100644
index 0000000..a2c33d0
--- /dev/null
+++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
@@ -0,0 +1,554 @@
+<template>
+	<view class="uni-calendar">
+		<view v-if="!insert&&show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}" @click="clean"></view>
+		<view v-if="insert || show" class="uni-calendar__content" :class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow}">
+			<view v-if="!insert" class="uni-calendar__header uni-calendar--fixed-top">
+				<view class="uni-calendar__header-btn-box" @click="close">
+					<text class="uni-calendar__header-text uni-calendar--fixed-width">{{cancelText}}</text>
+				</view>
+				<view class="uni-calendar__header-btn-box" @click="confirm">
+					<text class="uni-calendar__header-text uni-calendar--fixed-width">{{okText}}</text>
+				</view>
+			</view>
+			<view class="uni-calendar__header">
+				<view class="uni-calendar__header-btn-box" @click.stop="pre">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view>
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text class="uni-calendar__header-text">{{ (nowDate.year||'') +' / '+( nowDate.month||'')}}</text>
+				</picker>
+				<view class="uni-calendar__header-btn-box" @click.stop="next">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+				<text class="uni-calendar__backtoday" @click="backtoday">{{todayText}}</text>
+
+			</view>
+			<view class="uni-calendar__box">
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
+				</view>
+				<view class="uni-calendar__weeks">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{monText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{WEDText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{THUText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{FRIText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SATText}}</text>
+					</view>
+				</view>
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar" :selected="selected" :lunar="lunar" @change="choiceDate"></calendar-item>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Calendar from './util.js';
+	import calendarItem from './uni-calendar-item.vue'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {Boolean} lunar 显示农历
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} insert = [true|false] 插入模式,默认为false
+	 * 	@value true 弹窗模式
+	 * 	@value false 插入模式
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @event {Function} change 日期改变，`insert :ture` 时生效
+	 * @event {Function} confirm 确认选择`insert :false` 时生效
+	 * @event {Function} monthSwitch 切换月份时触发
+	 * @example <uni-calendar :insert="true":lunar="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+	 */
+	export default {
+		components: {
+			calendarItem
+		},
+		emits:['close','confirm','change','monthSwitch'],
+		props: {
+			date: {
+				type: String,
+				default: ''
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			insert: {
+				type: Boolean,
+				default: true
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: '',
+				aniMaskShow: false
+			}
+		},
+		computed:{
+			/**
+			 * for i18n
+			 */
+
+			okText() {
+				return t("uni-calender.ok")
+			},
+			cancelText() {
+				return t("uni-calender.cancel")
+			},
+			todayText() {
+				return t("uni-calender.today")
+			},
+			monText() {
+				return t("uni-calender.MON")
+			},
+			TUEText() {
+				return t("uni-calender.TUE")
+			},
+			WEDText() {
+				return t("uni-calender.WED")
+			},
+			THUText() {
+				return t("uni-calender.THU")
+			},
+			FRIText() {
+				return t("uni-calender.FRI")
+			},
+			SATText() {
+				return t("uni-calender.SAT")
+			},
+			SUNText() {
+				return t("uni-calender.SUN")
+			},
+		},
+		watch: {
+			date(newVal) {
+				// this.cale.setDate(newVal)
+				this.init(newVal)
+			},
+			startDate(val){
+				this.cale.resetSatrtDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			endDate(val){
+				this.cale.resetEndDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			selected(newVal) {
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			}
+		},
+		created() {
+			// 获取日历方法实例
+			this.cale = new Calendar({
+				// date: new Date(),
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+			})
+			// 选中某一天
+			// this.cale.setDate(this.date)
+			this.init(this.date)
+			// this.setDay
+		},
+		methods: {
+			// 取消穿透
+			clean() {},
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				console.log(this.cale.getDate(value));
+				this.init(value)
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.calendar = this.cale.getInfo(date)
+			},
+			/**
+			 * 打开日历弹窗
+			 */
+			open() {
+				// 弹窗模式并且清理数据
+				if (this.clearDate && !this.insert) {
+					this.cale.cleanMultipleStatus()
+					// this.cale.setDate(this.date)
+					this.init(this.date)
+				}
+				this.show = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.aniMaskShow = true
+					}, 50)
+				})
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change() {
+				if (!this.insert) return
+				this.setEmit('change')
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					lunar,
+					extraInfo
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					year,
+					month,
+					date,
+					fulldate: fullDate,
+					lunar,
+					extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				this.calendar = weeks
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate)
+				this.weeks = this.cale.weeks
+				this.change()
+			},
+			/**
+			 * 回到今天
+			 */
+			backtoday() {
+				console.log(this.cale.getDate(new Date()).fullDate);
+				let date = this.cale.getDate(new Date()).fullDate
+				// this.cale.setDate(date)
+				this.init(date)
+				this.change()
+			},
+			/**
+			 * 上个月
+			 */
+			pre() {
+				const preDate = this.cale.getDate(this.nowDate.fullDate, -1, 'month').fullDate
+				this.setDate(preDate)
+				this.monthSwitch()
+
+			},
+			/**
+			 * 下个月
+			 */
+			next() {
+				const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, 'month').fullDate
+				this.setDate(nextDate)
+				this.monthSwitch()
+			},
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: $uni-bg-color-mask;
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		/* #ifdef APP-NVUE */
+		bottom: 0;
+		/* #endif */
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		bottom: calc(var(--window-bottom));
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		background-color: #fff;
+	}
+
+	.uni-calendar__header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+		border-bottom-color: $uni-border-color;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: $uni-border-color;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+		// padding: 0 15px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: $uni-text-color;
+		background-color: $uni-bg-color-hover;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: $uni-font-size-base;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 10px;
+		height: 10px;
+		border-left-color: $uni-text-color-placeholder;
+		border-left-style: solid;
+		border-left-width: 2px;
+		border-top-color: $uni-color-subtitle;
+		border-top-style: solid;
+		border-top-width: 2px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar__weeks-day-text {
+		font-size: 14px;
+	}
+
+	.uni-calendar__box {
+		position: relative;
+	}
+
+	.uni-calendar__box-bg {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: $uni-text-color-grey;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-calendar/components/uni-calendar/util.js b/uni_modules/uni-calendar/components/uni-calendar/util.js
new file mode 100644
index 0000000..bae9273
--- /dev/null
+++ b/uni_modules/uni-calendar/components/uni-calendar/util.js
@@ -0,0 +1,354 @@
+import CALENDAR from './calendar.js'
+
+class Calendar {
+	constructor({
+		date,
+		selected,
+		startDate,
+		endDate,
+		range
+	} = {}) {
+		// 当前日期
+		this.date = this.getDate(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 范围开始
+		this.startDate = startDate
+		// 范围结束
+		this.endDate = endDate
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		// this._getWeek(this.date.fullDate)
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		this.selectDate = this.getDate(date)
+		this._getWeek(this.selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	/**
+	 * 重置开始日期
+	 */
+	resetSatrtDate(startDate) {
+		// 范围开始
+		this.startDate = startDate
+
+	}
+
+	/**
+	 * 重置结束日期
+	 */
+	resetEndDate(endDate) {
+		// 范围结束
+		this.endDate = endDate
+	}
+
+	/**
+	 * 获取任意时间
+	 */
+	getDate(date, AddDayCount = 0, str = 'day') {
+		if (!date) {
+			date = new Date()
+		}
+		if (typeof date !== 'object') {
+			date = date.replace(/-/g, '/')
+		}
+		const dd = new Date(date)
+		switch (str) {
+			case 'day':
+				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+			case 'month':
+				if (dd.getDate() === 31) {
+					dd.setDate(dd.getDate() + AddDayCount)
+				} else {
+					dd.setMonth(dd.getMonth() + AddDayCount) // 获取AddDayCount天后的日期
+				}
+				break
+			case 'year':
+				dd.setFullYear(dd.getFullYear() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+		}
+		const y = dd.getFullYear()
+		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
+		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
+		return {
+			fullDate: y + '-' + m + '-' + d,
+			year: y,
+			month: m,
+			date: d,
+			day: dd.getDay()
+		}
+	}
+
+
+	/**
+	 * 获取上月剩余天数
+	 */
+	_getLastMonthDays(firstDay, full) {
+		let dateArr = []
+		for (let i = firstDay; i > 0; i--) {
+			const beforeDate = new Date(full.year, full.month - 1, -i + 1).getDate()
+			dateArr.push({
+				date: beforeDate,
+				month: full.month - 1,
+				lunar: this.getlunar(full.year, full.month - 1, beforeDate),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+	/**
+	 * 获取本月天数
+	 */
+	_currentMonthDys(dateData, full) {
+		let dateArr = []
+		let fullDate = this.date.fullDate
+		for (let i = 1; i <= dateData; i++) {
+			let isinfo = false
+			let nowDate = full.year + '-' + (full.month < 10 ?
+				full.month : full.month) + '-' + (i < 10 ?
+				'0' + i : i)
+			// 是否今天
+			let isDay = fullDate === nowDate
+			// 获取打点信息
+			let info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(nowDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				// let dateCompBefore = this.dateCompare(this.startDate, fullDate)
+				// disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
+				disableBefore = this.dateCompare(this.startDate, nowDate)
+			}
+
+			if (this.endDate) {
+				// let dateCompAfter = this.dateCompare(fullDate, this.endDate)
+				// disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
+				disableAfter = this.dateCompare(nowDate, this.endDate)
+			}
+			let multiples = this.multipleStatus.data
+			let checked = false
+			let multiplesStatus = -1
+			if (this.range) {
+				if (multiples) {
+					multiplesStatus = multiples.findIndex((item) => {
+						return this.dateEqual(item, nowDate)
+					})
+				}
+				if (multiplesStatus !== -1) {
+					checked = true
+				}
+			}
+			let data = {
+				fullDate: nowDate,
+				year: full.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.dateEqual(this.multipleStatus.before, nowDate),
+				afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate),
+				month: full.month,
+				lunar: this.getlunar(full.year, full.month, i),
+				disable: !(disableBefore && disableAfter),
+				isDay
+			}
+			if (info) {
+				data.extraInfo = info
+			}
+
+			dateArr.push(data)
+		}
+		return dateArr
+	}
+	/**
+	 * 获取下月天数
+	 */
+	_getNextMonthDays(surplus, full) {
+		let dateArr = []
+		for (let i = 1; i < surplus + 1; i++) {
+			dateArr.push({
+				date: i,
+				month: Number(full.month) + 1,
+				lunar: this.getlunar(full.year, Number(full.month) + 1, i),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const dateInfo = this.canlender.find(item => item.fullDate === this.getDate(date).fullDate)
+		return dateInfo
+	}
+
+	/**
+	 * 比较时间大小
+	 */
+	dateCompare(startDate, endDate) {
+		// 计算截止时间
+		startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+		if (startDate <= endDate) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		// 计算截止时间
+		before = new Date(before.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		after = new Date(after.replace('-', '/').replace('-', '/'))
+		if (before.getTime() - after.getTime() === 0) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDate(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+	/**
+	 * 计算阴历日期显示
+	 */
+	getlunar(year, month, date) {
+		return CALENDAR.solar2lunar(year, month, date)
+	}
+	/**
+	 * 设置打点
+	 */
+	setSelectInfo(data, value) {
+		this.selected = value
+		this._getWeek(data)
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+
+		if (!this.range) return
+		if (before && after) {
+			this.multipleStatus.before = ''
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+			} else {
+				this.multipleStatus.after = fullDate
+				if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+				}
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	_getWeek(dateData) {
+		const {
+			fullDate,
+			year,
+			month,
+			date,
+			day
+		} = this.getDate(dateData)
+		let firstDay = new Date(year, month - 1, 1).getDay()
+		let currentDay = new Date(year, month, 0).getDate()
+		let dates = {
+			lastMonthDays: this._getLastMonthDays(firstDay, this.getDate(dateData)), // 上个月末尾几天
+			currentMonthDys: this._currentMonthDys(currentDay, this.getDate(dateData)), // 本月天数
+			nextMonthDays: [], // 下个月开始几天
+			weeks: []
+		}
+		let canlender = []
+		const surplus = 42 - (dates.lastMonthDays.length + dates.currentMonthDys.length)
+		dates.nextMonthDays = this._getNextMonthDays(surplus, this.getDate(dateData))
+		canlender = canlender.concat(dates.lastMonthDays, dates.currentMonthDys, dates.nextMonthDays)
+		let weeks = {}
+		// 拼接数组  上个月开始几天 + 本月天数+ 下个月开始几天
+		for (let i = 0; i < canlender.length; i++) {
+			if (i % 7 === 0) {
+				weeks[parseInt(i / 7)] = new Array(7)
+			}
+			weeks[parseInt(i / 7)][i % 7] = canlender[i]
+		}
+		this.canlender = canlender
+		this.weeks = weeks
+	}
+
+	//静态方法
+	// static init(date) {
+	// 	if (!this.instance) {
+	// 		this.instance = new Calendar(date);
+	// 	}
+	// 	return this.instance;
+	// }
+}
+
+
+export default Calendar
diff --git a/uni_modules/uni-calendar/package.json b/uni_modules/uni-calendar/package.json
new file mode 100644
index 0000000..40455c8
--- /dev/null
+++ b/uni_modules/uni-calendar/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-calendar",
+  "displayName": "uni-calendar 日历",
+  "version": "1.4.5",
+  "description": "日历组件",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "日历",
+    "",
+    "打卡",
+    "日历选择"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": "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-calendar/readme.md b/uni_modules/uni-calendar/readme.md
new file mode 100644
index 0000000..4f3ca0e
--- /dev/null
+++ b/uni_modules/uni-calendar/readme.md
@@ -0,0 +1,103 @@
+
+
+## Calendar 日历
+> **组件名：uni-calendar**
+> 代码块： `uCalendar`
+
+
+日历组件
+
+> **注意事项**
+> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
+> - 本组件农历转换使用的js是 [@1900-2100区间内的公历、农历互转](https://github.com/jjonline/calendar.js)  
+> - 仅支持自定义组件模式
+> - `date`属性传入的应该是一个 String ，如： 2019-06-27 ，而不是 new Date()
+> - 通过 `insert` 属性来确定当前的事件是 @change 还是 @confirm 。理应合并为一个事件，但是为了区分模式，现使用两个事件，这里需要注意
+> - 弹窗模式下无法阻止后面的元素滚动，如有需要阻止，请在弹窗弹出后，手动设置滚动元素为不可滚动
+
+
+### 安装方式
+
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
+
+### 基本用法
+
+在 ``template`` 中使用组件
+
+```html
+<view>
+	<uni-calendar 
+	:insert="true"
+	:lunar="true" 
+	:start-date="'2019-3-2'"
+	:end-date="'2019-5-20'"
+	@change="change"
+	 />
+</view>
+```
+
+### 通过方法打开日历
+
+需要设置 `insert` 为 `false`
+
+```html
+<view>
+	<uni-calendar 
+	ref="calendar"
+	:insert="false"
+	@confirm="confirm"
+	 />
+	 <button @click="open">打开日历</button>
+</view>
+```
+
+```javascript
+
+export default {
+	data() {
+		return {};
+	},
+	methods: {
+		open(){
+			this.$refs.calendar.open();
+		},
+		confirm(e) {
+			console.log(e);
+		}
+	}
+};
+
+```
+
+
+## API
+
+### Calendar Props
+
+|  属性名	|    类型	| 默认值| 说明																													|
+| 		| 																													|
+| date		| String	|-		| 自定义当前时间，默认为今天																							|
+| lunar		| Boolean	| false	| 显示农历																												|
+| startDate	| String	|-		| 日期选择范围-开始日期																									|
+| endDate	| String	|-		| 日期选择范围-结束日期																									|
+| range		| Boolean	| false	| 范围选择																												|
+| insert	| Boolean	| false	| 插入模式,可选值，ture：插入模式；false：弹窗模式；默认为插入模式														|
+|clearDate	|Boolean	|true	|弹窗模式是否清空上次选择内容	|
+| selected	| Array		|-		| 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]	|
+|showMonth	| Boolean	| true	| 是否显示月份为背景																									|
+
+### Calendar Events
+
+|  事件名		| 说明								|返回值|
+| 								|		| 									|
+| open	| 弹出日历组件，`insert :false` 时生效|- 	|
+
+
+
+
+
+## 组件示例
+
+点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/calendar/calendar](https://hellouniapp.dcloud.net.cn/pages/extUI/calendar/calendar)
\ No newline at end of file
diff --git a/uni_modules/uni-card/changelog.md b/uni_modules/uni-card/changelog.md
new file mode 100644
index 0000000..c3cd8c4
--- /dev/null
+++ b/uni_modules/uni-card/changelog.md
@@ -0,0 +1,26 @@
+## 1.3.1（2021-12-20）
+- 修复 在vue页面下略缩图显示不正常的bug
+## 1.3.0（2021-11-19）
+- 重构插槽的用法 ，header 替换为 title 
+- 新增 actions 插槽
+- 新增 cover 封面图属性和插槽
+- 新增 padding 内容默认内边距离
+- 新增 margin 卡片默认外边距离
+- 新增 spacing 卡片默认内边距
+- 新增 shadow 卡片阴影属性
+- 取消 mode 属性，可使用组合插槽代替
+- 取消 note 属性 ，使用actions插槽代替
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-card](https://uniapp.dcloud.io/component/uniui/uni-card)
+## 1.2.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.8（2021-07-01）
+- 优化 图文卡片无图片加载时，提供占位图标
+- 新增 header 插槽，自定义卡片头部（ 图文卡片 mode="style" 时，不支持）
+- 修复 thumbnail 不存在仍然占位的 bug
+## 1.1.7（2021-05-12）
+- 新增 组件示例地址
+## 1.1.6（2021-02-04）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-card/components/uni-card/uni-card.vue b/uni_modules/uni-card/components/uni-card/uni-card.vue
new file mode 100644
index 0000000..38cf594
--- /dev/null
+++ b/uni_modules/uni-card/components/uni-card/uni-card.vue
@@ -0,0 +1,270 @@
+<template>
+	<view class="uni-card" :class="{ 'uni-card--full': isFull, 'uni-card--shadow': isShadow,'uni-card--border':border}"
+		:style="{'margin':isFull?0:margin,'padding':spacing,'box-shadow':isShadow?shadow:''}">
+		<!-- 封面 -->
+		<slot name="cover">
+			<view v-if="cover" class="uni-card__cover">
+				<image class="uni-card__cover-image" mode="widthFix" @click="onClick('cover')" :src="cover"></image>
+			</view>
+		</slot>
+		<slot name="title">
+			<view v-if="title || extra" class="uni-card__header">
+				<!-- 卡片标题 -->
+				<view class="uni-card__header-box" @click="onClick('title')">
+					<view v-if="thumbnail" class="uni-card__header-avatar">
+						<image class="uni-card__header-avatar-image" :src="thumbnail" mode="aspectFit" />
+					</view>
+					<view class="uni-card__header-content">
+						<text class="uni-card__header-content-title uni-ellipsis">{{ title }}</text>
+						<text v-if="title&&subTitle"
+							class="uni-card__header-content-subtitle uni-ellipsis">{{ subTitle }}</text>
+					</view>
+				</view>
+				<view class="uni-card__header-extra" @click="onClick('extra')">
+					<text class="uni-card__header-extra-text">{{ extra }}</text>
+				</view>
+			</view>
+		</slot>
+		<!-- 卡片内容 -->
+		<view class="uni-card__content" :style="{padding:padding}" @click="onClick('content')">
+			<slot></slot>
+		</view>
+		<view class="uni-card__actions" @click="onClick('actions')">
+			<slot name="actions"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Card 卡片
+	 * @description 卡片视图组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=22
+	 * @property {String} title 标题文字
+	 * @property {String} subTitle 副标题
+	 * @property {Number} padding 内容内边距
+	 * @property {Number} margin 卡片外边距
+	 * @property {Number} spacing 卡片内边距
+	 * @property {String} extra 标题额外信息
+	 * @property {String} cover 封面图（本地路径需要引入）
+	 * @property {String} thumbnail 标题左侧缩略图
+	 * @property {Boolean} is-full = [true | false] 卡片内容是否通栏，为 true 时将去除padding值
+	 * @property {Boolean} is-shadow = [true | false] 卡片内容是否开启阴影
+	 * @property {String} shadow 卡片阴影
+	 * @property {Boolean} border 卡片边框
+	 * @event {Function} click 点击 Card 触发事件
+	 */
+	export default {
+		name: 'UniCard',
+		emits: ['click'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			subTitle: {
+				type: String,
+				default: ''
+			},
+			padding: {
+				type: String,
+				default: '10px'
+			},
+			margin: {
+				type: String,
+				default: '15px'
+			},
+			spacing: {
+				type: String,
+				default: '0 10px'
+			},
+			extra: {
+				type: String,
+				default: ''
+			},
+			cover: {
+				type: String,
+				default: ''
+			},
+			thumbnail: {
+				type: String,
+				default: ''
+			},
+			isFull: {
+				// 内容区域是否通栏
+				type: Boolean,
+				default: false
+			},
+			isShadow: {
+				// 是否开启阴影
+				type: Boolean,
+				default: true
+			},
+			shadow: {
+				type: String,
+				default: '0px 0px 3px 1px rgba(0, 0, 0, 0.08)'
+			},
+			border: {
+				type: Boolean,
+				default: true
+			}
+		},
+		methods: {
+			onClick(type) {
+				this.$emit('click', type)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-border-3: #EBEEF5 !default;
+	$uni-shadow-base:0 0px 6px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+	$uni-main-color: #3a3a3a !default;
+	$uni-base-color: #6a6a6a !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-spacing-sm: 8px !default;
+	$uni-border-color:$uni-border-3;
+	$uni-shadow: $uni-shadow-base;
+	$uni-card-title: 15px;
+	$uni-cart-title-color:$uni-main-color;
+	$uni-card-subtitle: 12px;
+	$uni-cart-subtitle-color:$uni-secondary-color;
+	$uni-card-spacing: 10px;
+	$uni-card-content-color: $uni-base-color;
+
+	.uni-card {
+		margin: $uni-card-spacing;
+		padding: 0 $uni-spacing-sm;
+		border-radius: 4px;
+		overflow: hidden;
+		font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+		background-color: #fff;
+		flex: 1;
+
+		.uni-card__cover {
+			position: relative;
+			margin-top: $uni-card-spacing;
+			flex-direction: row;
+			overflow: hidden;
+			border-radius: 4px;
+			.uni-card__cover-image {
+				flex: 1;
+				// width: 100%;
+				/* #ifndef APP-PLUS */
+				vertical-align: middle;
+				/* #endif */
+			}
+		}
+
+		.uni-card__header {
+			display: flex;
+			border-bottom: 1px $uni-border-color solid;
+			flex-direction: row;
+			align-items: center;
+			padding: $uni-card-spacing;
+			overflow: hidden;
+
+			.uni-card__header-box {
+				/* #ifndef APP-NVUE */
+				display: flex;
+				/* #endif */
+				flex: 1;
+				flex-direction: row;
+				align-items: center;
+				overflow: hidden;
+			}
+
+			.uni-card__header-avatar {
+				width: 40px;
+				height: 40px;
+				overflow: hidden;
+				border-radius: 5px;
+				margin-right: $uni-card-spacing;
+				.uni-card__header-avatar-image {
+					flex: 1;
+					width: 40px;
+					height: 40px;
+				}
+			}
+
+			.uni-card__header-content {
+				/* #ifndef APP-NVUE */
+				display: flex;
+				/* #endif */
+				flex-direction: column;
+				justify-content: center;
+				flex: 1;
+				// height: 40px;
+				overflow: hidden;
+
+				.uni-card__header-content-title {
+					font-size: $uni-card-title;
+					color: $uni-cart-title-color;
+					// line-height: 22px;
+				}
+
+				.uni-card__header-content-subtitle {
+					font-size: $uni-card-subtitle;
+					margin-top: 5px;
+					color: $uni-cart-subtitle-color;
+				}
+			}
+
+			.uni-card__header-extra {
+				line-height: 12px;
+
+				.uni-card__header-extra-text {
+					font-size: 12px;
+					color: $uni-cart-subtitle-color;
+				}
+			}
+		}
+
+		.uni-card__content {
+			padding: $uni-card-spacing;
+			font-size: 14px;
+			color: $uni-card-content-color;
+			line-height: 22px;
+		}
+
+		.uni-card__actions {
+			font-size: 12px;
+		}
+	}
+
+	.uni-card--border {
+		border: 1px solid $uni-border-color;
+	}
+
+	.uni-card--shadow {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		box-shadow: $uni-shadow;
+		/* #endif */
+	}
+
+	.uni-card--full {
+		margin: 0;
+		border-left-width: 0;
+		border-left-width: 0;
+		border-radius: 0;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-card--full:after {
+		border-radius: 0;
+	}
+
+	/* #endif */
+	.uni-ellipsis {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-card/package.json b/uni_modules/uni-card/package.json
new file mode 100644
index 0000000..f16224d
--- /dev/null
+++ b/uni_modules/uni-card/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uni-card",
+  "displayName": "uni-card 卡片",
+  "version": "1.3.1",
+  "description": "Card 组件，提供常见的卡片样式。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "card",
+    "",
+    "卡片"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-icons",
+			"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"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-card/readme.md b/uni_modules/uni-card/readme.md
new file mode 100644
index 0000000..7434e71
--- /dev/null
+++ b/uni_modules/uni-card/readme.md
@@ -0,0 +1,12 @@
+
+
+## Card 卡片
+> **组件名：uni-card**
+> 代码块： `uCard`
+
+卡片视图组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-card)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-collapse/changelog.md b/uni_modules/uni-collapse/changelog.md
new file mode 100644
index 0000000..292e4c7
--- /dev/null
+++ b/uni_modules/uni-collapse/changelog.md
@@ -0,0 +1,36 @@
+## 1.4.3（2022-01-25）
+- 修复 初始化的时候 ，open 属性失效的bug
+## 1.4.2（2022-01-21）
+- 修复 微信小程序resize后组件收起的bug
+## 1.4.1（2021-11-22）
+- 修复 vue3中个别scss变量无法找到的问题
+## 1.4.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-collapse](https://uniapp.dcloud.io/component/uniui/uni-collapse)
+## 1.3.3（2021-08-17）
+- 优化 show-arrow 属性默认为true
+## 1.3.2（2021-08-17）
+- 新增 show-arrow 属性，控制是否显示右侧箭头
+## 1.3.1（2021-07-30）
+- 优化 vue3下小程序事件警告的问题
+## 1.3.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.2（2021-07-21）
+- 修复 由1.2.0版本引起的 change 事件返回 undefined 的Bug
+## 1.2.1（2021-07-21）
+- 优化 组件示例
+## 1.2.0（2021-07-21）
+- 新增 组件折叠动画
+- 新增 value\v-model 属性 ，动态修改面板折叠状态
+- 新增 title 插槽 ，可定义面板标题
+- 新增 border 属性 ，显示隐藏面板内容分隔线
+- 新增 title-border 属性 ，显示隐藏面板标题分隔线
+- 修复 resize 方法失效的Bug
+- 修复 change 事件返回参数不正确的Bug
+- 优化 H5、App 平台自动更具内容更新高度，无需调用 reszie() 方法
+## 1.1.7（2021-05-12）
+- 新增 组件示例地址
+## 1.1.6（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.1.5（2021-02-05）
+- 调整为uni_modules目录规范
\ No newline at end of file
diff --git a/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue b/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
new file mode 100644
index 0000000..50a72a5
--- /dev/null
+++ b/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
@@ -0,0 +1,404 @@
+<template>
+	<view class="uni-collapse-item">
+		<!-- onClick(!isOpen) -->
+		<view @click="onClick(!isOpen)" class="uni-collapse-item__title"
+			:class="{'is-open':isOpen &&titleBorder === 'auto' ,'uni-collapse-item-border':titleBorder !== 'none'}">
+			<view class="uni-collapse-item__title-wrap">
+				<slot name="title">
+					<view class="uni-collapse-item__title-box" :class="{'is-disabled':disabled}">
+						<image v-if="thumb" :src="thumb" class="uni-collapse-item__title-img" />
+						<text class="uni-collapse-item__title-text">{{ title }}</text>
+					</view>
+				</slot>
+			</view>
+			<view v-if="showArrow"
+				:class="{ 'uni-collapse-item__title-arrow-active': isOpen, 'uni-collapse-item--animation': showAnimation === true }"
+				class="uni-collapse-item__title-arrow">
+				<uni-icons :color="disabled?'#ddd':'#bbb'" size="14" type="bottom" />
+			</view>
+		</view>
+		<view class="uni-collapse-item__wrap" :class="{'is--transition':showAnimation}"
+			:style="{height: (isOpen?height:0) +'px'} ">
+			<view :id="elId" ref="collapse--hook" class="uni-collapse-item__wrap-content"
+				:class="{open:isheight,'uni-collapse-item--border':border&&isOpen}" style="background-color: #fff;">
+				<slot></slot>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = weex.requireModule('dom')
+	// #endif
+	/**
+	 * CollapseItem 折叠面板子组件
+	 * @description 折叠面板子组件
+	 * @property {String} title 标题文字
+	 * @property {String} thumb 标题左侧缩略图
+	 * @property {String} name 唯一标志符
+	 * @property {Boolean} open = [true|false] 是否展开组件
+	 * @property {Boolean} titleBorder = [true|false] 是否显示标题分隔线
+	 * @property {Boolean} border = [true|false] 是否显示分隔线
+	 * @property {Boolean} disabled = [true|false] 是否展开面板
+	 * @property {Boolean} showAnimation = [true|false] 开启动画
+	 * @property {Boolean} showArrow = [true|false] 是否显示右侧箭头
+	 */
+	export default {
+		name: 'uniCollapseItem',
+		props: {
+			// 列表标题
+			title: {
+				type: String,
+				default: ''
+			},
+			name: {
+				type: [Number, String],
+				default: ''
+			},
+			// 是否禁用
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// #ifdef APP-PLUS
+			// 是否显示动画,app 端默认不开启动画，卡顿严重
+			showAnimation: {
+				type: Boolean,
+				default: false
+			},
+			// #endif
+			// #ifndef APP-PLUS
+			// 是否显示动画
+			showAnimation: {
+				type: Boolean,
+				default: true
+			},
+			// #endif
+			// 是否展开
+			open: {
+				type: Boolean,
+				default: false
+			},
+			// 缩略图
+			thumb: {
+				type: String,
+				default: ''
+			},
+			// 标题分隔线显示类型
+			titleBorder: {
+				type: String,
+				default: 'auto'
+			},
+			border: {
+				type: Boolean,
+				default: true
+			},
+			showArrow: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			// TODO 随机生生元素ID，解决百度小程序获取同一个元素位置信息的bug
+			const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			return {
+				isOpen: false,
+				isheight: null,
+				height: 0,
+				elId,
+				nameSync: 0
+			}
+		},
+		watch: {
+			open(val) {
+				this.isOpen = val
+				this.onClick(val, 'init')
+			}
+		},
+		updated(e) {
+			this.$nextTick(() => {
+				this.init(true)
+			})
+		},
+		created() {
+			this.collapse = this.getCollapse()
+			this.oldHeight = 0
+			this.onClick(this.open, 'init')
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			if (this.__isUnmounted) return
+			this.uninstall()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.__isUnmounted = true
+			this.uninstall()
+		},
+		// #endif
+		mounted() {
+			if (!this.collapse) return
+			if (this.name !== '') {
+				this.nameSync = this.name
+			} else {
+				this.nameSync = this.collapse.childrens.length + ''
+			}
+			if (this.collapse.names.indexOf(this.nameSync) === -1) {
+				this.collapse.names.push(this.nameSync)
+			} else {
+				console.warn(`name 值 ${this.nameSync} 重复`);
+			}
+			if (this.collapse.childrens.indexOf(this) === -1) {
+				this.collapse.childrens.push(this)
+			}
+			this.init()
+		},
+		methods: {
+			init(type) {
+				// #ifndef APP-NVUE
+				this.getCollapseHeight(type)
+				// #endif
+				// #ifdef APP-NVUE
+				this.getNvueHwight(type)
+				// #endif
+			},
+			uninstall() {
+				if (this.collapse) {
+					this.collapse.childrens.forEach((item, index) => {
+						if (item === this) {
+							this.collapse.childrens.splice(index, 1)
+						}
+					})
+					this.collapse.names.forEach((item, index) => {
+						if (item === this.nameSync) {
+							this.collapse.names.splice(index, 1)
+						}
+					})
+				}
+			},
+			onClick(isOpen, type) {
+				if (this.disabled) return
+				this.isOpen = isOpen
+				if (this.isOpen && this.collapse) {
+					this.collapse.setAccordion(this)
+				}
+				if (type !== 'init') {
+					this.collapse.onChange(isOpen, this)
+				}
+			},
+			getCollapseHeight(type, index = 0) {
+				const views = uni.createSelectorQuery().in(this)
+				views
+					.select(`#${this.elId}`)
+					.fields({
+						size: true
+					}, data => {
+						// TODO 百度中可能获取不到节点信息 ，需要循环获取
+						if (index >= 10) return
+						if (!data) {
+							index++
+							this.getCollapseHeight(false, index)
+							return
+						}
+					 
+						// #ifdef APP-NVUE
+						this.height = data.height + 1
+						// #endif
+						// #ifndef APP-NVUE
+						this.height = data.height
+						// #endif
+						this.isheight = true
+						if (type) return
+						this.onClick(this.isOpen, 'init')
+					})
+					.exec()
+			},
+			getNvueHwight(type) {
+				const result = dom.getComponentRect(this.$refs['collapse--hook'], option => {
+					if (option && option.result && option.size) {
+						
+						// #ifdef APP-NVUE
+						this.height = option.size.height + 1
+						// #endif
+						// #ifndef APP-NVUE
+						this.height = option.size.height
+						// #endif
+						this.isheight = true
+						if (type) return
+						this.onClick(this.open, 'init')
+					}
+				})
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getCollapse(name = 'uniCollapse') {
+				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;
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-collapse-item {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+
+		/* #endif */
+		&__title {
+			/* #ifndef APP-NVUE */
+			display: flex;
+			width: 100%;
+			box-sizing: border-box;
+			/* #endif */
+			flex-direction: row;
+			align-items: center;
+			transition: border-bottom-color .3s;
+
+			// transition-property: border-bottom-color;
+			// transition-duration: 5s;
+			&-wrap {
+				width: 100%;
+				flex: 1;
+
+			}
+
+			&-box {
+				padding: 0 15px;
+				/* #ifndef APP-NVUE */
+				display: flex;
+				width: 100%;
+				box-sizing: border-box;
+				/* #endif */
+				flex-direction: row;
+				justify-content: space-between;
+				align-items: center;
+				height: 48px;
+				line-height: 48px;
+				background-color: #fff;
+				color: #303133;
+				font-size: 13px;
+				font-weight: 500;
+				/* #ifdef H5 */
+				cursor: pointer;
+				outline: none;
+
+				/* #endif */
+				&.is-disabled {
+					.uni-collapse-item__title-text {
+						color: #999;
+					}
+				}
+
+			}
+
+			&.uni-collapse-item-border {
+				border-bottom: 1px solid #ebeef5;
+			}
+
+			&.is-open {
+				border-bottom-color: transparent;
+			}
+
+			&-img {
+				height: 22px;
+				width: 22px;
+				margin-right: 10px;
+			}
+
+			&-text {
+				flex: 1;
+				font-size: 14px;
+				/* #ifndef APP-NVUE */
+				white-space: nowrap;
+				color: inherit;
+				/* #endif */
+				/* #ifdef APP-NVUE */
+				lines: 1;
+				/* #endif */
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+
+			&-arrow {
+				/* #ifndef APP-NVUE */
+				display: flex;
+				box-sizing: border-box;
+				/* #endif */
+				align-items: center;
+				justify-content: center;
+				width: 20px;
+				height: 20px;
+				margin-right: 10px;
+				transform: rotate(0deg);
+
+				&-active {
+					transform: rotate(-180deg);
+				}
+			}
+
+
+		}
+
+		&__wrap {
+			/* #ifndef APP-NVUE */
+			will-change: height;
+			box-sizing: border-box;
+			/* #endif */
+			background-color: #fff;
+			overflow: hidden;
+			position: relative;
+			height: 0;
+
+			&.is--transition {
+				// transition: all 0.3s;
+				transition-property: height, border-bottom-width;
+				transition-duration: 0.3s;
+				/* #ifndef APP-NVUE */
+				will-change: height;
+				/* #endif */
+			}
+
+
+
+			&-content {
+				position: absolute;
+				font-size: 13px;
+				color: #303133;
+				// transition: height 0.3s;
+				border-bottom-color: transparent;
+				border-bottom-style: solid;
+				border-bottom-width: 0;
+
+				&.uni-collapse-item--border {
+					border-bottom-width: 1px;
+					border-bottom-color: red;
+					border-bottom-color: #ebeef5;
+				}
+
+				&.open {
+					position: relative;
+				}
+			}
+		}
+
+		&--animation {
+			transition-property: transform;
+			transition-duration: 0.3s;
+			transition-timing-function: ease;
+		}
+
+	}
+</style>
diff --git a/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue b/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue
new file mode 100644
index 0000000..384c39a
--- /dev/null
+++ b/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue
@@ -0,0 +1,147 @@
+<template>
+	<view class="uni-collapse">
+		<slot />
+	</view>
+</template>
+<script>
+	/**
+	 * Collapse 折叠面板
+	 * @description 展示可以折叠 / 展开的内容区域
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=23
+	 * @property {String|Array} value 当前激活面板改变时触发(如果是手风琴模式，参数类型为string，否则为array)
+	 * @property {Boolean} accordion = [true|false] 是否开启手风琴效果是否开启手风琴效果
+	 * @event {Function} change 切换面板时触发，如果是手风琴模式，返回类型为string，否则为array
+	 */
+	export default {
+		name: 'uniCollapse',
+		emits:['change','activeItem','input','update:modelValue'],
+		props: {
+			value: {
+				type: [String, Array],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Array],
+				default: ''
+			},
+			accordion: {
+				// 是否开启手风琴效果
+				type: [Boolean, String],
+				default: false
+			},
+		},
+		data() {
+			return {}
+		},
+		computed: {
+			// TODO 兼容 vue2 和 vue3
+			dataValue() {
+				let value = (typeof this.value === 'string' && this.value === '') ||
+					(Array.isArray(this.value) && this.value.length === 0)
+				let modelValue = (typeof this.modelValue === 'string' && this.modelValue === '') ||
+					(Array.isArray(this.modelValue) && this.modelValue.length === 0)
+				if (value) {
+					return this.modelValue
+				}
+				if (modelValue) {
+					return this.value
+				}
+
+				return this.value
+			}
+		},
+		watch: {
+			dataValue(val) {
+				this.setOpen(val)
+			}
+		},
+		created() {
+			this.childrens = []
+			this.names = []
+		},
+		mounted() {
+			this.$nextTick(()=>{
+				this.setOpen(this.dataValue)
+			})
+		},
+		methods: {
+			setOpen(val) {
+				let str = typeof val === 'string'
+				let arr = Array.isArray(val)
+				this.childrens.forEach((vm, index) => {
+					if (str) {
+						if (val === vm.nameSync) {
+							if (!this.accordion) {
+								console.warn('accordion 属性为 false ,v-model 类型应该为 array')
+								return
+							}
+							vm.isOpen = true
+						}
+					}
+					if (arr) {
+						val.forEach(v => {
+							if (v === vm.nameSync) {
+								if (this.accordion) {
+									console.warn('accordion 属性为 true ,v-model 类型应该为 string')
+									return
+								}
+								vm.isOpen = true
+							}
+						})
+					}
+				})
+				this.emit(val)
+			},
+			setAccordion(self) {
+				if (!this.accordion) return
+				this.childrens.forEach((vm, index) => {
+					if (self !== vm) {
+						vm.isOpen = false
+					}
+				})
+			},
+			resize() {
+				this.childrens.forEach((vm, index) => {
+					// #ifndef APP-NVUE
+					vm.getCollapseHeight()
+					// #endif
+					// #ifdef APP-NVUE
+					vm.getNvueHwight()
+					// #endif
+				})
+			},
+			onChange(isOpen, self) {
+				let activeItem = []
+
+				if (this.accordion) {
+					activeItem = isOpen ? self.nameSync : ''
+				} else {
+					this.childrens.forEach((vm, index) => {
+						if (vm.isOpen) {
+							activeItem.push(vm.nameSync)
+						}
+					})
+				}
+				this.$emit('change', activeItem)
+				this.emit(activeItem)
+			},
+			emit(val){
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-collapse {
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		display: flex;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+		flex-direction: column;
+		background-color: #fff;
+	}
+</style>
diff --git a/uni_modules/uni-collapse/package.json b/uni_modules/uni-collapse/package.json
new file mode 100644
index 0000000..65349cf
--- /dev/null
+++ b/uni_modules/uni-collapse/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "uni-collapse",
+  "displayName": "uni-collapse 折叠面板",
+  "version": "1.4.3",
+  "description": "Collapse 组件，可以折叠 / 展开的内容区域。",
+  "keywords": [
+    "uni-ui",
+    "折叠",
+    "折叠面板",
+    "手风琴"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+      "uni-icons"
+    ],
+    "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-collapse/readme.md b/uni_modules/uni-collapse/readme.md
new file mode 100644
index 0000000..bc758eb
--- /dev/null
+++ b/uni_modules/uni-collapse/readme.md
@@ -0,0 +1,12 @@
+
+
+## Collapse 折叠面板
+> **组件名：uni-collapse**
+> 代码块： `uCollapse`
+> 关联组件：`uni-collapse-item`、`uni-icons`。
+
+
+折叠面板用来折叠/显示过长的内容或者是列表。通常是在多内容分类项使用，折叠不重要的内容，显示重要内容。点击可以展开折叠部分。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-collapse)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-combox/changelog.md b/uni_modules/uni-combox/changelog.md
new file mode 100644
index 0000000..23c2748
--- /dev/null
+++ b/uni_modules/uni-combox/changelog.md
@@ -0,0 +1,15 @@
+## 1.0.1（2021-11-23）
+- 优化 label、label-width 属性
+## 1.0.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-combox](https://uniapp.dcloud.io/component/uniui/uni-combox)
+## 0.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.0.6（2021-05-12）
+- 新增 组件示例地址
+## 0.0.5（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 0.0.4（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 0.0.3（2021-02-04）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-combox/components/uni-combox/uni-combox.vue b/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
new file mode 100644
index 0000000..fe3b2d6
--- /dev/null
+++ b/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
@@ -0,0 +1,297 @@
+<template>
+	<view class="uni-combox" :class="border ? '' : 'uni-combox__no-border'">
+		<view v-if="label" class="uni-combox__label" :style="labelStyle">
+			<text>{{label}}</text>
+		</view>
+		<view class="uni-combox__input-box" :style="inputStyle">
+			<input class="uni-combox__input " type="text" :placeholder="placeholder" 
+			placeholder-class="uni-combox__input-plac" v-model="inputVal" @input="onInput" @focus="onFocus" 
+@blur="onBlur" @confirm ="confirm"/>
+			<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" @click="toggleSelector">
+			</uni-icons>
+		</view>
+		<view class="uni-combox__selector" v-if="showSelector">
+			<view class="uni-popper__arrow"></view>
+			<scroll-view scroll-y="true" class="uni-combox__selector-scroll">
+				<view class="uni-combox__selector-empty" v-if="filterCandidatesLength === 0">
+					<text>{{emptyTips}}</text>
+				</view>
+				<view class="uni-combox__selector-item" v-for="(item,index) in filterCandidates" :key="index" 
+				@click="onSelectorClick(index)">
+					<text>{{item}}</text>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Combox 组合输入框
+	 * @description 组合输入框一般用于既可以输入也可以选择的场景
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=1261
+	 * @property {String} label 左侧文字
+	 * @property {String} labelWidth 左侧内容宽度
+	 * @property {String} placeholder 输入框占位符
+	 * @property {Array} candidates 候选项列表
+	 * @property {String} emptyTips 筛选结果为空时显示的文字
+	 * @property {String} value 组合框的值
+	 */
+	export default {
+		name: 'uniCombox',
+		emits: ['input', 'update:modelValue','confirm'],
+		props: {
+			border: {
+				type: Boolean,
+				default: true
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			labelWidth: {
+				type: String,
+				default: 'auto'
+			},
+			inputWidth:{
+				type: String,
+				default: 'auto'
+			},
+			placeholder: {
+				type: String,
+				default: ''
+			},
+			candidates: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			emptyTips: {
+				type: String,
+				default: '无匹配项'
+			},
+			// #ifndef VUE3
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			// #endif
+		},
+		data() {
+			return {
+				showSelector: false,
+				inputVal: ''
+			}
+		},
+		computed: {
+			labelStyle() {
+				if (this.labelWidth === 'auto') {
+					return ""
+				}
+				
+				return `width: ${this.labelWidth}`
+			},
+			
+			inputStyle(){
+				if (this.inputWidth === 'auto') {
+					return ""
+				}
+				
+				return `width: ${this.inputWidth}`
+			},
+			filterCandidates() {
+				// return this.candidates.filter((item) => {
+				// 	return item.toString().indexOf(this.inputVal) > -1
+				// })
+				return this.candidates;
+			},
+			filterCandidatesLength() {
+				return this.filterCandidates.length
+			}
+		},
+		watch: {
+			// #ifndef VUE3
+			value: {
+				handler(newVal) {
+					this.inputVal = newVal
+				},
+				immediate: true
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				handler(newVal) {
+					this.inputVal = newVal
+				},
+				immediate: true
+			},
+			// #endif
+		},
+		methods: {
+			toggleSelector() {
+				this.showSelector = !this.showSelector
+			},
+			onFocus() {
+				this.showSelector = true
+			},
+			onBlur() {
+				setTimeout(() => {
+					this.showSelector = false
+				}, 153)
+			},
+			onSelectorClick(index) {
+				this.inputVal = this.filterCandidates[index]
+				this.showSelector = false
+				this.$emit('input', this.inputVal)
+				this.$emit('update:modelValue', this.inputVal)
+			},
+			onInput() {
+				setTimeout(() => {
+					this.$emit('input', this.inputVal)
+					this.$emit('update:modelValue', this.inputVal)
+				})
+			},
+			confirm(){
+				setTimeout(() => {
+					this.$emit('confirm', this.inputVal)
+					this.$emit('update:modelValue', this.inputVal)
+				})
+			}
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-combox {
+		font-size: 14px;
+		border: 1px solid #DCDFE6;
+		border-radius: 4px;
+		padding: 6px 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		// height: 40px;
+		flex-direction: row;
+		align-items: center;
+		// border-bottom: solid 1px #DDDDDD;
+	}
+
+	.uni-combox__label {
+		font-size: 16px;
+		line-height: 22px;
+		padding-right: 10px;
+		color: #999999;
+	}
+
+	.uni-combox__input-box {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-combox__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-combox__input-plac {
+		font-size: 14px;
+		color: #999;
+	}
+
+	.uni-combox__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 2;
+		padding: 4px 0;
+	}
+
+	.uni-combox__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		height: 200rpx;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.uni-combox__selector-empty,
+	.uni-combox__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 36px;
+		font-size: 14px;
+		text-align: center;
+		// border-bottom: solid 1px #DDDDDD;
+		padding: 0px 10px;
+	}
+
+	.uni-combox__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-combox__selector-empty:last-child,
+	.uni-combox__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	// picker 弹出层通用的指示小三角
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-combox__no-border {
+		border: none;
+	}
+</style>
diff --git a/uni_modules/uni-combox/package.json b/uni_modules/uni-combox/package.json
new file mode 100644
index 0000000..4a05c3f
--- /dev/null
+++ b/uni_modules/uni-combox/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uni-combox",
+  "displayName": "uni-combox 组合框",
+  "version": "1.0.1",
+  "description": "可以选择也可以输入的表单项 ",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "combox",
+    "组合框",
+    "select"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "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-combox/readme.md b/uni_modules/uni-combox/readme.md
new file mode 100644
index 0000000..ffa2cc8
--- /dev/null
+++ b/uni_modules/uni-combox/readme.md
@@ -0,0 +1,11 @@
+
+
+## Combox 组合框
+> **组件名：uni-combox**
+> 代码块： `uCombox`
+
+
+组合框组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-combox)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-countdown/changelog.md b/uni_modules/uni-countdown/changelog.md
new file mode 100644
index 0000000..f25beef
--- /dev/null
+++ b/uni_modules/uni-countdown/changelog.md
@@ -0,0 +1,24 @@
+## 1.2.2（2022-01-19）
+- 修复 在微信小程序中样式不生效的bug
+## 1.2.1（2022-01-18）
+- 新增 update 方法 ，在动态更新时间后，刷新组件
+## 1.2.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-countdown](https://uniapp.dcloud.io/component/uniui/uni-countdown)
+## 1.1.3（2021-10-18）
+- 重构
+- 新增 font-size 支持自定义字体大小
+## 1.1.2（2021-08-24）
+- 新增 支持国际化
+## 1.1.1（2021-07-30）
+- 优化 vue3下小程序事件警告的问题
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.5（2021-06-18）
+- 修复 uni-countdown 重复赋值跳两秒的 bug
+## 1.0.4（2021-05-12）
+- 新增 组件示例地址
+## 1.0.3（2021-05-08）
+- 修复 uni-countdown 不能控制倒计时的 bug
+## 1.0.2（2021-02-04）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-countdown/components/uni-countdown/i18n/en.json b/uni_modules/uni-countdown/components/uni-countdown/i18n/en.json
new file mode 100644
index 0000000..06309cb
--- /dev/null
+++ b/uni_modules/uni-countdown/components/uni-countdown/i18n/en.json
@@ -0,0 +1,6 @@
+{
+	"uni-countdown.day": "day",
+	"uni-countdown.h": "h",
+	"uni-countdown.m": "m",
+	"uni-countdown.s": "s"
+}
diff --git a/uni_modules/uni-countdown/components/uni-countdown/i18n/index.js b/uni_modules/uni-countdown/components/uni-countdown/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-countdown/components/uni-countdown/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-countdown/components/uni-countdown/i18n/zh-Hans.json b/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hans.json
new file mode 100644
index 0000000..358cdd1
--- /dev/null
+++ b/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hans.json
@@ -0,0 +1,6 @@
+{
+	"uni-countdown.day": "天",
+	"uni-countdown.h": "时",
+	"uni-countdown.m": "分",
+	"uni-countdown.s": "秒"
+}
diff --git a/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hant.json b/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hant.json
new file mode 100644
index 0000000..e5a63de
--- /dev/null
+++ b/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hant.json
@@ -0,0 +1,6 @@
+{
+	"uni-countdown.day": "天",
+	"uni-countdown.h": "時",
+	"uni-countdown.m": "分",
+	"uni-countdown.s": "秒"
+}
diff --git a/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
new file mode 100644
index 0000000..1f8ef4e
--- /dev/null
+++ b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
@@ -0,0 +1,271 @@
+<template>
+	<view class="uni-countdown">
+		<text v-if="showDay" :style="[timeStyle]" class="uni-countdown__number">{{ d }}</text>
+		<text v-if="showDay" :style="[splitorStyle]" class="uni-countdown__splitor">{{dayText}}</text>
+		<text :style="[timeStyle]" class="uni-countdown__number">{{ h }}</text>
+		<text :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : hourText }}</text>
+		<text :style="[timeStyle]" class="uni-countdown__number">{{ i }}</text>
+		<text :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : minuteText }}</text>
+		<text :style="[timeStyle]" class="uni-countdown__number">{{ s }}</text>
+		<text v-if="!showColon" :style="[splitorStyle]" class="uni-countdown__splitor">{{secondText}}</text>
+	</view>
+</template>
+<script>
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+	/**
+	 * Countdown 倒计时
+	 * @description 倒计时组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=25
+	 * @property {String} backgroundColor 背景色
+	 * @property {String} color 文字颜色
+	 * @property {Number} day 天数
+	 * @property {Number} hour 小时
+	 * @property {Number} minute 分钟
+	 * @property {Number} second 秒
+	 * @property {Number} timestamp 时间戳
+	 * @property {Boolean} showDay = [true|false] 是否显示天数
+	 * @property {Boolean} show-colon = [true|false] 是否以冒号为分隔符
+	 * @property {String} splitorColor 分割符号颜色
+	 * @event {Function} timeup 倒计时时间到触发事件
+	 * @example <uni-countdown :day="1" :hour="1" :minute="12" :second="40"></uni-countdown>
+	 */
+	export default {
+		name: 'UniCountdown',
+		emits: ['timeup'],
+		props: {
+			showDay: {
+				type: Boolean,
+				default: true
+			},
+			showColon: {
+				type: Boolean,
+				default: true
+			},
+			start: {
+				type: Boolean,
+				default: true
+			},
+			backgroundColor: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333'
+			},
+			fontSize: {
+				type: Number,
+				default: 14
+			},
+			splitorColor: {
+				type: String,
+				default: '#333'
+			},
+			day: {
+				type: Number,
+				default: 0
+			},
+			hour: {
+				type: Number,
+				default: 0
+			},
+			minute: {
+				type: Number,
+				default: 0
+			},
+			second: {
+				type: Number,
+				default: 0
+			},
+			timestamp: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+				timer: null,
+				syncFlag: false,
+				d: '00',
+				h: '00',
+				i: '00',
+				s: '00',
+				leftTime: 0,
+				seconds: 0
+			}
+		},
+		computed: {
+			dayText() {
+				return t("uni-countdown.day")
+			},
+			hourText(val) {
+				return t("uni-countdown.h")
+			},
+			minuteText(val) {
+				return t("uni-countdown.m")
+			},
+			secondText(val) {
+				return t("uni-countdown.s")
+			},
+			timeStyle() {
+				const {
+					color,
+					backgroundColor,
+					fontSize
+				} = this
+				return {
+					color,
+					backgroundColor,
+					fontSize: `${fontSize}px`,
+					width: `${fontSize * 22 / 14}px`, // 按字体大小为 14px 时的比例缩放
+ 					lineHeight: `${fontSize * 20 / 14}px`,
+					borderRadius: `${fontSize * 3 / 14}px`,
+				}
+			},
+			splitorStyle() {
+				const { splitorColor, fontSize, backgroundColor } = this
+				return {
+					color: splitorColor,
+					fontSize: `${fontSize * 12 / 14}px`,
+					margin: backgroundColor ? `${fontSize * 4 / 14}px` : ''
+				}
+			}
+		},
+		watch: {
+			day(val) {
+				this.changeFlag()
+			},
+			hour(val) {
+				this.changeFlag()
+			},
+			minute(val) {
+				this.changeFlag()
+			},
+			second(val) {
+				this.changeFlag()
+			},
+			start: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (newVal) {
+						this.startData();
+					} else {
+						if (!oldVal) return
+						clearInterval(this.timer)
+					}
+				}
+
+			}
+		},
+		created: function(e) {
+			this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
+			this.countDown()
+		},
+		// #ifndef VUE3
+		destroyed() {
+			clearInterval(this.timer)
+		},
+		// #endif
+		// #ifdef VUE3
+		unmounted() {
+			clearInterval(this.timer)
+		},
+		// #endif
+		methods: {
+			toSeconds(timestamp, day, hours, minutes, seconds) {
+				if (timestamp) {
+					return timestamp - parseInt(new Date().getTime() / 1000, 10)
+				}
+				return day * 60 * 60 * 24 + hours * 60 * 60 + minutes * 60 + seconds
+			},
+			timeUp() {
+				clearInterval(this.timer)
+				this.$emit('timeup')
+			},
+			countDown() {
+				let seconds = this.seconds
+				let [day, hour, minute, second] = [0, 0, 0, 0]
+				if (seconds > 0) {
+					day = Math.floor(seconds / (60 * 60 * 24))
+					hour = Math.floor(seconds / (60 * 60)) - (day * 24)
+					minute = Math.floor(seconds / 60) - (day * 24 * 60) - (hour * 60)
+					second = Math.floor(seconds) - (day * 24 * 60 * 60) - (hour * 60 * 60) - (minute * 60)
+				} else {
+					this.timeUp()
+				}
+				if (day < 10) {
+					day = '0' + day
+				}
+				if (hour < 10) {
+					hour = '0' + hour
+				}
+				if (minute < 10) {
+					minute = '0' + minute
+				}
+				if (second < 10) {
+					second = '0' + second
+				}
+				this.d = day
+				this.h = hour
+				this.i = minute
+				this.s = second
+			},
+			startData() {
+				this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
+				if (this.seconds <= 0) {
+					this.seconds = this.toSeconds(0, 0, 0, 0, 0)
+					this.countDown()
+					return
+				}
+				clearInterval(this.timer)
+				this.countDown()
+				this.timer = setInterval(() => {
+					this.seconds--
+					if (this.seconds < 0) {
+						this.timeUp()
+						return
+					}
+					this.countDown()
+				}, 1000)
+			},
+			update(){
+				this.startData();
+			},
+			changeFlag() {
+				if (!this.syncFlag) {
+					this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
+					this.startData();
+					this.syncFlag = true;
+				}
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	$font-size: 14px;
+
+	.uni-countdown {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		align-items: center;
+
+		&__splitor {
+			margin: 0 2px;
+			font-size: $font-size;
+			color: #333;
+		}
+
+		&__number {
+			border-radius: 3px;
+			text-align: center;
+			font-size: $font-size;
+		}
+	}
+</style>
diff --git a/uni_modules/uni-countdown/package.json b/uni_modules/uni-countdown/package.json
new file mode 100644
index 0000000..70e99ee
--- /dev/null
+++ b/uni_modules/uni-countdown/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-countdown",
+  "displayName": "uni-countdown 倒计时",
+  "version": "1.2.2",
+  "description": "CountDown 倒计时组件",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "countdown",
+    "倒计时"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["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-countdown/readme.md b/uni_modules/uni-countdown/readme.md
new file mode 100644
index 0000000..4bcb1aa
--- /dev/null
+++ b/uni_modules/uni-countdown/readme.md
@@ -0,0 +1,10 @@
+
+
+## CountDown 倒计时
+> **组件名：uni-countdown**
+> 代码块： `uCountDown`
+
+倒计时组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-countdown)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-data-checkbox/changelog.md b/uni_modules/uni-data-checkbox/changelog.md
new file mode 100644
index 0000000..dbc517a
--- /dev/null
+++ b/uni_modules/uni-data-checkbox/changelog.md
@@ -0,0 +1,43 @@
+## 1.0.2（2022-06-30）
+- 优化 在 uni-forms 中的依赖注入方式
+## 1.0.1（2022-02-07）
+- 修复 multiple 为 true 时，v-model 的值为 null 报错的 bug
+## 1.0.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-data-checkbox](https://uniapp.dcloud.io/component/uniui/uni-data-checkbox)
+## 0.2.5（2021-08-23）
+- 修复 在uni-forms中 modelValue 中不存在当前字段，当前字段必填写也不参与校验的问题
+## 0.2.4（2021-08-17）
+- 修复 单选 list 模式下 ，icon 为 left 时，选中图标不显示的问题
+## 0.2.3（2021-08-11）
+- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
+## 0.2.2（2021-07-30）
+- 优化 在uni-forms组件，与label不对齐的问题
+## 0.2.1（2021-07-27）
+- 修复 单选默认值为0不能选中的Bug
+## 0.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.1.11（2021-07-06）
+- 优化 删除无用日志
+## 0.1.10（2021-07-05）
+- 修复 由 0.1.9 引起的非 nvue 端图标不显示的问题
+## 0.1.9（2021-07-05）
+- 修复 nvue 黑框样式问题
+## 0.1.8（2021-06-28）
+- 修复 selectedTextColor 属性不生效的Bug
+## 0.1.7（2021-06-02）
+- 新增 map 属性，可以方便映射text/value属性
+## 0.1.6（2021-05-26）
+- 修复 不关联服务空间的情况下组件报错的Bug
+## 0.1.5（2021-05-12）
+- 新增 组件示例地址
+## 0.1.4（2021-04-09）
+- 修复 nvue 下无法选中的问题
+## 0.1.3（2021-03-22）
+- 新增 disabled属性
+## 0.1.2（2021-02-24）
+- 优化 默认颜色显示
+## 0.1.1（2021-02-24）
+- 新增 支持nvue
+## 0.1.0（2021-02-18）
+- “暂无数据”显示居中
diff --git a/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
new file mode 100644
index 0000000..2e51712
--- /dev/null
+++ b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
@@ -0,0 +1,817 @@
+<template>
+	<view class="uni-data-checklist" :style="{'margin-top':isTop+'px'}">
+		<template v-if="!isLocal">
+			<view class="uni-data-loading">
+				<uni-load-more v-if="!mixinDatacomErrorMessage" status="loading" iconType="snow" :iconSize="18" :content-text="contentText"></uni-load-more>
+				<text v-else>{{mixinDatacomErrorMessage}}</text>
+			</view>
+		</template>
+		<template v-else>
+			<checkbox-group v-if="multiple" class="checklist-group" :class="{'is-list':mode==='list' || wrap}" @change="chagne">
+				<label class="checklist-box" :class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
+				 :style="item.styleBackgroud" v-for="(item,index) in dataList" :key="index">
+					<checkbox class="hidden" hidden :disabled="disabled || !!item.disabled" :value="item[map.value]+''" :checked="item.selected" />
+					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')" class="checkbox__inner"  :style="item.styleIcon">
+						<view class="checkbox__inner-icon"></view>
+					</view>
+					<view class="checklist-content" :class="{'list-content':mode === 'list' && icon ==='left'}">
+						<text class="checklist-text" :style="item.styleIconText">{{item[map.text]}}</text>
+						<view v-if="mode === 'list' && icon === 'right'" class="checkobx__list" :style="item.styleBackgroud"></view>
+					</view>
+				</label>
+			</checkbox-group>
+			<radio-group v-else class="checklist-group" :class="{'is-list':mode==='list','is-wrap':wrap}" @change="chagne">
+				<!-- -->
+				<label class="checklist-box" :class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
+				 :style="item.styleBackgroud" v-for="(item,index) in dataList" :key="index">
+					<radio class="hidden" hidden :disabled="disabled || item.disabled" :value="item[map.value]+''" :checked="item.selected" />
+					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')" class="radio__inner"
+					 :style="item.styleBackgroud">
+						<view class="radio__inner-icon" :style="item.styleIcon"></view>
+					</view>
+					<view class="checklist-content" :class="{'list-content':mode === 'list' && icon ==='left'}">
+						<text class="checklist-text" :style="item.styleIconText">{{item[map.text]}}</text>
+						<view v-if="mode === 'list' && icon === 'right'" :style="item.styleRightIcon" class="checkobx__list"></view>
+					</view>
+				</label>
+			</radio-group>
+		</template>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染 checkbox 和 radio
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} mode = [default| list | button | tag] 显示模式
+	 * @value default  	默认横排模式
+	 * @value list		列表模式
+	 * @value button	按钮模式
+	 * @value tag 		标签模式
+	 * @property {Boolean} multiple = [true|false] 是否多选
+	 * @property {Array|String|Number} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Number|String} min 最小选择个数 ，multiple为true时生效
+	 * @property {Number|String} max 最大选择个数 ，multiple为true时生效
+	 * @property {Boolean} wrap 是否换行显示
+	 * @property {String} icon = [left|right]  list 列表模式下icon显示位置
+	 * @property {Boolean} selectedColor 选中颜色
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {Boolean} selectedTextColor 选中文本颜色，如不填写则自动显示
+	 * @property {Object} map 字段映射， 默认 map={text:'text',value:'value'}
+	 * @value left 左侧显示
+	 * @value right 右侧显示
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: 'uniDataChecklist',
+		mixins: [uniCloud.mixinDatacom || {}],
+		emits:['input','update:modelValue','change'],
+		props: {
+			mode: {
+				type: String,
+				default: 'default'
+			},
+
+			multiple: {
+				type: Boolean,
+				default: false
+			},
+			value: {
+				type: [Array, String, Number],
+				default () {
+					return ''
+				}
+			},
+			// TODO vue3
+			modelValue: {
+				type: [Array, String, Number],
+				default() {
+					return '';
+				}
+			},
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			min: {
+				type: [Number, String],
+				default: ''
+			},
+			max: {
+				type: [Number, String],
+				default: ''
+			},
+			wrap: {
+				type: Boolean,
+				default: false
+			},
+			icon: {
+				type: String,
+				default: 'left'
+			},
+			selectedColor: {
+				type: String,
+				default: ''
+			},
+			selectedTextColor: {
+				type: String,
+				default: ''
+			},
+			emptyText:{
+				type: String,
+				default: '暂无数据'
+			},
+			disabled:{
+				type: Boolean,
+				default: false
+			},
+			map:{
+				type: Object,
+				default(){
+					return {
+						text:'text',
+						value:'value'
+					}
+				}
+			}
+		},
+		watch: {
+			localdata: {
+				handler(newVal) {
+					this.range = newVal
+					this.dataList = this.getDataList(this.getSelectedValue(newVal))
+				},
+				deep: true
+			},
+			mixinDatacomResData(newVal) {
+				this.range = newVal
+				this.dataList = this.getDataList(this.getSelectedValue(newVal))
+			},
+			value(newVal) {
+				this.dataList = this.getDataList(newVal)
+				// fix by mehaotian is_reset 在 uni-forms 中定义
+				// if(!this.is_reset){
+				// 	this.is_reset = false
+				// 	this.formItem && this.formItem.setValue(newVal)
+				// }
+			},
+			modelValue(newVal) {
+				this.dataList = this.getDataList(newVal);
+				// if(!this.is_reset){
+				// 	this.is_reset = false
+				// 	this.formItem && this.formItem.setValue(newVal)
+				// }
+			}
+		},
+		data() {
+			return {
+				dataList: [],
+				range: [],
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				isLocal:true,
+				styles: {
+					selectedColor: '#2979ff',
+					selectedTextColor: '#666',
+				},
+				isTop:0
+			};
+		},
+		computed:{
+			dataValue(){
+				if(this.value === '')return this.modelValue
+				if(this.modelValue === '') return this.value
+				return this.value
+			}
+		},
+		created() {
+			// this.form = this.getForm('uniForms')
+			// this.formItem = this.getForm('uniFormsItem')
+			// this.formItem && this.formItem.setValue(this.value)
+
+			// if (this.formItem) {
+			// 	this.isTop = 6
+			// 	if (this.formItem.name) {
+			// 		// 如果存在name添加默认值,否则formData 中不存在这个字段不校验
+			// 		if(!this.is_reset){
+			// 			this.is_reset = false
+			// 			this.formItem.setValue(this.dataValue)
+			// 		}
+			// 		this.rename = this.formItem.name
+			// 		this.form.inputChildrens.push(this)
+			// 	}
+			// }
+
+			if (this.localdata && this.localdata.length !== 0) {
+				this.isLocal = true
+				this.range = this.localdata
+				this.dataList = this.getDataList(this.getSelectedValue(this.range))
+			} else {
+				if (this.collection) {
+					this.isLocal = false
+					this.loadData()
+				}
+			}
+		},
+		methods: {
+			loadData() {
+				this.mixinDatacomGet().then(res=>{
+					this.mixinDatacomResData = res.result.data
+					if(this.mixinDatacomResData.length === 0){
+						this.isLocal = false
+						this.mixinDatacomErrorMessage = this.emptyText
+					}else{
+						this.isLocal = true
+					}
+				}).catch(err=>{
+					this.mixinDatacomErrorMessage = err.message
+				})
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniForms') {
+				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;
+			},
+			chagne(e) {
+				const values = e.detail.value
+
+				let detail = {
+					value: [],
+					data: []
+				}
+
+				if (this.multiple) {
+					this.range.forEach(item => {
+
+						if (values.includes(item[this.map.value] + '')) {
+							detail.value.push(item[this.map.value])
+							detail.data.push(item)
+						}
+					})
+				} else {
+					const range = this.range.find(item => (item[this.map.value] + '') === values)
+					if (range) {
+						detail = {
+							value: range[this.map.value],
+							data: range
+						}
+					}
+				}
+				// this.formItem && this.formItem.setValue(detail.value)
+				// TODO 兼容 vue2
+				this.$emit('input', detail.value);
+				// // TOTO 兼容 vue3
+				this.$emit('update:modelValue', detail.value);
+				this.$emit('change', {
+					detail
+				})
+				if (this.multiple) {
+					// 如果 v-model 没有绑定 ，则走内部逻辑
+					// if (this.value.length === 0) {
+					this.dataList = this.getDataList(detail.value, true)
+					// }
+				} else {
+					this.dataList = this.getDataList(detail.value)
+				}
+			},
+
+			/**
+			 * 获取渲染的新数组
+			 * @param {Object} value 选中内容
+			 */
+			getDataList(value) {
+				// 解除引用关系，破坏原引用关系，避免污染源数据
+				let dataList = JSON.parse(JSON.stringify(this.range))
+				let list = []
+				if (this.multiple) {
+					if (!Array.isArray(value)) {
+						value = []
+					}
+				}
+				dataList.forEach((item, index) => {
+					item.disabled = item.disable || item.disabled || false
+					if (this.multiple) {
+						if (value.length > 0) {
+							let have = value.find(val => val === item[this.map.value])
+							item.selected = have !== undefined
+						} else {
+							item.selected = false
+						}
+					} else {
+						item.selected = value === item[this.map.value]
+					}
+
+					list.push(item)
+				})
+				return this.setRange(list)
+			},
+			/**
+			 * 处理最大最小值
+			 * @param {Object} list
+			 */
+			setRange(list) {
+				let selectList = list.filter(item => item.selected)
+				let min = Number(this.min) || 0
+				let max = Number(this.max) || ''
+				list.forEach((item, index) => {
+					if (this.multiple) {
+						if (selectList.length <= min) {
+							let have = selectList.find(val => val[this.map.value] === item[this.map.value])
+							if (have !== undefined) {
+								item.disabled = true
+							}
+						}
+
+						if (selectList.length >= max && max !== '') {
+							let have = selectList.find(val => val[this.map.value] === item[this.map.value])
+							if (have === undefined) {
+								item.disabled = true
+							}
+						}
+					}
+					this.setStyles(item, index)
+					list[index] = item
+				})
+				return list
+			},
+			/**
+			 * 设置 class
+			 * @param {Object} item
+			 * @param {Object} index
+			 */
+			setStyles(item, index) {
+				//  设置自定义样式
+				item.styleBackgroud = this.setStyleBackgroud(item)
+				item.styleIcon = this.setStyleIcon(item)
+				item.styleIconText = this.setStyleIconText(item)
+				item.styleRightIcon = this.setStyleRightIcon(item)
+			},
+
+			/**
+			 * 获取选中值
+			 * @param {Object} range
+			 */
+			getSelectedValue(range) {
+				if (!this.multiple) return this.dataValue
+				let selectedArr = []
+				range.forEach((item) => {
+					if (item.selected) {
+						selectedArr.push(item[this.map.value])
+					}
+				})
+				return this.dataValue.length > 0 ? this.dataValue : selectedArr
+			},
+
+			/**
+			 * 设置背景样式
+			 */
+			setStyleBackgroud(item) {
+				let styles = {}
+				let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
+				if (this.mode !== 'list') {
+					styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
+				}
+				if (this.mode === 'tag') {
+					styles['background-color'] = item.selected? selectedColor:'#f5f5f5'
+				}
+				let classles = ''
+				for (let i in styles) {
+					classles += `${i}:${styles[i]};`
+				}
+				return classles
+			},
+			setStyleIcon(item) {
+				let styles = {}
+				let classles = ''
+				let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
+				styles['background-color'] = item.selected?selectedColor:'#fff'
+				styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
+
+				if(!item.selected && item.disabled){
+					styles['background-color'] = '#F2F6FC'
+					styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
+				}
+
+				for (let i in styles) {
+					classles += `${i}:${styles[i]};`
+				}
+				return classles
+			},
+			setStyleIconText(item) {
+				let styles = {}
+				let classles = ''
+				let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
+				if (this.mode === 'tag') {
+					styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:'#fff'):'#666'
+				} else {
+					styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:selectedColor):'#666'
+				}
+				if(!item.selected && item.disabled){
+					styles.color = '#999'
+				}
+
+				for (let i in styles) {
+					classles += `${i}:${styles[i]};`
+				}
+				return classles
+			},
+			setStyleRightIcon(item) {
+				let styles = {}
+				let classles = ''
+				if (this.mode === 'list') {
+					styles['border-color'] = item.selected?this.styles.selectedColor:'#DCDFE6'
+				}
+				for (let i in styles) {
+					classles += `${i}:${styles[i]};`
+				}
+
+				return classles
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$checked-color: #2979ff;
+	$border-color: #DCDFE6;
+	$disable:0.4;
+
+	@mixin flex {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+	}
+
+	.uni-data-loading {
+		@include flex;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 36px;
+		padding-left: 10px;
+		color: #999;
+	}
+
+	.uni-data-checklist {
+		position: relative;
+		z-index: 0;
+		flex: 1;
+		// 多选样式
+		.checklist-group {
+			@include flex;
+			flex-direction: row;
+			flex-wrap: wrap;
+
+			&.is-list {
+				flex-direction: column;
+			}
+
+			.checklist-box {
+				@include flex;
+				flex-direction: row;
+				align-items: center;
+				position: relative;
+				margin: 5px 0;
+				margin-right: 25px;
+
+				.hidden {
+					position: absolute;
+					opacity: 0;
+				}
+
+				// 文字样式
+				.checklist-content {
+					@include flex;
+					flex: 1;
+					flex-direction: row;
+					align-items: center;
+					justify-content: space-between;
+					.checklist-text {
+						font-size: 14px;
+						color: #666;
+						margin-left: 5px;
+						line-height: 14px;
+					}
+
+					.checkobx__list {
+						border-right-width: 1px;
+						border-right-color: #007aff;
+						border-right-style: solid;
+						border-bottom-width:1px;
+						border-bottom-color: #007aff;
+						border-bottom-style: solid;
+						height: 12px;
+						width: 6px;
+						left: -5px;
+						transform-origin: center;
+						transform: rotate(45deg);
+						opacity: 0;
+					}
+				}
+
+				// 多选样式
+				.checkbox__inner {
+					/* #ifndef APP-NVUE */
+					flex-shrink: 0;
+					box-sizing: border-box;
+					/* #endif */
+					position: relative;
+					width: 16px;
+					height: 16px;
+					border: 1px solid $border-color;
+					border-radius: 4px;
+					background-color: #fff;
+					z-index: 1;
+					.checkbox__inner-icon {
+						position: absolute;
+						/* #ifdef APP-NVUE */
+						top: 2px;
+						/* #endif */
+						/* #ifndef APP-NVUE */
+						top: 1px;
+						/* #endif */
+						left: 5px;
+						height: 8px;
+						width: 4px;
+						border-right-width: 1px;
+						border-right-color: #fff;
+						border-right-style: solid;
+						border-bottom-width:1px ;
+						border-bottom-color: #fff;
+						border-bottom-style: solid;
+						opacity: 0;
+						transform-origin: center;
+						transform: rotate(40deg);
+					}
+				}
+
+				// 单选样式
+				.radio__inner {
+					@include flex;
+					/* #ifndef APP-NVUE */
+					flex-shrink: 0;
+					box-sizing: border-box;
+					/* #endif */
+					justify-content: center;
+					align-items: center;
+					position: relative;
+					width: 16px;
+					height: 16px;
+					border: 1px solid $border-color;
+					border-radius: 16px;
+					background-color: #fff;
+					z-index: 1;
+
+					.radio__inner-icon {
+						width: 8px;
+						height: 8px;
+						border-radius: 10px;
+						opacity: 0;
+					}
+				}
+
+				// 默认样式
+				&.is--default {
+
+					// 禁用
+					&.is-disable {
+						/* #ifdef H5 */
+						cursor: not-allowed;
+						/* #endif */
+						.checkbox__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+							/* #ifdef H5 */
+							cursor: not-allowed;
+							/* #endif */
+						}
+
+						.radio__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+						}
+						.checklist-text {
+							color: #999;
+						}
+					}
+
+					// 选中
+					&.is-checked {
+						.checkbox__inner {
+							border-color: $checked-color;
+							background-color: $checked-color;
+
+							.checkbox__inner-icon {
+								opacity: 1;
+								transform: rotate(45deg);
+							}
+						}
+						.radio__inner {
+							border-color: $checked-color;
+							.radio__inner-icon {
+								opacity: 1;
+								background-color: $checked-color;
+							}
+						}
+						.checklist-text {
+							color: $checked-color;
+						}
+						// 选中禁用
+						&.is-disable {
+							.checkbox__inner {
+								opacity: $disable;
+							}
+
+							.checklist-text {
+								opacity: $disable;
+							}
+							.radio__inner {
+								opacity: $disable;
+							}
+						}
+					}
+				}
+
+				// 按钮样式
+				&.is--button {
+					margin-right: 10px;
+					padding: 5px 10px;
+					border: 1px $border-color solid;
+					border-radius: 3px;
+					transition: border-color 0.2s;
+
+					// 禁用
+					&.is-disable {
+						/* #ifdef H5 */
+						cursor: not-allowed;
+						/* #endif */
+						border: 1px #eee solid;
+						opacity: $disable;
+						.checkbox__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+							/* #ifdef H5 */
+							cursor: not-allowed;
+							/* #endif */
+						}
+						.radio__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+							/* #ifdef H5 */
+							cursor: not-allowed;
+							/* #endif */
+						}
+						.checklist-text {
+							color: #999;
+						}
+					}
+
+					&.is-checked {
+						border-color: $checked-color;
+						.checkbox__inner {
+							border-color: $checked-color;
+							background-color: $checked-color;
+							.checkbox__inner-icon {
+								opacity: 1;
+								transform: rotate(45deg);
+							}
+						}
+
+						.radio__inner {
+							border-color: $checked-color;
+
+							.radio__inner-icon {
+								opacity: 1;
+								background-color: $checked-color;
+							}
+						}
+
+						.checklist-text {
+							color: $checked-color;
+						}
+
+						// 选中禁用
+						&.is-disable {
+							opacity: $disable;
+						}
+					}
+				}
+
+				// 标签样式
+				&.is--tag {
+					margin-right: 10px;
+					padding: 5px 10px;
+					border: 1px $border-color solid;
+					border-radius: 3px;
+					background-color: #f5f5f5;
+
+					.checklist-text {
+						margin: 0;
+						color: #666;
+					}
+
+					// 禁用
+					&.is-disable {
+						/* #ifdef H5 */
+						cursor: not-allowed;
+						/* #endif */
+						opacity: $disable;
+					}
+
+					&.is-checked {
+						background-color: $checked-color;
+						border-color: $checked-color;
+
+						.checklist-text {
+							color: #fff;
+						}
+					}
+				}
+				// 列表样式
+				&.is--list {
+					/* #ifndef APP-NVUE */
+					display: flex;
+					/* #endif */
+					padding: 10px 15px;
+					padding-left: 0;
+					margin: 0;
+
+					&.is-list-border {
+						border-top: 1px #eee solid;
+					}
+
+					// 禁用
+					&.is-disable {
+						/* #ifdef H5 */
+						cursor: not-allowed;
+						/* #endif */
+						.checkbox__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+							/* #ifdef H5 */
+							cursor: not-allowed;
+							/* #endif */
+						}
+						.checklist-text {
+							color: #999;
+						}
+					}
+
+					&.is-checked {
+						.checkbox__inner {
+							border-color: $checked-color;
+							background-color: $checked-color;
+
+							.checkbox__inner-icon {
+								opacity: 1;
+								transform: rotate(45deg);
+							}
+						}
+						.radio__inner {
+							.radio__inner-icon {
+								opacity: 1;
+							}
+						}
+						.checklist-text {
+							color: $checked-color;
+						}
+
+						.checklist-content {
+							.checkobx__list {
+								opacity: 1;
+								border-color: $checked-color;
+							}
+						}
+
+						// 选中禁用
+						&.is-disable {
+							.checkbox__inner {
+								opacity: $disable;
+							}
+
+							.checklist-text {
+								opacity: $disable;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/uni_modules/uni-data-checkbox/package.json b/uni_modules/uni-data-checkbox/package.json
new file mode 100644
index 0000000..51470a9
--- /dev/null
+++ b/uni_modules/uni-data-checkbox/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-data-checkbox",
+  "displayName": "uni-data-checkbox 数据选择器",
+  "version": "1.0.2",
+  "description": "通过数据驱动的单选框和复选框",
+  "keywords": [
+    "uni-ui",
+    "checkbox",
+    "单选",
+    "多选",
+    "单选多选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-load-more","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"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-data-checkbox/readme.md b/uni_modules/uni-data-checkbox/readme.md
new file mode 100644
index 0000000..6eb253d
--- /dev/null
+++ b/uni_modules/uni-data-checkbox/readme.md
@@ -0,0 +1,18 @@
+
+
+## DataCheckbox 数据驱动的单选复选框
+> **组件名：uni-data-checkbox**
+> 代码块： `uDataCheckbox`
+
+
+本组件是基于uni-app基础组件checkbox的封装。本组件要解决问题包括：
+
+1. 数据绑定型组件：给本组件绑定一个data，会自动渲染一组候选内容。再以往，开发者需要编写不少代码实现类似功能
+2. 自动的表单校验：组件绑定了data，且符合[uni-forms](https://ext.dcloud.net.cn/plugin?id=2773)组件的表单校验规范，搭配使用会自动实现表单校验
+3. 本组件合并了单选多选
+4. 本组件有若干风格选择，如普通的单选多选框、并列button风格、tag风格。开发者可以快速选择需要的风格。但作为一个封装组件，样式代码虽然不用自己写了，却会牺牲一定的样式自定义性
+
+在uniCloud开发中，`DB Schema`中配置了enum枚举等类型后，在web控制台的[自动生成表单](https://uniapp.dcloud.io/uniCloud/schema?id=autocode)功能中，会自动生成``uni-data-checkbox``组件并绑定好data
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-checkbox)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-data-picker/changelog.md b/uni_modules/uni-data-picker/changelog.md
new file mode 100644
index 0000000..083e521
--- /dev/null
+++ b/uni_modules/uni-data-picker/changelog.md
@@ -0,0 +1,64 @@
+## 1.0.7（2022-07-06）
+- 优化 pc端图标位置不正确的问题
+## 1.0.6（2022-07-05）
+- 优化 显示样式
+## 1.0.5（2022-07-04）
+- 修复 uni-data-picker 在 uni-forms-item 中宽度不正确的bug
+## 1.0.4（2022-04-19）
+- 修复 字节小程序 本地数据无法选择下一级的Bug
+## 1.0.3（2022-02-25）
+- 修复 nvue 不支持的 v-show 的 bug
+## 1.0.2（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式
+## 1.0.1（2021-11-23）
+- 修复 由上个版本引发的map、v-model等属性不生效的bug
+## 1.0.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-data-picker](https://uniapp.dcloud.io/component/uniui/uni-data-picker)
+## 0.4.9（2021-10-28）
+- 修复 VUE2 v-model 概率无效的 bug
+## 0.4.8（2021-10-27）
+- 修复 v-model 概率无效的 bug
+## 0.4.7（2021-10-25）
+- 新增 属性 spaceInfo 服务空间配置 HBuilderX 3.2.11+
+- 修复 树型 uniCloud 数据类型为 int 时报错的 bug
+## 0.4.6（2021-10-19）
+- 修复 非 VUE3 v-model 为 0 时无法选中的 bug
+## 0.4.5（2021-09-26）
+- 新增 清除已选项的功能（通过 clearIcon 属性配置是否显示按钮），同时提供 clear 方法以供调用，二者等效
+- 修复 readonly 为 true 时报错的 bug
+## 0.4.4（2021-09-26）
+- 修复 上一版本造成的 map 属性失效的 bug
+- 新增 ellipsis 属性，支持配置 tab 选项长度过长时是否自动省略
+## 0.4.3（2021-09-24）
+- 修复 某些情况下级联未触发的 bug
+## 0.4.2（2021-09-23）
+- 新增 提供 show 和 hide 方法，开发者可以通过 ref 调用
+- 新增 选项内容过长自动添加省略号
+## 0.4.1（2021-09-15）
+- 新增 map 属性 字段映射，将 text/value 映射到数据中的其他字段
+## 0.4.0（2021-07-13）
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.3.5（2021-06-04）
+- 修复 无法加载云端数据的问题
+## 0.3.4（2021-05-28）
+- 修复 v-model 无效问题
+- 修复 loaddata 为空数据组时加载时间过长问题
+- 修复 上个版本引出的本地数据无法选择带有 children 的 2 级节点
+## 0.3.3（2021-05-12）
+- 新增 组件示例地址
+## 0.3.2（2021-04-22）
+- 修复 非树形数据有 where 属性查询报错的问题
+## 0.3.1（2021-04-15）
+- 修复 本地数据概率无法回显时问题
+## 0.3.0（2021-04-07）
+- 新增 支持云端非树形表结构数据
+- 修复 根节点 parent_field 字段等于 null 时选择界面错乱问题
+## 0.2.0（2021-03-15）
+- 修复 nodeclick、popupopened、popupclosed 事件无法触发的问题
+## 0.1.9（2021-03-09）
+- 修复 微信小程序某些情况下无法选择的问题
+## 0.1.8（2021-02-05）
+- 优化 部分样式在 nvue 上的兼容表现
+## 0.1.7（2021-02-05）
+- 调整为 uni_modules 目录规范
diff --git a/uni_modules/uni-data-picker/components/uni-data-picker/keypress.js b/uni_modules/uni-data-picker/components/uni-data-picker/keypress.js
new file mode 100644
index 0000000..6ef26a2
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-picker/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-data-picker/components/uni-data-picker/uni-data-picker.vue b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
new file mode 100644
index 0000000..410888d
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
@@ -0,0 +1,554 @@
+<template>
+	<view class="uni-data-tree">
+		<view class="uni-data-tree-input" @click="handleInput">
+			<slot :options="options" :data="inputSelected" :error="errorMessage">
+				<view class="input-value" :class="{'input-value-border': border}">
+					<text v-if="errorMessage" class="selected-area error-text">{{errorMessage}}</text>
+					<view v-else-if="loading && !isOpened" class="selected-area">
+						<uni-load-more class="load-more" :contentText="loadMore" status="loading"></uni-load-more>
+					</view>
+					<scroll-view v-else-if="inputSelected.length" class="selected-area" scroll-x="true">
+						<view class="selected-list">
+							<view class="selected-item" v-for="(item,index) in inputSelected" :key="index">
+								<text class="text-color">{{item.text}}</text><text v-if="index<inputSelected.length-1"
+									class="input-split-line">{{split}}</text>
+							</view>
+						</view>
+					</scroll-view>
+					<text v-else class="selected-area placeholder">{{placeholder}}</text>
+					<view v-if="clearIcon && !readonly && inputSelected.length" class="icon-clear"
+						@click.stop="clear">
+						<uni-icons type="clear" color="#c0c4cc" size="24"></uni-icons>
+					</view>
+					<view class="arrow-area" v-if="(!clearIcon || !inputSelected.length) && !readonly ">
+						<view class="input-arrow"></view>
+					</view>
+				</view>
+			</slot>
+		</view>
+		<view class="uni-data-tree-cover" v-if="isOpened" @click="handleClose"></view>
+		<view class="uni-data-tree-dialog" v-if="isOpened">
+			<view class="uni-popper__arrow"></view>
+			<view class="dialog-caption">
+				<view class="title-area">
+					<text class="dialog-title">{{popupTitle}}</text>
+				</view>
+				<view class="dialog-close" @click="handleClose">
+					<view class="dialog-close-plus" data-id="close"></view>
+					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+				</view>
+			</view>
+			<data-picker-view class="picker-view" ref="pickerView" v-model="dataValue" :localdata="localdata"
+				:preload="preload" :collection="collection" :field="field" :orderby="orderby" :where="where"
+				:step-searh="stepSearh" :self-field="selfField" :parent-field="parentField" :managed-mode="true"
+				:map="map" :ellipsis="ellipsis" @change="onchange" @datachange="ondatachange" @nodeclick="onnodeclick">
+			</data-picker-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import dataPicker from "../uni-data-pickerview/uni-data-picker.js"
+	import DataPickerView from "../uni-data-pickerview/uni-data-pickerview.vue"
+
+	/**
+	 * DataPicker 级联选择
+	 * @description 支持单列、和多列级联选择。列数没有限制，如果屏幕显示不全，顶部tab区域会左右滚动。
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3796
+	 * @property {String} popup-title 弹出窗口标题
+	 * @property {Array} localdata 本地数据，参考
+	 * @property {Boolean} border = [true|false] 是否有边框
+	 * @property {Boolean} readonly = [true|false] 是否仅读
+	 * @property {Boolean} preload = [true|false] 是否预加载数据
+	 * @value true 开启预加载数据，点击弹出窗口后显示已加载数据
+	 * @value false 关闭预加载数据，点击弹出窗口后开始加载数据
+	 * @property {Boolean} step-searh = [true|false] 是否分布查询
+	 * @value true 启用分布查询，仅查询当前选中节点
+	 * @value false 关闭分布查询，一次查询出所有数据
+	 * @property {String|DBFieldString} self-field 分布查询当前字段名称
+	 * @property {String|DBFieldString} parent-field 分布查询父字段名称
+	 * @property {String|DBCollectionString} collection 表名
+	 * @property {String|DBFieldString} field 查询字段，多个字段用 `,` 分割
+	 * @property {String} orderby 排序字段及正序倒叙设置
+	 * @property {String|JQLString} where 查询条件
+	 * @event {Function} popupshow 弹出的选择窗口打开时触发此事件
+	 * @event {Function} popuphide 弹出的选择窗口关闭时触发此事件
+	 */
+	export default {
+		name: 'UniDataPicker',
+		emits: ['popupopened', 'popupclosed', 'nodeclick', 'input', 'change', 'update:modelValue'],
+		mixins: [dataPicker],
+		components: {
+			DataPickerView
+		},
+		props: {
+			options: {
+				type: [Object, Array],
+				default () {
+					return {}
+				}
+			},
+			popupTitle: {
+				type: String,
+				default: '请选择'
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			heightMobile: {
+				type: String,
+				default: ''
+			},
+			readonly: {
+				type: Boolean,
+				default: false
+			},
+			clearIcon: {
+				type: Boolean,
+				default: true
+			},
+			border: {
+				type: Boolean,
+				default: true
+			},
+			split: {
+				type: String,
+				default: '/'
+			},
+			ellipsis: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				isOpened: false,
+				inputSelected: []
+			}
+		},
+		created() {
+			this.form = this.getForm('uniForms')
+			this.formItem = this.getForm('uniFormsItem')
+			if (this.formItem) {
+				if (this.formItem.name) {
+					this.rename = this.formItem.name
+					this.form.inputChildrens.push(this)
+				}
+			}
+
+			this.$nextTick(() => {
+				this.load()
+			})
+		},
+		methods: {
+			clear() {
+				this.inputSelected.splice(0)
+				this._dispatchEvent([])
+			},
+			onPropsChange() {
+				this._treeData = []
+				this.selectedIndex = 0
+				this.load()
+			},
+			load() {
+				if (this.readonly) {
+					this._processReadonly(this.localdata, this.dataValue)
+					return
+				}
+
+				if (this.isLocaldata) {
+					this.loadData()
+					this.inputSelected = this.selected.slice(0)
+				} else if (!this.parentField && !this.selfField && this.hasValue) {
+					this.getNodeData(() => {
+						this.inputSelected = this.selected.slice(0)
+					})
+				} else if (this.hasValue) {
+					this.getTreePath(() => {
+						this.inputSelected = this.selected.slice(0)
+					})
+				}
+			},
+			getForm(name = 'uniForms') {
+				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;
+			},
+			show() {
+				this.isOpened = true
+				setTimeout(() => {
+					this.$refs.pickerView.updateData({
+						treeData: this._treeData,
+						selected: this.selected,
+						selectedIndex: this.selectedIndex
+					})
+				}, 200)
+				this.$emit('popupopened')
+			},
+			hide() {
+				this.isOpened = false
+				this.$emit('popupclosed')
+			},
+			handleInput() {
+				if (this.readonly) {
+					return
+				}
+				this.show()
+			},
+			handleClose(e) {
+				this.hide()
+			},
+			onnodeclick(e) {
+				this.$emit('nodeclick', e)
+			},
+			ondatachange(e) {
+				this._treeData = this.$refs.pickerView._treeData
+			},
+			onchange(e) {
+				this.hide()
+				this.$nextTick(() => {
+					this.inputSelected = e;
+				})
+				this._dispatchEvent(e)
+			},
+			_processReadonly(dataList, value) {
+				var isTree = dataList.findIndex((item) => {
+					return item.children
+				})
+				if (isTree > -1) {
+					let inputValue
+					if (Array.isArray(value)) {
+						inputValue = value[value.length - 1]
+						if (typeof inputValue === 'object' && inputValue.value) {
+							inputValue = inputValue.value
+						}
+					} else {
+						inputValue = value
+					}
+					this.inputSelected = this._findNodePath(inputValue, this.localdata)
+					return
+				}
+
+				if (!this.hasValue) {
+					this.inputSelected = []
+					return
+				}
+
+				let result = []
+				for (let i = 0; i < value.length; i++) {
+					var val = value[i]
+					var item = dataList.find((v) => {
+						return v.value == val
+					})
+					if (item) {
+						result.push(item)
+					}
+				}
+				if (result.length) {
+					this.inputSelected = result
+				}
+			},
+			_filterForArray(data, valueArray) {
+				var result = []
+				for (let i = 0; i < valueArray.length; i++) {
+					var value = valueArray[i]
+					var found = data.find((item) => {
+						return item.value == value
+					})
+					if (found) {
+						result.push(found)
+					}
+				}
+				return result
+			},
+			_dispatchEvent(selected) {
+				let item = {}
+				if (selected.length) {
+					var value = new Array(selected.length)
+					for (var i = 0; i < selected.length; i++) {
+						value[i] = selected[i].value
+					}
+					item = selected[selected.length - 1]
+				} else {
+					item.value = ''
+				}
+				if (this.formItem) {
+					this.formItem.setValue(item.value)
+				}
+
+				this.$emit('input', item.value)
+				this.$emit('update:modelValue', item.value)
+				this.$emit('change', {
+					detail: {
+						value: selected
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style >
+	.uni-data-tree {
+		flex: 1;
+		position: relative;
+		font-size: 14px;
+	}
+
+	.error-text {
+		color: #DD524D;
+	}
+
+	.input-value {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		flex-wrap: nowrap;
+		font-size: 14px;
+		/* line-height: 35px; */
+		padding: 0 10px;
+		padding-right: 5px;
+		overflow: hidden;
+		height: 35px;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.input-value-border {
+		border: 1px solid #e5e5e5;
+		border-radius: 5px;
+	}
+
+	.selected-area {
+		flex: 1;
+		overflow: hidden;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.load-more {
+		/* #ifndef APP-NVUE */
+		margin-right: auto;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 40px;
+		/* #endif */
+	}
+
+	.selected-list {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: nowrap;
+		/* padding: 0 5px; */
+	}
+
+	.selected-item {
+		flex-direction: row;
+		/* padding: 0 1px; */
+		/* #ifndef APP-NVUE */
+		white-space: nowrap;
+		/* #endif */
+	}
+
+	.text-color {
+		color: #333;
+	}
+
+	.placeholder {
+		color: grey;
+		font-size: 12px;
+	}
+
+	.input-split-line {
+		opacity: .5;
+	}
+
+	.arrow-area {
+		position: relative;
+		width: 20px;
+		/* #ifndef APP-NVUE */
+		margin-bottom: 5px;
+		margin-left: auto;
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		transform: rotate(-45deg);
+		transform-origin: center;
+	}
+
+	.input-arrow {
+		width: 7px;
+		height: 7px;
+		border-left: 1px solid #999;
+		border-bottom: 1px solid #999;
+	}
+
+	.uni-data-tree-cover {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, .4);
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		z-index: 100;
+	}
+
+	.uni-data-tree-dialog {
+		position: fixed;
+		left: 0;
+		top: 20%;
+		right: 0;
+		bottom: 0;
+		background-color: #FFFFFF;
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		z-index: 102;
+		overflow: hidden;
+		/* #ifdef APP-NVUE */
+		width: 750rpx;
+		/* #endif */
+	}
+
+	.dialog-caption {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		/* border-bottom: 1px solid #f0f0f0; */
+	}
+
+	.title-area {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		/* #ifndef APP-NVUE */
+		margin: auto;
+		/* #endif */
+		padding: 0 10px;
+	}
+
+	.dialog-title {
+		/* font-weight: bold; */
+		line-height: 44px;
+	}
+
+	.dialog-close {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 0 15px;
+	}
+
+	.dialog-close-plus {
+		width: 16px;
+		height: 2px;
+		background-color: #666;
+		border-radius: 2px;
+		transform: rotate(45deg);
+	}
+
+	.dialog-close-rotate {
+		position: absolute;
+		transform: rotate(-45deg);
+	}
+
+	.picker-view {
+		flex: 1;
+		overflow: hidden;
+	}
+
+	.icon-clear {
+		display: flex;
+		align-items: center;
+	}
+
+	/* #ifdef H5 */
+	@media all and (min-width: 768px) {
+		.uni-data-tree-cover {
+			background-color: transparent;
+		}
+
+		.uni-data-tree-dialog {
+			position: absolute;
+			top: 55px;
+			height: auto;
+			min-height: 400px;
+			max-height: 50vh;
+			background-color: #fff;
+			border: 1px solid #EBEEF5;
+			box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+			border-radius: 4px;
+			overflow: unset;
+		}
+
+		.dialog-caption {
+			display: none;
+		}
+
+		.icon-clear {
+			/* margin-right: 5px; */
+		}
+	}
+
+	/* #endif */
+
+	/* picker 弹出层通用的指示小三角, todo：扩展至上下左右方向定位 */
+	/* #ifndef APP-NVUE */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+	/* #endif */
+	</style>
diff --git a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js
new file mode 100644
index 0000000..c12fd54
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js
@@ -0,0 +1,563 @@
+export default {
+  props: {
+    localdata: {
+      type: [Array, Object],
+      default () {
+        return []
+      }
+    },
+    spaceInfo: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+    collection: {
+      type: String,
+      default: ''
+    },
+    action: {
+      type: String,
+      default: ''
+    },
+    field: {
+      type: String,
+      default: ''
+    },
+    orderby: {
+      type: String,
+      default: ''
+    },
+    where: {
+      type: [String, Object],
+      default: ''
+    },
+    pageData: {
+      type: String,
+      default: 'add'
+    },
+    pageCurrent: {
+      type: Number,
+      default: 1
+    },
+    pageSize: {
+      type: Number,
+      default: 20
+    },
+    getcount: {
+      type: [Boolean, String],
+      default: false
+    },
+    getone: {
+      type: [Boolean, String],
+      default: false
+    },
+    gettree: {
+      type: [Boolean, String],
+      default: false
+    },
+    manual: {
+      type: Boolean,
+      default: false
+    },
+    value: {
+      type: [Array, String, Number],
+      default () {
+        return []
+      }
+    },
+    modelValue: {
+      type: [Array, String, Number],
+      default () {
+        return []
+      }
+    },
+    preload: {
+      type: Boolean,
+      default: false
+    },
+    stepSearh: {
+      type: Boolean,
+      default: true
+    },
+    selfField: {
+      type: String,
+      default: ''
+    },
+    parentField: {
+      type: String,
+      default: ''
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    map: {
+      type: Object,
+      default() {
+        return {
+          text: "text",
+          value: "value"
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      errorMessage: '',
+      loadMore: {
+        contentdown: '',
+        contentrefresh: '',
+        contentnomore: ''
+      },
+      dataList: [],
+      selected: [],
+      selectedIndex: 0,
+      page: {
+        current: this.pageCurrent,
+        size: this.pageSize,
+        count: 0
+      }
+    }
+  },
+  computed: {
+    isLocaldata() {
+      return !this.collection.length
+    },
+    postField() {
+      let fields = [this.field];
+      if (this.parentField) {
+        fields.push(`${this.parentField} as parent_value`);
+      }
+      return fields.join(',');
+    },
+    dataValue() {
+      let isModelValue = Array.isArray(this.modelValue) ? (this.modelValue.length > 0) : (this.modelValue !== null || this.modelValue !== undefined)
+      return isModelValue ? this.modelValue : this.value
+    },
+    hasValue() {
+      if (typeof this.dataValue === 'number') {
+        return true
+      }
+      return (this.dataValue != null) && (this.dataValue.length > 0)
+    }
+  },
+  created() {
+    this.$watch(() => {
+      var al = [];
+      ['pageCurrent',
+        'pageSize',
+        'spaceInfo',
+        'value',
+        'modelValue',
+        'localdata',
+        'collection',
+        'action',
+        'field',
+        'orderby',
+        'where',
+        'getont',
+        'getcount',
+        'gettree'
+      ].forEach(key => {
+        al.push(this[key])
+      });
+      return al
+    }, (newValue, oldValue) => {
+      let needReset = false
+      for (let i = 2; i < newValue.length; i++) {
+        if (newValue[i] != oldValue[i]) {
+          needReset = true
+          break
+        }
+      }
+      if (newValue[0] != oldValue[0]) {
+        this.page.current = this.pageCurrent
+      }
+      this.page.size = this.pageSize
+
+      this.onPropsChange()
+    })
+    this._treeData = []
+  },
+  methods: {
+    onPropsChange() {
+      this._treeData = []
+    },
+    getCommand(options = {}) {
+      /* eslint-disable no-undef */
+      let db = uniCloud.database(this.spaceInfo)
+
+      const action = options.action || this.action
+      if (action) {
+        db = db.action(action)
+      }
+
+      const collection = options.collection || this.collection
+      db = db.collection(collection)
+
+      const where = options.where || this.where
+      if (!(!where || !Object.keys(where).length)) {
+        db = db.where(where)
+      }
+
+      const field = options.field || this.field
+      if (field) {
+        db = db.field(field)
+      }
+
+      const orderby = options.orderby || this.orderby
+      if (orderby) {
+        db = db.orderBy(orderby)
+      }
+
+      const current = options.pageCurrent !== undefined ? options.pageCurrent : this.page.current
+      const size = options.pageSize !== undefined ? options.pageSize : this.page.size
+      const getCount = options.getcount !== undefined ? options.getcount : this.getcount
+      const getTree = options.gettree !== undefined ? options.gettree : this.gettree
+
+      const getOptions = {
+        getCount,
+        getTree
+      }
+      if (options.getTreePath) {
+        getOptions.getTreePath = options.getTreePath
+      }
+
+      db = db.skip(size * (current - 1)).limit(size).get(getOptions)
+
+      return db
+    },
+		getNodeData(callback) {
+		  if (this.loading) {
+		    return
+		  }
+		  this.loading = true
+		  this.getCommand({
+		    field: this.postField,
+				where: this._pathWhere()
+		  }).then((res) => {
+		    this.loading = false
+		    this.selected = res.result.data
+		    callback && callback()
+		  }).catch((err) => {
+		    this.loading = false
+		    this.errorMessage = err
+		  })
+		},
+    getTreePath(callback) {
+      if (this.loading) {
+        return
+      }
+      this.loading = true
+
+      this.getCommand({
+        field: this.postField,
+        getTreePath: {
+          startWith: `${this.selfField}=='${this.dataValue}'`
+        }
+      }).then((res) => {
+        this.loading = false
+        let treePath = []
+        this._extractTreePath(res.result.data, treePath)
+        this.selected = treePath
+        callback && callback()
+      }).catch((err) => {
+        this.loading = false
+        this.errorMessage = err
+      })
+    },
+    loadData() {
+      if (this.isLocaldata) {
+        this._processLocalData()
+        return
+      }
+
+      if (this.dataValue != null) {
+        this._loadNodeData((data) => {
+          this._treeData = data
+          this._updateBindData()
+          this._updateSelected()
+        })
+        return
+      }
+
+      if (this.stepSearh) {
+        this._loadNodeData((data) => {
+          this._treeData = data
+          this._updateBindData()
+        })
+      } else {
+        this._loadAllData((data) => {
+          this._treeData = []
+          this._extractTree(data, this._treeData, null)
+          this._updateBindData()
+        })
+      }
+    },
+    _loadAllData(callback) {
+      if (this.loading) {
+        return
+      }
+      this.loading = true
+
+      this.getCommand({
+        field: this.postField,
+        gettree: true,
+        startwith: `${this.selfField}=='${this.dataValue}'`
+      }).then((res) => {
+        this.loading = false
+        callback(res.result.data)
+        this.onDataChange()
+      }).catch((err) => {
+        this.loading = false
+        this.errorMessage = err
+      })
+    },
+    _loadNodeData(callback, pw) {
+      if (this.loading) {
+        return
+      }
+      this.loading = true
+
+      this.getCommand({
+        field: this.postField,
+        where: pw || this._postWhere(),
+        pageSize: 500
+      }).then((res) => {
+        this.loading = false
+        callback(res.result.data)
+        this.onDataChange()
+      }).catch((err) => {
+        this.loading = false
+        this.errorMessage = err
+      })
+    },
+    _pathWhere() {
+      let result = []
+      let where_field = this._getParentNameByField();
+      if (where_field) {
+        result.push(`${where_field} == '${this.dataValue}'`)
+      }
+
+      if (this.where) {
+        return `(${this.where}) && (${result.join(' || ')})`
+      }
+
+      return result.join(' || ')
+    },
+    _postWhere() {
+      let result = []
+      let selected = this.selected
+      let parentField = this.parentField
+      if (parentField) {
+        result.push(`${parentField} == null || ${parentField} == ""`)
+      }
+      if (selected.length) {
+        for (var i = 0; i < selected.length - 1; i++) {
+          result.push(`${parentField} == '${selected[i].value}'`)
+        }
+      }
+
+      let where = []
+      if (this.where) {
+        where.push(`(${this.where})`)
+      }
+      if (result.length) {
+        where.push(`(${result.join(' || ')})`)
+      }
+
+      return where.join(' && ')
+    },
+    _nodeWhere() {
+      let result = []
+      let selected = this.selected
+      if (selected.length) {
+        result.push(`${this.parentField} == '${selected[selected.length - 1].value}'`)
+      }
+
+      if (this.where) {
+        return `(${this.where}) && (${result.join(' || ')})`
+      }
+
+      return result.join(' || ')
+    },
+    _getParentNameByField() {
+      const fields = this.field.split(',');
+      let where_field = null;
+      for (let i = 0; i < fields.length; i++) {
+        const items = fields[i].split('as');
+        if (items.length < 2) {
+          continue;
+        }
+        if (items[1].trim() === 'value') {
+          where_field = items[0].trim();
+          break;
+        }
+      }
+      return where_field
+    },
+    _isTreeView() {
+      return (this.parentField && this.selfField)
+    },
+    _updateSelected() {
+      var dl = this.dataList
+      var sl = this.selected
+      let textField = this.map.text
+      let valueField = this.map.value
+      for (var i = 0; i < sl.length; i++) {
+        var value = sl[i].value
+        var dl2 = dl[i]
+        for (var j = 0; j < dl2.length; j++) {
+          var item2 = dl2[j]
+          if (item2[valueField] === value) {
+            sl[i].text = item2[textField]
+            break
+          }
+        }
+      }
+    },
+    _updateBindData(node) {
+      const {
+        dataList,
+        hasNodes
+      } = this._filterData(this._treeData, this.selected)
+
+      let isleaf = this._stepSearh === false && !hasNodes
+
+      if (node) {
+        node.isleaf = isleaf
+      }
+
+      this.dataList = dataList
+      this.selectedIndex = dataList.length - 1
+
+      if (!isleaf && this.selected.length < dataList.length) {
+        this.selected.push({
+          value: null,
+          text: "请选择"
+        })
+      }
+
+      return {
+        isleaf,
+        hasNodes
+      }
+    },
+    _filterData(data, paths) {
+      let dataList = []
+      let hasNodes = true
+
+      dataList.push(data.filter((item) => {
+        return (item.parent_value === null || item.parent_value === undefined || item.parent_value === '')
+      }))
+      for (let i = 0; i < paths.length; i++) {
+        var value = paths[i].value
+        var nodes = data.filter((item) => {
+          return item.parent_value === value
+        })
+
+        if (nodes.length) {
+          dataList.push(nodes)
+        } else {
+          hasNodes = false
+        }
+      }
+
+      return {
+        dataList,
+        hasNodes
+      }
+    },
+    _extractTree(nodes, result, parent_value) {
+      let list = result || []
+      let valueField = this.map.value
+      for (let i = 0; i < nodes.length; i++) {
+        let node = nodes[i]
+
+        let child = {}
+        for (let key in node) {
+          if (key !== 'children') {
+            child[key] = node[key]
+          }
+        }
+        if (parent_value !== null && parent_value !== undefined && parent_value !== '') {
+          child.parent_value = parent_value
+        }
+        result.push(child)
+
+        let children = node.children
+        if (children) {
+          this._extractTree(children, result, node[valueField])
+        }
+      }
+    },
+    _extractTreePath(nodes, result) {
+      let list = result || []
+      for (let i = 0; i < nodes.length; i++) {
+        let node = nodes[i]
+
+        let child = {}
+        for (let key in node) {
+          if (key !== 'children') {
+            child[key] = node[key]
+          }
+        }
+        result.push(child)
+
+        let children = node.children
+        if (children) {
+          this._extractTreePath(children, result)
+        }
+      }
+    },
+    _findNodePath(key, nodes, path = []) {
+      let textField = this.map.text
+      let valueField = this.map.value
+      for (let i = 0; i < nodes.length; i++) {
+        let node = nodes[i]
+        let children = node.children
+        let text = node[textField]
+        let value = node[valueField]
+
+        path.push({
+          value,
+          text
+        })
+
+        if (value === key) {
+          return path
+        }
+
+        if (children) {
+          const p = this._findNodePath(key, children, path)
+          if (p.length) {
+            return p
+          }
+        }
+
+        path.pop()
+      }
+      return []
+    },
+    _processLocalData() {
+      this._treeData = []
+      this._extractTree(this.localdata, this._treeData)
+
+      var inputValue = this.dataValue
+      if (inputValue === undefined) {
+        return
+      }
+
+      if (Array.isArray(inputValue)) {
+        inputValue = inputValue[inputValue.length - 1]
+        if (typeof inputValue === 'object' && inputValue[this.map.value]) {
+          inputValue = inputValue[this.map.value]
+        }
+      }
+
+      this.selected = this._findNodePath(inputValue, this.localdata)
+    }
+  }
+}
diff --git a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
new file mode 100644
index 0000000..065aac2
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
@@ -0,0 +1,333 @@
+<template>
+	<view class="uni-data-pickerview">
+		<scroll-view class="selected-area" scroll-x="true" scroll-y="false" :show-scrollbar="false">
+			<view class="selected-list">
+				<template v-for="(item,index) in selected">
+					<view class="selected-item"
+						:class="{'selected-item-active':index==selectedIndex, 'selected-item-text-overflow': ellipsis}"
+						 v-if="item.text" @click="handleSelect(index)">
+						<text class="">{{item.text}}</text>
+					</view>
+				</template>
+			</view>
+		</scroll-view>
+		<view class="tab-c">
+			<template v-for="(child, i) in dataList" >
+				<scroll-view class="list" :key="i" v-if="i==selectedIndex" :scroll-y="true">
+					<view class="item" :class="{'is-disabled': !!item.disable}" v-for="(item, j) in child"
+						@click="handleNodeClick(item, i, j)">
+						<text class="item-text item-text-overflow">{{item[map.text]}}</text>
+						<view class="check" v-if="selected.length > i && item[map.value] == selected[i].value"></view>
+					</view>
+				</scroll-view>
+			</template>
+
+			<view class="loading-cover" v-if="loading">
+				<uni-load-more class="load-more" :contentText="loadMore" status="loading"></uni-load-more>
+			</view>
+			<view class="error-message" v-if="errorMessage">
+				<text class="error-text">{{errorMessage}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import dataPicker from "./uni-data-picker.js"
+
+	/**
+	 * DataPickerview
+	 * @description uni-data-pickerview
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3796
+	 * @property {Array} localdata 本地数据，参考
+	 * @property {Boolean} step-searh = [true|false] 是否分布查询
+	 * @value true 启用分布查询，仅查询当前选中节点
+	 * @value false 关闭分布查询，一次查询出所有数据
+	 * @property {String|DBFieldString} self-field 分布查询当前字段名称
+	 * @property {String|DBFieldString} parent-field 分布查询父字段名称
+	 * @property {String|DBCollectionString} collection 表名
+	 * @property {String|DBFieldString} field 查询字段，多个字段用 `,` 分割
+	 * @property {String} orderby 排序字段及正序倒叙设置
+	 * @property {String|JQLString} where 查询条件
+	 */
+	export default {
+		name: 'UniDataPickerView',
+		emits: ['nodeclick', 'change', 'datachange', 'update:modelValue'],
+		mixins: [dataPicker],
+		props: {
+			managedMode: {
+				type: Boolean,
+				default: false
+			},
+			ellipsis: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {}
+		},
+		created() {
+			if (this.managedMode) {
+				return
+			}
+
+			this.$nextTick(() => {
+				this.load()
+			})
+		},
+		methods: {
+			onPropsChange() {
+				this._treeData = []
+				this.selectedIndex = 0
+				this.load()
+			},
+			load() {
+				if (this.isLocaldata) {
+					this.loadData()
+				} else if (this.dataValue.length) {
+					this.getTreePath((res) => {
+						this.loadData()
+					})
+				}
+			},
+			handleSelect(index) {
+				this.selectedIndex = index
+			},
+			handleNodeClick(item, i, j) {
+				if (item.disable) {
+					return
+				}
+				const node = this.dataList[i][j]
+				const text = node[this.map.text]
+				const value = node[this.map.value]
+				if (i < this.selected.length - 1) {
+					this.selected.splice(i, this.selected.length - i)
+					this.selected.push({
+						text,
+						value
+					})
+				} else if (i === this.selected.length - 1) {
+					this.selected.splice(i, 1, {
+						text,
+						value
+					})
+				}
+
+				if (node.isleaf) {
+					this.onSelectedChange(node, node.isleaf)
+					return
+				}
+
+				const {
+					isleaf,
+					hasNodes
+				} = this._updateBindData()
+
+				if (!this._isTreeView() && !hasNodes) {
+					this.onSelectedChange(node, true)
+					return
+				}
+
+				if (this.isLocaldata && (!hasNodes || isleaf)) {
+					this.onSelectedChange(node, true)
+					return
+				}
+
+				if (!isleaf && !hasNodes) {
+					this._loadNodeData((data) => {
+						if (!data.length) {
+							node.isleaf = true
+						} else {
+							this._treeData.push(...data)
+							this._updateBindData(node)
+						}
+						this.onSelectedChange(node, node.isleaf)
+					}, this._nodeWhere())
+					return
+				}
+
+				this.onSelectedChange(node, false)
+			},
+			updateData(data) {
+				this._treeData = data.treeData
+				this.selected = data.selected
+				if (!this._treeData.length) {
+					this.loadData()
+				} else {
+					//this.selected = data.selected
+					this._updateBindData()
+				}
+			},
+			onDataChange() {
+				this.$emit('datachange')
+			},
+			onSelectedChange(node, isleaf) {
+				if (isleaf) {
+					this._dispatchEvent()
+				}
+
+				if (node) {
+					this.$emit('nodeclick', node)
+				}
+			},
+			_dispatchEvent() {
+				this.$emit('change', this.selected.slice(0))
+			}
+		}
+	}
+</script>
+<style >
+	.uni-data-pickerview {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		overflow: hidden;
+		height: 100%;
+	}
+
+	.error-text {
+		color: #DD524D;
+	}
+
+	.loading-cover {
+		position: absolute;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(255, 255, 255, .5);
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		z-index: 1001;
+	}
+
+	.load-more {
+		/* #ifndef APP-NVUE */
+		margin: auto;
+		/* #endif */
+	}
+
+	.error-message {
+		background-color: #fff;
+		position: absolute;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		padding: 15px;
+		opacity: .9;
+		z-index: 102;
+	}
+
+	/* #ifdef APP-NVUE */
+	.selected-area {
+		width: 750rpx;
+	}
+
+	/* #endif */
+
+	.selected-list {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: nowrap;
+		padding: 0 5px;
+		border-bottom: 1px solid #f8f8f8;
+	}
+
+	.selected-item {
+		margin-left: 10px;
+		margin-right: 10px;
+		padding: 12px 0;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		white-space: nowrap;
+		/* #endif */
+	}
+
+	.selected-item-text-overflow {
+		width: 168px;
+		/* fix nvue */
+		overflow: hidden;
+		/* #ifndef APP-NVUE */
+		width: 6em;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		/* #endif */
+	}
+
+	.selected-item-active {
+		border-bottom: 2px solid #007aff;
+	}
+
+	.selected-item-text {
+		color: #007aff;
+	}
+
+	.tab-c {
+		position: relative;
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		overflow: hidden;
+	}
+
+	.list {
+		flex: 1;
+	}
+
+	.item {
+		padding: 12px 15px;
+		/* border-bottom: 1px solid #f0f0f0; */
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.is-disabled {
+		opacity: .5;
+	}
+
+	.item-text {
+		/* flex: 1; */
+		color: #333333;
+	}
+
+	.item-text-overflow {
+		width: 280px;
+		/* fix nvue */
+		overflow: hidden;
+		/* #ifndef APP-NVUE */
+		width: 20em;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		/* #endif */
+	}
+
+	.check {
+		margin-right: 5px;
+		border: 2px solid #007aff;
+		border-left: 0;
+		border-top: 0;
+		height: 12px;
+		width: 6px;
+		transform-origin: center;
+		/* #ifndef APP-NVUE */
+		transition: all 0.3s;
+		/* #endif */
+		transform: rotate(45deg);
+	}
+</style>
diff --git a/uni_modules/uni-data-picker/package.json b/uni_modules/uni-data-picker/package.json
new file mode 100644
index 0000000..9900380
--- /dev/null
+++ b/uni_modules/uni-data-picker/package.json
@@ -0,0 +1,93 @@
+{
+  "id": "uni-data-picker",
+  "displayName": "uni-data-picker 数据驱动的picker选择器",
+  "version": "1.0.7",
+  "description": "单列、多列级联选择器，常用于省市区城市选择、公司部门选择、多级分类等场景",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "picker",
+    "级联",
+    "省市区",
+    ""
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+      "uni-load-more",
+			"uni-icons",
+			"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",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-data-picker/readme.md b/uni_modules/uni-data-picker/readme.md
new file mode 100644
index 0000000..6cda224
--- /dev/null
+++ b/uni_modules/uni-data-picker/readme.md
@@ -0,0 +1,22 @@
+## DataPicker 级联选择
+> **组件名：uni-data-picker**
+> 代码块： `uDataPicker`
+> 关联组件：`uni-data-pickerview`、`uni-load-more`。
+
+
+`<uni-data-picker>` 是一个选择类[datacom组件](https://uniapp.dcloud.net.cn/component/datacom)。
+
+支持单列、和多列级联选择。列数没有限制，如果屏幕显示不全，顶部tab区域会左右滚动。
+
+候选数据支持一次性加载完毕，也支持懒加载，比如示例图中，选择了“北京”后，动态加载北京的区县数据。
+
+`<uni-data-picker>` 组件尤其适用于地址选择、分类选择等选择类。
+
+`<uni-data-picker>` 支持本地数据、云端静态数据(json)，uniCloud云数据库数据。
+
+`<uni-data-picker>` 可以通过JQL直连uniCloud云数据库，配套[DB Schema](https://uniapp.dcloud.net.cn/uniCloud/schema)，可在schema2code中自动生成前端页面，还支持服务器端校验。
+
+在uniCloud数据表中新建表“uni-id-address”和“opendb-city-china”，这2个表的schema自带foreignKey关联。在“uni-id-address”表的表结构页面使用schema2code生成前端页面，会自动生成地址管理的维护页面，自动从“opendb-city-china”表包含的中国所有省市区信息里选择地址。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-data-select/changelog.md b/uni_modules/uni-data-select/changelog.md
new file mode 100644
index 0000000..d5beaa3
--- /dev/null
+++ b/uni_modules/uni-data-select/changelog.md
@@ -0,0 +1,16 @@
+## 0.1.6（2022-07-06）
+- 修复 pc端宽度异常的bug
+## 0.1.5
+- 修复 pc端宽度异常的bug
+## 0.1.4（2022-07-05）
+- 优化 显示样式
+## 0.1.3（2022-06-02）
+- 修复 localdata 赋值不生效的 bug
+- 新增 支持  uni.scss 修改颜色
+- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
+## 0.1.2（2022-05-08）
+- 修复 当 value 为 0 时选择不生效的 bug
+## 0.1.1（2022-05-07）
+- 新增 记住上次的选项（仅 collection 存在时有效）
+## 0.1.0（2022-04-22）
+- 初始化
diff --git a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
new file mode 100644
index 0000000..16995bd
--- /dev/null
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -0,0 +1,426 @@
+<template>
+	<view class="uni-stat__select">
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select">
+				<view class="uni-select__input-box" @click="toggleSelector">
+					<view v-if="current" class="uni-select__input-text">{{current}}</view>
+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<uni-icons v-if="current && clear" type="clear" color="#c0c4cc" size="24" @click="clearVal" />
+					<uni-icons v-else :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+				</view>
+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+				<view class="uni-select__selector" v-if="showSelector">
+					<view class="uni-popper__arrow"></view>
+					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
+							<text>{{emptyTips}}</text>
+						</view>
+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData"
+							:key="index" @click="change(item)">
+							<text
+								:class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: "uni-stat-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: []
+			};
+		},
+		props: {
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			}
+		},
+		created() {
+			this.last = `${this.collection}_last_selected_option_value`
+			if (this.collection && !this.localdata.length) {
+				this.mixinDatacomEasyGet()
+			}
+		},
+		computed: {
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = this.placeholder
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			}
+		},
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val
+					}
+				}
+			},
+			// #ifndef VUE3
+			value() {
+				this.initDefVal()
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue() {
+				this.initDefVal()
+			},
+			// #endif
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			}
+		},
+		methods: {
+			initDefVal() {
+				let defValue = ''
+				if ((this.value || this.value === 0) && !this.isDisabled(this.value)) {
+					defValue = this.value
+				} else if ((this.modelValue || this.modelValue === 0) && !this.isDisabled(this.modelValue)) {
+					defValue = this.modelValue
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = uni.getStorageSync(this.last)
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem < this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1].value
+						}
+						defValue = defItem
+					}
+					this.emit(defValue)
+				}
+				const def = this.mixinDatacomResData.find(item => item.value === defValue)
+				this.current = def ? this.formatItemName(def) : ''
+			},
+
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+
+				this.mixinDatacomResData.forEach(item => {
+					if (item.value === value) {
+						isDisabled = item.disable
+					}
+				})
+
+				return isDisabled;
+			},
+
+			clearVal() {
+				this.emit('')
+				if (this.collection) {
+					uni.removeStorageSync(this.last)
+				}
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					this.current = this.formatItemName(item)
+					this.emit(item.value)
+				}
+			},
+			emit(val) {
+				this.$emit('change', val)
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+				if (this.collection) {
+					uni.setStorageSync(this.last, val)
+				}
+			},
+
+			toggleSelector() {
+				this.showSelector = !this.showSelector
+			},
+			formatItemName(item) {
+				let {
+					text,
+					value,
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+				return this.collection.indexOf('app-list') > 0 ?
+					`${text}(${value})` :
+					(
+						text ?
+						text :
+						`未命名${channel_code}`
+					)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #333 !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #e5e5e5;
+
+
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 500px) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		// padding: 15px;
+		cursor: pointer;
+		width: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+	
+	.uni-stat-box {
+		width: 100%;
+		flex: 1;
+	}
+	
+	.uni-stat__actived {
+		width: 100%;
+		flex: 1;
+		// outline: 1px solid #2979ff;
+	}
+
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+
+	.uni-select {
+		font-size: 14px;
+		border: 1px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 4px;
+		padding: 0 5px;
+		padding-left: 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border-bottom: solid 1px $uni-border-3;
+		width: 100%;
+		flex: 1;
+		height: 35px;
+	}
+
+	.uni-select__label {
+		font-size: 16px;
+		// line-height: 22px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		// height: 35px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 2;
+		padding: 4px 0;
+	}
+
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 35px;
+		font-size: 14px;
+		text-align: center;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 0px 10px;
+	}
+
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	/* picker 弹出层通用的指示小三角 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-select__input-text {
+		// width: 280px;
+		width: 100%;
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+	}
+
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+		font-size: 12px;
+	}
+
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+	}
+</style>
diff --git a/uni_modules/uni-data-select/package.json b/uni_modules/uni-data-select/package.json
new file mode 100644
index 0000000..1ebd8dd
--- /dev/null
+++ b/uni_modules/uni-data-select/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-data-select",
+  "displayName": "uni-data-select 下拉框选择器",
+  "version": "0.1.6",
+  "description": "通过数据驱动的下拉框选择器",
+  "keywords": [
+    "uni-ui",
+    "select",
+    "uni-data-select",
+    "下拉框",
+    "下拉选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-load-more"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "n"
+        },
+        "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",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+        "QQ": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-data-select/readme.md b/uni_modules/uni-data-select/readme.md
new file mode 100644
index 0000000..eb58de3
--- /dev/null
+++ b/uni_modules/uni-data-select/readme.md
@@ -0,0 +1,8 @@
+## DataSelect 下拉框选择器
+> **组件名：uni-data-select**
+> 代码块： `uDataSelect`
+
+当选项过多时，使用下拉菜单展示并选择内容
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-dateformat/changelog.md b/uni_modules/uni-dateformat/changelog.md
new file mode 100644
index 0000000..d551d7b
--- /dev/null
+++ b/uni_modules/uni-dateformat/changelog.md
@@ -0,0 +1,10 @@
+## 1.0.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-dateformat](https://uniapp.dcloud.io/component/uniui/uni-dateformat)
+## 0.0.5（2021-07-08）
+- 调整 默认时间不再是当前时间，而是显示'-'字符
+## 0.0.4（2021-05-12）
+- 新增 组件示例地址
+## 0.0.3（2021-02-04）
+- 调整为uni_modules目录规范
+- 修复 iOS 平台日期格式化出错的问题
diff --git a/uni_modules/uni-dateformat/components/uni-dateformat/date-format.js b/uni_modules/uni-dateformat/components/uni-dateformat/date-format.js
new file mode 100644
index 0000000..e00d559
--- /dev/null
+++ b/uni_modules/uni-dateformat/components/uni-dateformat/date-format.js
@@ -0,0 +1,200 @@
+// yyyy-MM-dd hh:mm:ss.SSS 所有支持的类型
+function pad(str, length = 2) {
+	str += ''
+	while (str.length < length) {
+		str = '0' + str
+	}
+	return str.slice(-length)
+}
+
+const parser = {
+	yyyy: (dateObj) => {
+		return pad(dateObj.year, 4)
+	},
+	yy: (dateObj) => {
+		return pad(dateObj.year)
+	},
+	MM: (dateObj) => {
+		return pad(dateObj.month)
+	},
+	M: (dateObj) => {
+		return dateObj.month
+	},
+	dd: (dateObj) => {
+		return pad(dateObj.day)
+	},
+	d: (dateObj) => {
+		return dateObj.day
+	},
+	hh: (dateObj) => {
+		return pad(dateObj.hour)
+	},
+	h: (dateObj) => {
+		return dateObj.hour
+	},
+	mm: (dateObj) => {
+		return pad(dateObj.minute)
+	},
+	m: (dateObj) => {
+		return dateObj.minute
+	},
+	ss: (dateObj) => {
+		return pad(dateObj.second)
+	},
+	s: (dateObj) => {
+		return dateObj.second
+	},
+	SSS: (dateObj) => {
+		return pad(dateObj.millisecond, 3)
+	},
+	S: (dateObj) => {
+		return dateObj.millisecond
+	},
+}
+
+// 这都n年了iOS依然不认识2020-12-12，需要转换为2020/12/12
+function getDate(time) {
+	if (time instanceof Date) {
+		return time
+	}
+	switch (typeof time) {
+		case 'string':
+			{
+				// 2020-12-12T12:12:12.000Z、2020-12-12T12:12:12.000
+				if (time.indexOf('T') > -1) {
+					return new Date(time)
+				}
+				return new Date(time.replace(/-/g, '/'))
+			}
+		default:
+			return new Date(time)
+	}
+}
+
+export function formatDate(date, format = 'yyyy/MM/dd hh:mm:ss') {
+	if (!date && date !== 0) {
+		return ''
+	}
+	date = getDate(date)
+	const dateObj = {
+		year: date.getFullYear(),
+		month: date.getMonth() + 1,
+		day: date.getDate(),
+		hour: date.getHours(),
+		minute: date.getMinutes(),
+		second: date.getSeconds(),
+		millisecond: date.getMilliseconds()
+	}
+	const tokenRegExp = /yyyy|yy|MM|M|dd|d|hh|h|mm|m|ss|s|SSS|SS|S/
+	let flag = true
+	let result = format
+	while (flag) {
+		flag = false
+		result = result.replace(tokenRegExp, function(matched) {
+			flag = true
+			return parser[matched](dateObj)
+		})
+	}
+	return result
+}
+
+export function friendlyDate(time, {
+	locale = 'zh',
+	threshold = [60000, 3600000],
+	format = 'yyyy/MM/dd hh:mm:ss'
+}) {
+	if (time === '-') {
+		return time
+	}
+	if (!time && time !== 0) {
+		return ''
+	}
+	const localeText = {
+		zh: {
+			year: '年',
+			month: '月',
+			day: '天',
+			hour: '小时',
+			minute: '分钟',
+			second: '秒',
+			ago: '前',
+			later: '后',
+			justNow: '刚刚',
+			soon: '马上',
+			template: '{num}{unit}{suffix}'
+		},
+		en: {
+			year: 'year',
+			month: 'month',
+			day: 'day',
+			hour: 'hour',
+			minute: 'minute',
+			second: 'second',
+			ago: 'ago',
+			later: 'later',
+			justNow: 'just now',
+			soon: 'soon',
+			template: '{num} {unit} {suffix}'
+		}
+	}
+	const text = localeText[locale] || localeText.zh
+	let date = getDate(time)
+	let ms = date.getTime() - Date.now()
+	let absMs = Math.abs(ms)
+	if (absMs < threshold[0]) {
+		return ms < 0 ? text.justNow : text.soon
+	}
+	if (absMs >= threshold[1]) {
+		return formatDate(date, format)
+	}
+	let num
+	let unit
+	let suffix = text.later
+	if (ms < 0) {
+		suffix = text.ago
+		ms = -ms
+	}
+	const seconds = Math.floor((ms) / 1000)
+	const minutes = Math.floor(seconds / 60)
+	const hours = Math.floor(minutes / 60)
+	const days = Math.floor(hours / 24)
+	const months = Math.floor(days / 30)
+	const years = Math.floor(months / 12)
+	switch (true) {
+		case years > 0:
+			num = years
+			unit = text.year
+			break
+		case months > 0:
+			num = months
+			unit = text.month
+			break
+		case days > 0:
+			num = days
+			unit = text.day
+			break
+		case hours > 0:
+			num = hours
+			unit = text.hour
+			break
+		case minutes > 0:
+			num = minutes
+			unit = text.minute
+			break
+		default:
+			num = seconds
+			unit = text.second
+			break
+	}
+
+	if (locale === 'en') {
+		if (num === 1) {
+			num = 'a'
+		} else {
+			unit += 's'
+		}
+	}
+
+	return text.template.replace(/{\s*num\s*}/g, num + '').replace(/{\s*unit\s*}/g, unit).replace(/{\s*suffix\s*}/g,
+		suffix)
+}
diff --git a/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.vue b/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.vue
new file mode 100644
index 0000000..c5ed030
--- /dev/null
+++ b/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.vue
@@ -0,0 +1,88 @@
+<template>
+	<text>{{dateShow}}</text>
+</template>
+
+<script>
+	import {friendlyDate} from './date-format.js'
+	/**
+	 * Dateformat 日期格式化
+	 * @description 日期格式化组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3279
+	 * @property {Object|String|Number} date 日期对象/日期字符串/时间戳
+	 * @property {String} locale 格式化使用的语言
+	 * 	@value zh 中文
+	 * 	@value en 英文
+	 * @property {Array} threshold 应用不同类型格式化的阈值
+	 * @property {String} format 输出日期字符串时的格式
+	 */
+	export default {
+		name: 'uniDateformat',
+		props: {
+			date: {
+				type: [Object, String, Number],
+				default () {
+					return '-'
+				}
+			},
+			locale: {
+				type: String,
+				default: 'zh',
+			},
+			threshold: {
+				type: Array,
+				default () {
+					return [0, 0]
+				}
+			},
+			format: {
+				type: String,
+				default: 'yyyy/MM/dd hh:mm:ss'
+			},
+			// refreshRate使用不当可能导致性能问题，谨慎使用
+			refreshRate: {
+				type: [Number, String],
+				default: 0
+			}
+		},
+		data() {
+			return {
+				refreshMark: 0
+			}
+		},
+		computed: {
+			dateShow() {
+				this.refreshMark
+				return friendlyDate(this.date, {
+					locale: this.locale,
+					threshold: this.threshold,
+					format: this.format
+				})
+			}
+		},
+		watch: {
+			refreshRate: {
+				handler() {
+					this.setAutoRefresh()
+				},
+				immediate: true
+			}
+		},
+		methods: {
+			refresh() {
+				this.refreshMark++
+			},
+			setAutoRefresh() {
+				clearInterval(this.refreshInterval)
+				if (this.refreshRate) {
+					this.refreshInterval = setInterval(() => {
+						this.refresh()
+					}, parseInt(this.refreshRate))
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/uni_modules/uni-dateformat/package.json b/uni_modules/uni-dateformat/package.json
new file mode 100644
index 0000000..786a670
--- /dev/null
+++ b/uni_modules/uni-dateformat/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-dateformat",
+  "displayName": "uni-dateformat 日期格式化",
+  "version": "1.0.0",
+  "description": "日期格式化组件，可以将日期格式化为1分钟前、刚刚等形式",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "日期格式化",
+    "时间格式化",
+    "格式化时间",
+    ""
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["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"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-dateformat/readme.md b/uni_modules/uni-dateformat/readme.md
new file mode 100644
index 0000000..37ddb6e
--- /dev/null
+++ b/uni_modules/uni-dateformat/readme.md
@@ -0,0 +1,11 @@
+
+
+### DateFormat 日期格式化
+> **组件名：uni-dateformat**
+> 代码块： `uDateformat`
+
+
+日期格式化组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-dateformat)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/changelog.md b/uni_modules/uni-datetime-picker/changelog.md
new file mode 100644
index 0000000..5c9735a
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/changelog.md
@@ -0,0 +1,93 @@
+## 2.2.6（2022-06-30）
+- 优化 组件样式，调整了组件图标大小、高度、颜色等，与uni-ui风格保持一致
+## 2.2.5（2022-06-24）
+- 修复 日历顶部年月及底部确认未国际化 bug
+## 2.2.4（2022-03-31）
+- 修复 Vue3 下动态赋值,单选类型未响应的 bug
+## 2.2.3（2022-03-28）
+- 修复 Vue3 下动态赋值未响应的 bug
+## 2.2.2（2021-12-10）
+- 修复 clear-icon 属性在小程序平台不生效的 bug
+## 2.2.1（2021-12-10）
+- 修复 日期范围选在小程序平台，必须多点击一次才能取消选中状态的 bug
+## 2.2.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-datetime-picker](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+## 2.1.5（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 2.1.4（2021-09-10）
+- 修复 hide-second 在移动端的 bug
+- 修复 单选赋默认值时，赋值日期未高亮的 bug
+- 修复 赋默认值时，移动端未正确显示时间的 bug
+## 2.1.3（2021-09-09）
+- 新增 hide-second 属性，支持只使用时分，隐藏秒
+## 2.1.2（2021-09-03）
+- 优化 取消选中时（范围选）直接开始下一次选择, 避免多点一次
+- 优化 移动端支持清除按钮，同时支持通过 ref 调用组件的 clear 方法
+- 优化 调整字号大小，美化日历界面
+- 修复 因国际化导致的 placeholder 失效的 bug
+## 2.1.1（2021-08-24）
+- 新增 支持国际化
+- 优化 范围选择器在 pc 端过宽的问题
+## 2.1.0（2021-08-09）
+- 新增 适配 vue3
+## 2.0.19（2021-08-09）
+- 新增 支持作为 uni-forms 子组件相关功能
+- 修复 在 uni-forms 中使用时，选择时间报 NAN 错误的 bug
+## 2.0.18（2021-08-05）
+- 修复 type 属性动态赋值无效的 bug
+- 修复 ‘确认’按钮被 tabbar 遮盖 bug
+- 修复 组件未赋值时范围选左、右日历相同的 bug
+## 2.0.17（2021-08-04）
+- 修复 范围选未正确显示当前值的 bug
+- 修复 h5 平台（移动端）报错 'cale' of undefined 的 bug
+## 2.0.16（2021-07-21）
+- 新增 return-type 属性支持返回 date 日期对象
+## 2.0.15（2021-07-14）
+- 修复 单选日期类型，初始赋值后不在当前日历的 bug
+- 新增 clearIcon 属性，显示框的清空按钮可配置显示隐藏（仅 pc 有效）
+- 优化 移动端移除显示框的清空按钮，无实际用途
+## 2.0.14（2021-07-14）
+- 修复 组件赋值为空，界面未更新的 bug
+- 修复 start 和 end 不能动态赋值的 bug
+- 修复 范围选类型，用户选择后再次选择右侧日历（结束日期）显示不正确的 bug
+## 2.0.13（2021-07-08）
+- 修复 范围选择不能动态赋值的 bug
+## 2.0.12（2021-07-08）
+- 修复 范围选择的初始时间在一个月内时，造成无法选择的bug
+## 2.0.11（2021-07-08）
+- 优化 弹出层在超出视窗边缘定位不准确的问题
+## 2.0.10（2021-07-08）
+- 修复 范围起始点样式的背景色与今日样式的字体前景色融合，导致日期字体看不清的 bug
+- 优化 弹出层在超出视窗边缘被遮盖的问题
+## 2.0.9（2021-07-07）
+- 新增 maskClick 事件
+- 修复 特殊情况日历 rpx 布局错误的 bug，rpx -> px
+- 修复 范围选择时清空返回值不合理的bug，['', ''] -> []
+## 2.0.8（2021-07-07）
+- 新增 日期时间显示框支持插槽
+## 2.0.7（2021-07-01）
+- 优化 添加 uni-icons 依赖
+## 2.0.6（2021-05-22）
+- 修复 图标在小程序上不显示的 bug
+- 优化 重命名引用组件，避免潜在组件命名冲突
+## 2.0.5（2021-05-20）
+- 优化 代码目录扁平化
+## 2.0.4（2021-05-12）
+- 新增 组件示例地址
+## 2.0.3（2021-05-10）
+- 修复 ios 下不识别 '-' 日期格式的 bug
+- 优化 pc 下弹出层添加边框和阴影
+## 2.0.2（2021-05-08）
+- 修复 在 admin 中获取弹出层定位错误的bug
+## 2.0.1（2021-05-08）
+- 修复 type 属性向下兼容，默认值从 date 变更为 datetime
+## 2.0.0（2021-04-30）
+- 支持日历形式的日期+时间的范围选择
+ > 注意：此版本不向后兼容，不再支持单独时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）
+## 1.0.6（2021-03-18）
+- 新增 hide-second 属性，时间支持仅选择时、分
+- 修复 选择跟显示的日期不一样的 bug
+- 修复 chang事件触发2次的 bug
+- 修复 分、秒 end 范围错误的 bug
+- 优化 更好的 nvue 适配
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
new file mode 100644
index 0000000..3d2dbea
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
@@ -0,0 +1,185 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--before-checked-x':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked-x':weeks.afterMultiple,
+		}" @click="choiceDate(weeks)" @mouseenter="handleMousemove(weeks)">
+		<view class="uni-calendar-item__weeks-box-item" :class="{
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && (calendar.userChecked || !checkHover),
+				'uni-calendar-item--checked-range-text': checkHover,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">
+			<text v-if="selected&&weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text uni-calendar-item__weeks-box-text-disable uni-calendar-item--checked-text">{{weeks.date}}</text>
+		</view>
+		<view :class="{'uni-calendar-item--isDay': weeks.isDay}"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			},
+			checkHover: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			},
+			handleMousemove(weeks) {
+				this.$emit('handleMouse', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin: 1px 0;
+		position: relative;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: 14px;
+		// font-family: Lato-Bold, Lato;
+		font-weight: bold;
+		color: #455997;
+	}
+
+	.uni-calendar-item__weeks-lunar-text {
+		font-size: 12px;
+		color: #333;
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 40px;
+		height: 40px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: #dd524d;
+
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--disable {
+		// background-color: rgba(249, 249, 249, $uni-opacity-disabled);
+		cursor: default;
+	}
+
+	.uni-calendar-item--disable .uni-calendar-item__weeks-box-text-disable {
+		color: #D1D1D1;
+	}
+
+	.uni-calendar-item--isDay {
+		position: absolute;
+		top: 10px;
+		right: 17%;
+		background-color: #dd524d;
+		width:6px;
+		height: 6px;
+		border-radius: 50%;
+	}
+
+	.uni-calendar-item--extra {
+		color: #dd524d;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--checked {
+		background-color: #007aff;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #fff;
+	}
+
+	.uni-calendar-item--checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--checked-range-text {
+		color: #333;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color:  #F6F7FC;
+		// color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--before-checked,
+	.uni-calendar-item--multiple .uni-calendar-item--after-checked {
+		background-color: #409eff;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #F6F7FC;
+	}
+
+	.uni-calendar-item--before-checked .uni-calendar-item--checked-text,
+	.uni-calendar-item--after-checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--before-checked-x {
+		border-top-left-radius: 50px;
+		border-bottom-left-radius: 50px;
+		box-sizing: border-box;
+		background-color: #F6F7FC;
+	}
+
+	.uni-calendar-item--after-checked-x {
+		border-top-right-radius: 50px;
+		border-bottom-right-radius: 50px;
+		background-color: #F6F7FC;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js
new file mode 100644
index 0000000..b8d7d6f
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js
@@ -0,0 +1,546 @@
+/**
+* @1900-2100区间内的公历、农历互转
+* @charset UTF-8
+* @github  https://github.com/jjonline/calendar.js
+* @Author  Jea杨(JJonline@JJonline.Cn)
+* @Time    2014-7-21
+* @Time    2016-8-13 Fixed 2033hex、Attribution Annals
+* @Time    2016-9-25 Fixed lunar LeapMonth Param Bug
+* @Time    2017-7-24 Fixed use getTerm Func Param Error.use solar year,NOT lunar year
+* @Version 1.0.3
+* @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
+* @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
+*/
+/* eslint-disable */
+var calendar = {
+
+  /**
+      * 农历1900-2100的润大小信息表
+      * @Array Of Property
+      * @return Hex
+      */
+  lunarInfo: [0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2, // 1900-1909
+    0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
+    0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
+    0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
+    0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
+    0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
+    0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
+    0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
+    0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
+    0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
+    0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
+    0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
+    0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
+    0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
+    0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
+    /** Add By JJonline@JJonline.Cn**/
+    0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
+    0x0a2e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
+    0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
+    0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
+    0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
+    0x0d520], // 2100
+
+  /**
+      * 公历每个月份的天数普通表
+      * @Array Of Property
+      * @return Number
+      */
+  solarMonth: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
+
+  /**
+      * 天干地支之天干速查表
+      * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
+      * @return Cn string
+      */
+  Gan: ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678'],
+
+  /**
+      * 天干地支之地支速查表
+      * @Array Of Property
+      * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
+      * @return Cn string
+      */
+  Zhi: ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149', '\u620c', '\u4ea5'],
+
+  /**
+      * 天干地支之地支速查表<=>生肖
+      * @Array Of Property
+      * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
+      * @return Cn string
+      */
+  Animals: ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21', '\u72d7', '\u732a'],
+
+  /**
+      * 24节气速查表
+      * @Array Of Property
+      * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
+      * @return Cn string
+      */
+  solarTerm: ['\u5c0f\u5bd2', '\u5927\u5bd2', '\u7acb\u6625', '\u96e8\u6c34', '\u60ca\u86f0', '\u6625\u5206', '\u6e05\u660e', '\u8c37\u96e8', '\u7acb\u590f', '\u5c0f\u6ee1', '\u8292\u79cd', '\u590f\u81f3', '\u5c0f\u6691', '\u5927\u6691', '\u7acb\u79cb', '\u5904\u6691', '\u767d\u9732', '\u79cb\u5206', '\u5bd2\u9732', '\u971c\u964d', '\u7acb\u51ac', '\u5c0f\u96ea', '\u5927\u96ea', '\u51ac\u81f3'],
+
+  /**
+      * 1900-2100各年的24节气日期速查表
+      * @Array Of Property
+      * @return 0x string For splice
+      */
+  sTermInfo: ['9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f',
+    '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f',
+    'b027097bd097c36b0b6fc9274c91aa', '9778397bd19801ec9210c965cc920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd197c36c9210c9274c91aa',
+    '97b6b97bd19801ec95f8c965cc920e', '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec95f8c965cc920e', '97bcf97c3598082c95f8e1cfcc920f',
+    '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f',
+    '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd097bd07f595b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9210c8dc2', '9778397bd19801ec9210c9274c920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b97bd19801ec95f8c965cc920f', '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bd07f1487f595b0b0bc920fb0722',
+    '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b97bd197c36c9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36b0b70c9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '977837f0e37f149b0723b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c35b0b6fc9210c8dc2',
+    '977837f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '977837f0e37f14998082b0723b06bd', '7f07e7f0e37f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f595b0b0bb0b6fb0722', '7f0e37f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e37f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f149b0723b0787b0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0723b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722', '7f0e37f0e366aa89801eb072297c35',
+    '7ec967f0e37f14998082b0723b06bd', '7f07e7f0e37f14998083b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14898082b0723b02d5', '7f07e7f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66aa89801e9808297c35', '665f67f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66a449801e9808297c35',
+    '665f67f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e36665b66a449801e9808297c35', '665f67f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e26665b66a449801e9808297c35', '665f67f0e37f1489801eb072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722'],
+
+  /**
+      * 数字转中文速查表
+      * @Array Of Property
+      * @trans ['日','一','二','三','四','五','六','七','八','九','十']
+      * @return Cn string
+      */
+  nStr1: ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341'],
+
+  /**
+      * 日期转农历称呼速查表
+      * @Array Of Property
+      * @trans ['初','十','廿','卅']
+      * @return Cn string
+      */
+  nStr2: ['\u521d', '\u5341', '\u5eff', '\u5345'],
+
+  /**
+      * 月份转农历称呼速查表
+      * @Array Of Property
+      * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
+      * @return Cn string
+      */
+  nStr3: ['\u6b63', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341', '\u51ac', '\u814a'],
+
+  /**
+      * 返回农历y年一整年的总天数
+      * @param lunar Year
+      * @return Number
+      * @eg:var count = calendar.lYearDays(1987) ;//count=387
+      */
+  lYearDays: function (y) {
+    var i; var sum = 348
+    for (i = 0x8000; i > 0x8; i >>= 1) { sum += (this.lunarInfo[y - 1900] & i) ? 1 : 0 }
+    return (sum + this.leapDays(y))
+  },
+
+  /**
+      * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
+      * @param lunar Year
+      * @return Number (0-12)
+      * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+      */
+  leapMonth: function (y) { // 闰字编码 \u95f0
+    return (this.lunarInfo[y - 1900] & 0xf)
+  },
+
+  /**
+      * 返回农历y年闰月的天数 若该年没有闰月则返回0
+      * @param lunar Year
+      * @return Number (0、29、30)
+      * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+      */
+  leapDays: function (y) {
+    if (this.leapMonth(y)) {
+      return ((this.lunarInfo[y - 1900] & 0x10000) ? 30 : 29)
+    }
+    return (0)
+  },
+
+  /**
+      * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
+      * @param lunar Year
+      * @return Number (-1、29、30)
+      * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+      */
+  monthDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 }// 月份参数从1至12，参数错误返回-1
+    return ((this.lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29)
+  },
+
+  /**
+      * 返回公历(!)y年m月的天数
+      * @param solar Year
+      * @return Number (-1、28、29、30、31)
+      * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+      */
+  solarDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var ms = m - 1
+    if (ms == 1) { // 2月份的闰平规律测算后确认返回28或29
+      return (((y % 4 == 0) && (y % 100 != 0) || (y % 400 == 0)) ? 29 : 28)
+    } else {
+      return (this.solarMonth[ms])
+    }
+  },
+
+  /**
+     * 农历年份转换为干支纪年
+     * @param  lYear 农历年的年份数
+     * @return Cn string
+     */
+  toGanZhiYear: function (lYear) {
+    var ganKey = (lYear - 3) % 10
+    var zhiKey = (lYear - 3) % 12
+    if (ganKey == 0) ganKey = 10// 如果余数为0则为最后一个天干
+    if (zhiKey == 0) zhiKey = 12// 如果余数为0则为最后一个地支
+    return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
+  },
+
+  /**
+     * 公历月、日判断所属星座
+     * @param  cMonth [description]
+     * @param  cDay [description]
+     * @return Cn string
+     */
+  toAstro: function (cMonth, cDay) {
+    var s = '\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
+    var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
+    return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7'// 座
+  },
+
+  /**
+      * 传入offset偏移量返回干支
+      * @param offset 相对甲子的偏移量
+      * @return Cn string
+      */
+  toGanZhi: function (offset) {
+    return this.Gan[offset % 10] + this.Zhi[offset % 12]
+  },
+
+  /**
+      * 传入公历(!)y年获得该年第n个节气的公历日期
+      * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
+      * @return day Number
+      * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+      */
+  getTerm: function (y, n) {
+    if (y < 1900 || y > 2100) { return -1 }
+    if (n < 1 || n > 24) { return -1 }
+    var _table = this.sTermInfo[y - 1900]
+    var _info = [
+      parseInt('0x' + _table.substr(0, 5)).toString(),
+      parseInt('0x' + _table.substr(5, 5)).toString(),
+      parseInt('0x' + _table.substr(10, 5)).toString(),
+      parseInt('0x' + _table.substr(15, 5)).toString(),
+      parseInt('0x' + _table.substr(20, 5)).toString(),
+      parseInt('0x' + _table.substr(25, 5)).toString()
+    ]
+    var _calday = [
+      _info[0].substr(0, 1),
+      _info[0].substr(1, 2),
+      _info[0].substr(3, 1),
+      _info[0].substr(4, 2),
+
+      _info[1].substr(0, 1),
+      _info[1].substr(1, 2),
+      _info[1].substr(3, 1),
+      _info[1].substr(4, 2),
+
+      _info[2].substr(0, 1),
+      _info[2].substr(1, 2),
+      _info[2].substr(3, 1),
+      _info[2].substr(4, 2),
+
+      _info[3].substr(0, 1),
+      _info[3].substr(1, 2),
+      _info[3].substr(3, 1),
+      _info[3].substr(4, 2),
+
+      _info[4].substr(0, 1),
+      _info[4].substr(1, 2),
+      _info[4].substr(3, 1),
+      _info[4].substr(4, 2),
+
+      _info[5].substr(0, 1),
+      _info[5].substr(1, 2),
+      _info[5].substr(3, 1),
+      _info[5].substr(4, 2)
+    ]
+    return parseInt(_calday[n - 1])
+  },
+
+  /**
+      * 传入农历数字月份返回汉语通俗表示法
+      * @param lunar month
+      * @return Cn string
+      * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+      */
+  toChinaMonth: function (m) { // 月 => \u6708
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var s = this.nStr3[m - 1]
+    s += '\u6708'// 加上月字
+    return s
+  },
+
+  /**
+      * 传入农历日期数字返回汉字表示法
+      * @param lunar day
+      * @return Cn string
+      * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+      */
+  toChinaDay: function (d) { // 日 => \u65e5
+    var s
+    switch (d) {
+      case 10:
+        s = '\u521d\u5341'; break
+      case 20:
+        s = '\u4e8c\u5341'; break
+        break
+      case 30:
+        s = '\u4e09\u5341'; break
+        break
+      default :
+        s = this.nStr2[Math.floor(d / 10)]
+        s += this.nStr1[d % 10]
+    }
+    return (s)
+  },
+
+  /**
+      * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
+      * @param y year
+      * @return Cn string
+      * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+      */
+  getAnimal: function (y) {
+    return this.Animals[(y - 4) % 12]
+  },
+
+  /**
+      * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+      * @param y  solar year
+      * @param m  solar month
+      * @param d  solar day
+      * @return JSON object
+      * @eg:console.log(calendar.solar2lunar(1987,11,01));
+      */
+  solar2lunar: function (y, m, d) { // 参数区间1900.1.31~2100.12.31
+    // 年份限定、上限
+    if (y < 1900 || y > 2100) {
+      return -1// undefined转换为数字变为NaN
+    }
+    // 公历传参最下限
+    if (y == 1900 && m == 1 && d < 31) {
+      return -1
+    }
+    // 未传参  获得当天
+    if (!y) {
+      var objDate = new Date()
+    } else {
+      var objDate = new Date(y, parseInt(m) - 1, d)
+    }
+    var i; var leap = 0; var temp = 0
+    // 修正ymd参数
+    var y = objDate.getFullYear()
+    var m = objDate.getMonth() + 1
+    var d = objDate.getDate()
+    var offset = (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) - Date.UTC(1900, 0, 31)) / 86400000
+    for (i = 1900; i < 2101 && offset > 0; i++) {
+      temp = this.lYearDays(i)
+      offset -= temp
+    }
+    if (offset < 0) {
+      offset += temp; i--
+    }
+
+    // 是否今天
+    var isTodayObj = new Date()
+    var isToday = false
+    if (isTodayObj.getFullYear() == y && isTodayObj.getMonth() + 1 == m && isTodayObj.getDate() == d) {
+      isToday = true
+    }
+    // 星期几
+    var nWeek = objDate.getDay()
+    var cWeek = this.nStr1[nWeek]
+    // 数字表示周几顺应天朝周一开始的惯例
+    if (nWeek == 0) {
+      nWeek = 7
+    }
+    // 农历年
+    var year = i
+    var leap = this.leapMonth(i) // 闰哪个月
+    var isLeap = false
+
+    // 效验闰月
+    for (i = 1; i < 13 && offset > 0; i++) {
+      // 闰月
+      if (leap > 0 && i == (leap + 1) && isLeap == false) {
+        --i
+        isLeap = true; temp = this.leapDays(year) // 计算农历闰月天数
+      } else {
+        temp = this.monthDays(year, i)// 计算农历普通月天数
+      }
+      // 解除闰月
+      if (isLeap == true && i == (leap + 1)) { isLeap = false }
+      offset -= temp
+    }
+    // 闰月导致数组下标重叠取反
+    if (offset == 0 && leap > 0 && i == leap + 1) {
+      if (isLeap) {
+        isLeap = false
+      } else {
+        isLeap = true; --i
+      }
+    }
+    if (offset < 0) {
+      offset += temp; --i
+    }
+    // 农历月
+    var month = i
+    // 农历日
+    var day = offset + 1
+    // 天干地支处理
+    var sm = m - 1
+    var gzY = this.toGanZhiYear(year)
+
+    // 当月的两个节气
+    // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
+    var firstNode = this.getTerm(y, (m * 2 - 1))// 返回当月「节」为几日开始
+    var secondNode = this.getTerm(y, (m * 2))// 返回当月「节」为几日开始
+
+    // 依据12节气修正干支月
+    var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
+    if (d >= firstNode) {
+      gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
+    }
+
+    // 传入的日期的节气与否
+    var isTerm = false
+    var Term = null
+    if (firstNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 2]
+    }
+    if (secondNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 1]
+    }
+    // 日柱 当月一日与 1900/1/1 相差天数
+    var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
+    var gzD = this.toGanZhi(dayCyclical + d - 1)
+    // 该日期所属的星座
+    var astro = this.toAstro(m, d)
+
+    return { 'lYear': year, 'lMonth': month, 'lDay': day, 'Animal': this.getAnimal(year), 'IMonthCn': (isLeap ? '\u95f0' : '') + this.toChinaMonth(month), 'IDayCn': this.toChinaDay(day), 'cYear': y, 'cMonth': m, 'cDay': d, 'gzYear': gzY, 'gzMonth': gzM, 'gzDay': gzD, 'isToday': isToday, 'isLeap': isLeap, 'nWeek': nWeek, 'ncWeek': '\u661f\u671f' + cWeek, 'isTerm': isTerm, 'Term': Term, 'astro': astro }
+  },
+
+  /**
+      * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
+      * @param y  lunar year
+      * @param m  lunar month
+      * @param d  lunar day
+      * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
+      * @return JSON object
+      * @eg:console.log(calendar.lunar2solar(1987,9,10));
+      */
+  lunar2solar: function (y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
+    var isLeapMonth = !!isLeapMonth
+    var leapOffset = 0
+    var leapMonth = this.leapMonth(y)
+    var leapDay = this.leapDays(y)
+    if (isLeapMonth && (leapMonth != m)) { return -1 }// 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
+    if (y == 2100 && m == 12 && d > 1 || y == 1900 && m == 1 && d < 31) { return -1 }// 超出了最大极限值
+    var day = this.monthDays(y, m)
+    var _day = day
+    // bugFix 2016-9-25
+    // if month is leap, _day use leapDays method
+    if (isLeapMonth) {
+      _day = this.leapDays(y, m)
+    }
+    if (y < 1900 || y > 2100 || d > _day) { return -1 }// 参数合法性效验
+
+    // 计算农历的时间差
+    var offset = 0
+    for (var i = 1900; i < y; i++) {
+      offset += this.lYearDays(i)
+    }
+    var leap = 0; var isAdd = false
+    for (var i = 1; i < m; i++) {
+      leap = this.leapMonth(y)
+      if (!isAdd) { // 处理闰月
+        if (leap <= i && leap > 0) {
+          offset += this.leapDays(y); isAdd = true
+        }
+      }
+      offset += this.monthDays(y, i)
+    }
+    // 转换闰月农历 需补充该年闰月的前一个月的时差
+    if (isLeapMonth) { offset += day }
+    // 1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
+    var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
+    var calObj = new Date((offset + d - 31) * 86400000 + stmap)
+    var cY = calObj.getUTCFullYear()
+    var cM = calObj.getUTCMonth() + 1
+    var cD = calObj.getUTCDate()
+
+    return this.solar2lunar(cY, cM, cD)
+  }
+}
+
+export default calendar
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
new file mode 100644
index 0000000..8f7f181
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
@@ -0,0 +1,907 @@
+<template>
+	<view class="uni-calendar" @mouseleave="leaveCale">
+		<view v-if="!insert&&show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}"
+			@click="clean"></view>
+		<view v-if="insert || show" class="uni-calendar__content"
+			:class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow, 'uni-calendar__content-mobile': aniMaskShow}">
+			<view class="uni-calendar__header" :class="{'uni-calendar__header-mobile' :!insert}">
+				<view v-if="left" class="uni-calendar__header-btn-box" @click.stop="pre">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view>
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text
+						class="uni-calendar__header-text">{{ (nowDate.year||'') + yearText + ( nowDate.month||'') + monthText}}</text>
+				</picker>
+				<view v-if="right" class="uni-calendar__header-btn-box" @click.stop="next">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+				<view v-if="!insert" class="dialog-close" @click="clean">
+					<view class="dialog-close-plus" data-id="close"></view>
+					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+				</view>
+
+				<!-- <text class="uni-calendar__backtoday" @click="backtoday">回到今天</text> -->
+			</view>
+			<view class="uni-calendar__box">
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
+				</view>
+				<view class="uni-calendar__weeks" style="padding-bottom: 7px;">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{MONText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{WEDText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{THUText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{FRIText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SATText}}</text>
+					</view>
+				</view>
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar"
+							:selected="selected" :lunar="lunar" :checkHover="range" @change="choiceDate"
+							@handleMouse="handleMouse">
+						</calendar-item>
+					</view>
+				</view>
+			</view>
+			<view v-if="!insert && !range && typeHasTime" class="uni-date-changed uni-calendar--fixed-top"
+				style="padding: 0 80px;">
+				<view class="uni-date-changed--time-date">{{tempSingleDate ? tempSingleDate : selectDateText}}</view>
+				<time-picker type="time" :start="reactStartTime" :end="reactEndTime" v-model="time"
+					:disabled="!tempSingleDate" :border="false" :hide-second="hideSecond" class="time-picker-style">
+				</time-picker>
+			</view>
+
+			<view v-if="!insert && range && typeHasTime" class="uni-date-changed uni-calendar--fixed-top">
+				<view class="uni-date-changed--time-start">
+					<view class="uni-date-changed--time-date">{{tempRange.before ? tempRange.before : startDateText}}
+					</view>
+					<time-picker type="time" :start="reactStartTime" v-model="timeRange.startTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.before" class="time-picker-style">
+					</time-picker>
+				</view>
+				<uni-icons type="arrowthinright" color="#999" style="line-height: 50px;"></uni-icons>
+				<view class="uni-date-changed--time-end">
+					<view class="uni-date-changed--time-date">{{tempRange.after ? tempRange.after : endDateText}}</view>
+					<time-picker type="time" :end="reactEndTime" v-model="timeRange.endTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.after" class="time-picker-style">
+					</time-picker>
+				</view>
+			</view>
+			<view v-if="!insert" class="uni-date-changed uni-date-btn--ok">
+				<!-- <view class="uni-calendar__header-btn-box">
+					<text class="uni-calendar__button-text uni-calendar--fixed-width">{{okText}}</text>
+				</view> -->
+				<view class="uni-datetime-picker--btn" @click="confirm">{{confirmText}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Calendar from './util.js';
+	import calendarItem from './calendar-item.vue'
+	import timePicker from './time-picker.vue'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {Boolean} lunar 显示农历
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} insert = [true|false] 插入模式,默认为false
+	 * 	@value true 弹窗模式
+	 * 	@value false 插入模式
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @event {Function} change 日期改变，`insert :ture` 时生效
+	 * @event {Function} confirm 确认选择`insert :false` 时生效
+	 * @event {Function} monthSwitch 切换月份时触发
+	 * @example <uni-calendar :insert="true":lunar="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+	 */
+	export default {
+		components: {
+			calendarItem,
+			timePicker
+		},
+		props: {
+			date: {
+				type: String,
+				default: ''
+			},
+			defTime: {
+				type: [String, Object],
+				default: ''
+			},
+			selectableTimes: {
+				type: [Object],
+				default () {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			typeHasTime: {
+				type: Boolean,
+				default: false
+			},
+			insert: {
+				type: Boolean,
+				default: true
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			},
+			left: {
+				type: Boolean,
+				default: true
+			},
+			right: {
+				type: Boolean,
+				default: true
+			},
+			checkHover: {
+				type: Boolean,
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			},
+			pleStatus: {
+				type: Object,
+				default () {
+					return {
+						before: '',
+						after: '',
+						data: [],
+						fulldate: ''
+					}
+				}
+			}
+		},
+		data() {
+			return {
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: '',
+				aniMaskShow: false,
+				firstEnter: true,
+				time: '',
+				timeRange: {
+					startTime: '',
+					endTime: ''
+				},
+				tempSingleDate: '',
+				tempRange: {
+					before: '',
+					after: ''
+				}
+			}
+		},
+		watch: {
+			date: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!this.range) {
+						this.tempSingleDate = newVal
+						setTimeout(() => {
+							this.init(newVal)
+						}, 100)
+					}
+				}
+			},
+			defTime: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!this.range) {
+						this.time = newVal
+					} else {
+						// console.log('-----', newVal);
+						this.timeRange.startTime = newVal.start
+						this.timeRange.endTime = newVal.end
+					}
+				}
+			},
+			startDate(val) {
+				this.cale.resetSatrtDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			endDate(val) {
+				this.cale.resetEndDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			selected(newVal) {
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			},
+			pleStatus: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					const {
+						before,
+						after,
+						fulldate,
+						which
+					} = newVal
+					this.tempRange.before = before
+					this.tempRange.after = after
+					setTimeout(() => {
+						if (fulldate) {
+							this.cale.setHoverMultiple(fulldate)
+							if (before && after) {
+								this.cale.lastHover = true
+								if (this.rangeWithinMonth(after, before)) return
+								this.setDate(before)
+							} else {
+								this.cale.setMultiple(fulldate)
+								this.setDate(this.nowDate.fullDate)
+								this.calendar.fullDate = ''
+								this.cale.lastHover = false
+							}
+						} else {
+							this.cale.setDefaultMultiple(before, after)
+							if (which === 'left') {
+								this.setDate(before)
+								this.weeks = this.cale.weeks
+							} else {
+								this.setDate(after)
+								this.weeks = this.cale.weeks
+							}
+							this.cale.lastHover = true
+						}
+					}, 16)
+				}
+			}
+		},
+		computed: {
+			reactStartTime() {
+				const activeDate = this.range ? this.tempRange.before : this.calendar.fullDate
+				const res = activeDate === this.startDate ? this.selectableTimes.start : ''
+				return res
+			},
+			reactEndTime() {
+				const activeDate = this.range ? this.tempRange.after : this.calendar.fullDate
+				const res = activeDate === this.endDate ? this.selectableTimes.end : ''
+				return res
+			},
+			/**
+			 * for i18n
+			 */
+			selectDateText() {
+				return t("uni-datetime-picker.selectDate")
+			},
+			startDateText() {
+				return this.startPlaceholder || t("uni-datetime-picker.startDate")
+			},
+			endDateText() {
+				return this.endPlaceholder || t("uni-datetime-picker.endDate")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			yearText() {
+				return t("uni-datetime-picker.year")
+			},
+			monthText() {
+				return t("uni-datetime-picker.month")
+			},
+			MONText() {
+				return t("uni-calender.MON")
+			},
+			TUEText() {
+				return t("uni-calender.TUE")
+			},
+			WEDText() {
+				return t("uni-calender.WED")
+			},
+			THUText() {
+				return t("uni-calender.THU")
+			},
+			FRIText() {
+				return t("uni-calender.FRI")
+			},
+			SATText() {
+				return t("uni-calender.SAT")
+			},
+			SUNText() {
+				return t("uni-calender.SUN")
+			},
+			confirmText() {
+				return t("uni-calender.confirm")
+			},
+		},
+		created() {
+			// 获取日历方法实例
+			this.cale = new Calendar({
+				// date: new Date(),
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+				// multipleStatus: this.pleStatus
+			})
+			// 选中某一天
+			// this.cale.setDate(this.date)
+			this.init(this.date)
+			// this.setDay
+		},
+		methods: {
+			leaveCale() {
+				this.firstEnter = true
+			},
+			handleMouse(weeks) {
+				if (weeks.disable) return
+				if (this.cale.lastHover) return
+				let {
+					before,
+					after
+				} = this.cale.multipleStatus
+				if (!before) return
+				this.calendar = weeks
+				// 设置范围选
+				this.cale.setHoverMultiple(this.calendar.fullDate)
+				this.weeks = this.cale.weeks
+				// hover时，进入一个日历，更新另一个
+				if (this.firstEnter) {
+					this.$emit('firstEnterCale', this.cale.multipleStatus)
+					this.firstEnter = false
+				}
+			},
+			rangeWithinMonth(A, B) {
+				const [yearA, monthA] = A.split('-')
+				const [yearB, monthB] = B.split('-')
+				return yearA === yearB && monthA === monthB
+			},
+
+			// 取消穿透
+			clean() {
+				this.close()
+			},
+
+			clearCalender() {
+				if (this.range) {
+					this.timeRange.startTime = ''
+					this.timeRange.endTime = ''
+					this.tempRange.before = ''
+					this.tempRange.after = ''
+					this.cale.multipleStatus.before = ''
+					this.cale.multipleStatus.after = ''
+					this.cale.multipleStatus.data = []
+					this.cale.lastHover = false
+				} else {
+					this.time = ''
+					this.tempSingleDate = ''
+				}
+				this.calendar.fullDate = ''
+				this.setDate()
+			},
+
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				this.init(value)
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.calendar = this.cale.getInfo(date)
+			},
+			// choiceDate(weeks) {
+			// 	if (weeks.disable) return
+			// 	this.calendar = weeks
+			// 	// 设置多选
+			// 	this.cale.setMultiple(this.calendar.fullDate, true)
+			// 	this.weeks = this.cale.weeks
+			// 	this.tempSingleDate = this.calendar.fullDate
+			// 	this.tempRange.before = this.cale.multipleStatus.before
+			// 	this.tempRange.after = this.cale.multipleStatus.after
+			// 	this.change()
+			// },
+			/**
+			 * 打开日历弹窗
+			 */
+			open() {
+				// 弹窗模式并且清理数据
+				if (this.clearDate && !this.insert) {
+					this.cale.cleanMultipleStatus()
+					// this.cale.setDate(this.date)
+					this.init(this.date)
+				}
+				this.show = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.aniMaskShow = true
+					}, 50)
+				})
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change() {
+				if (!this.insert) return
+				this.setEmit('change')
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					lunar,
+					extraInfo
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					year,
+					month,
+					date,
+					time: this.time,
+					timeRange: this.timeRange,
+					fulldate: fullDate,
+					lunar,
+					extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				this.calendar = weeks
+				this.calendar.userChecked = true
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate, true)
+				this.weeks = this.cale.weeks
+				this.tempSingleDate = this.calendar.fullDate
+				this.tempRange.before = this.cale.multipleStatus.before
+				this.tempRange.after = this.cale.multipleStatus.after
+				this.change()
+			},
+			/**
+			 * 回到今天
+			 */
+			backtoday() {
+				let date = this.cale.getDate(new Date()).fullDate
+				// this.cale.setDate(date)
+				this.init(date)
+				this.change()
+			},
+			/**
+			 * 比较时间大小
+			 */
+			dateCompare(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				if (startDate <= endDate) {
+					return true
+				} else {
+					return false
+				}
+			},
+			/**
+			 * 上个月
+			 */
+			pre() {
+				const preDate = this.cale.getDate(this.nowDate.fullDate, -1, 'month').fullDate
+				this.setDate(preDate)
+				this.monthSwitch()
+
+			},
+			/**
+			 * 下个月
+			 */
+			next() {
+				const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, 'month').fullDate
+				this.setDate(nextDate)
+				this.monthSwitch()
+			},
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		bottom: calc(var(--window-bottom));
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		background-color: #fff;
+	}
+
+	.uni-calendar__content-mobile {
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
+		box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.1);
+	}
+
+	.uni-calendar__header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+	}
+
+	.uni-calendar__header-mobile {
+		padding: 10px;
+		padding-bottom: 0;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: rgba(0, 0, 0, 0.4);
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: #fff;
+		background-color: #f1f1f1;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: 15px;
+		color: #666;
+	}
+
+	.uni-calendar__button-text {
+		text-align: center;
+		width: 100px;
+		font-size: 14px;
+		color: #007aff;
+		/* #ifndef APP-NVUE */
+		letter-spacing: 3px;
+		/* #endif */
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 9px;
+		height: 9px;
+		border-left-color: #808080;
+		border-left-style: solid;
+		border-left-width: 1px;
+		border-top-color: #555555;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 40px;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar__weeks-day-text {
+		font-size: 12px;
+		color: #B2B2B2;
+	}
+
+	.uni-calendar__box {
+		position: relative;
+		// padding: 0 10px;
+		padding-bottom: 7px;
+	}
+
+	.uni-calendar__box-bg {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: #999;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+
+	.uni-date-changed {
+		padding: 0 10px;
+		// line-height: 50px;
+		text-align: center;
+		color: #333;
+		border-top-color: #DCDCDC;
+		;
+		border-top-style: solid;
+		border-top-width: 1px;
+		flex: 1;
+	}
+
+	.uni-date-btn--ok {
+		padding: 20px 15px;
+	}
+
+	.uni-date-changed--time-start {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-end {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-date {
+		color: #999;
+		line-height: 50px;
+		margin-right: 5px;
+		// opacity: 0.6;
+	}
+
+	.time-picker-style {
+		// width: 62px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center
+	}
+
+	.mr-10 {
+		margin-right: 10px;
+	}
+
+	.dialog-close {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 0 25px;
+		margin-top: 10px;
+	}
+
+	.dialog-close-plus {
+		width: 16px;
+		height: 2px;
+		background-color: #737987;
+		border-radius: 2px;
+		transform: rotate(45deg);
+	}
+
+	.dialog-close-rotate {
+		position: absolute;
+		transform: rotate(-45deg);
+	}
+
+	.uni-datetime-picker--btn {
+		border-radius: 100px;
+		height: 40px;
+		line-height: 40px;
+		background-color: #007aff;
+		color: #fff;
+		font-size: 16px;
+		letter-spacing: 2px;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-datetime-picker--btn:active {
+		opacity: 0.7;
+	}
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
new file mode 100644
index 0000000..9acf1ab
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
@@ -0,0 +1,22 @@
+{
+	"uni-datetime-picker.selectDate": "select date",
+	"uni-datetime-picker.selectTime": "select time",
+	"uni-datetime-picker.selectDateTime": "select datetime",
+	"uni-datetime-picker.startDate": "start date",
+	"uni-datetime-picker.endDate": "end date",
+	"uni-datetime-picker.startTime": "start time",
+	"uni-datetime-picker.endTime": "end time",
+	"uni-datetime-picker.ok": "ok",
+	"uni-datetime-picker.clear": "clear",
+	"uni-datetime-picker.cancel": "cancel",
+	"uni-datetime-picker.year": "-",
+	"uni-datetime-picker.month": "",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN",
+	"uni-calender.confirm": "confirm"
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/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-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
new file mode 100644
index 0000000..d2df5e7
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
@@ -0,0 +1,22 @@
+{
+	"uni-datetime-picker.selectDate": "选择日期",
+	"uni-datetime-picker.selectTime": "选择时间",
+	"uni-datetime-picker.selectDateTime": "选择日期时间",
+	"uni-datetime-picker.startDate": "开始日期",
+	"uni-datetime-picker.endDate": "结束日期",
+	"uni-datetime-picker.startTime": "开始时间",
+	"uni-datetime-picker.endTime": "结束时间",
+	"uni-datetime-picker.ok": "确定",
+	"uni-datetime-picker.clear": "清除",
+	"uni-datetime-picker.cancel": "取消",
+	"uni-datetime-picker.year": "年",
+	"uni-datetime-picker.month": "月",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六",
+	"uni-calender.confirm": "确认"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
new file mode 100644
index 0000000..d23fa3c
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
@@ -0,0 +1,22 @@
+{
+  "uni-datetime-picker.selectDate": "選擇日期",
+  "uni-datetime-picker.selectTime": "選擇時間",
+  "uni-datetime-picker.selectDateTime": "選擇日期時間",
+  "uni-datetime-picker.startDate": "開始日期",
+  "uni-datetime-picker.endDate": "結束日期",
+  "uni-datetime-picker.startTime": "開始时间",
+  "uni-datetime-picker.endTime": "結束时间",
+  "uni-datetime-picker.ok": "確定",
+  "uni-datetime-picker.clear": "清除",
+  "uni-datetime-picker.cancel": "取消",
+  "uni-datetime-picker.year": "年",
+  "uni-datetime-picker.month": "月",
+  "uni-calender.SUN": "日",
+  "uni-calender.MON": "一",
+  "uni-calender.TUE": "二",
+  "uni-calender.WED": "三",
+  "uni-calender.THU": "四",
+  "uni-calender.FRI": "五",
+  "uni-calender.SAT": "六",
+  "uni-calender.confirm": "確認"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/keypress.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/keypress.js
new file mode 100644
index 0000000..9601aba
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/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
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
new file mode 100644
index 0000000..699aa63
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
@@ -0,0 +1,927 @@
+<template>
+	<view class="uni-datetime-picker">
+		<view @click="initTimePicker">
+			<slot>
+				<view class="uni-datetime-picker-timebox-pointer"
+					:class="{'uni-datetime-picker-disabled': disabled, 'uni-datetime-picker-timebox': border}">
+					<text class="uni-datetime-picker-text">{{time}}</text>
+					<view v-if="!time" class="uni-datetime-picker-time">
+						<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+					</view>
+				</view>
+			</slot>
+		</view>
+		<view v-if="visible" id="mask" class="uni-datetime-picker-mask" @click="tiggerTimePicker"></view>
+		<view v-if="visible" class="uni-datetime-picker-popup" :class="[dateShow && timeShow ? '' : 'fix-nvue-height']"
+			:style="fixNvueBug">
+			<view class="uni-title">
+				<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+			</view>
+			<view v-if="dateShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :indicator-style="indicatorStyle" :value="ymd"
+					@change="bindDateChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in years" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in months" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in days" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign sign-left">-</text>
+				<text class="uni-datetime-picker-sign sign-right">-</text>
+			</view>
+			<view v-if="timeShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :class="[hideSecond ? 'time-hide-second' : '']"
+					:indicator-style="indicatorStyle" :value="hms" @change="bindTimeChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in hours" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in minutes" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!hideSecond">
+						<view class="uni-datetime-picker-item" v-for="(item,index) in seconds" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign" :class="[hideSecond ? 'sign-center' : 'sign-left']">:</text>
+				<text v-if="!hideSecond" class="uni-datetime-picker-sign sign-right">:</text>
+			</view>
+			<view class="uni-datetime-picker-btn">
+				<view @click="clearTime">
+					<text class="uni-datetime-picker-btn-text">{{clearText}}</text>
+				</view>
+				<view class="uni-datetime-picker-btn-group">
+					<view class="uni-datetime-picker-cancel" @click="tiggerTimePicker">
+						<text class="uni-datetime-picker-btn-text">{{cancelText}}</text>
+					</view>
+					<view @click="setTime">
+						<text class="uni-datetime-picker-btn-text">{{okText}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- #ifdef H5 -->
+		<!-- <keypress v-if="visible" @esc="tiggerTimePicker" @enter="setTime" /> -->
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress'
+	// #endif
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 可以同时选择日期和时间的选择器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} type = [datetime | date | time] 显示模式
+	 * @property {Boolean} multiple = [true|false] 是否多选
+	 * @property {String|Number} value 默认值
+	 * @property {String|Number} start 起始日期或时间
+	 * @property {String|Number} end 起始日期或时间
+	 * @property {String} return-type = [timestamp | string]
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: 'UniDatetimePicker',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		data() {
+			return {
+				indicatorStyle: `height: 50px;`,
+				visible: false,
+				fixNvueBug: {},
+				dateShow: true,
+				timeShow: true,
+				title: '日期和时间',
+				// 输入框当前时间
+				time: '',
+				// 当前的年月日时分秒
+				year: 1920,
+				month: 0,
+				day: 0,
+				hour: 0,
+				minute: 0,
+				second: 0,
+				// 起始时间
+				startYear: 1920,
+				startMonth: 1,
+				startDay: 1,
+				startHour: 0,
+				startMinute: 0,
+				startSecond: 0,
+				// 结束时间
+				endYear: 2120,
+				endMonth: 12,
+				endDay: 31,
+				endHour: 23,
+				endMinute: 59,
+				endSecond: 59,
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			border: {
+				type: [Boolean, String],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean, String],
+				default: false
+			}
+		},
+		watch: {
+			value: {
+				handler(newVal, oldVal) {
+					if (newVal) {
+						this.parseValue(this.fixIosDateFormat(newVal)) //兼容 iOS、safari 日期格式
+						this.initTime(false)
+					} else {
+						this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			type: {
+				handler(newValue) {
+					if (newValue === 'date') {
+						this.dateShow = true
+						this.timeShow = false
+						this.title = '日期'
+					} else if (newValue === 'time') {
+						this.dateShow = false
+						this.timeShow = true
+						this.title = '时间'
+					} else {
+						this.dateShow = true
+						this.timeShow = true
+						this.title = '日期和时间'
+					}
+				},
+				immediate: true
+			},
+			start: {
+				handler(newVal) {
+					this.parseDatetimeRange(this.fixIosDateFormat(newVal), 'start') //兼容 iOS、safari 日期格式
+				},
+				immediate: true
+			},
+			end: {
+				handler(newVal) {
+					this.parseDatetimeRange(this.fixIosDateFormat(newVal), 'end') //兼容 iOS、safari 日期格式
+				},
+				immediate: true
+			},
+
+			// 月、日、时、分、秒可选范围变化后，检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			months(newVal) {
+				this.checkValue('month', this.month, newVal)
+			},
+			days(newVal) {
+				this.checkValue('day', this.day, newVal)
+			},
+			hours(newVal) {
+				this.checkValue('hour', this.hour, newVal)
+			},
+			minutes(newVal) {
+				this.checkValue('minute', this.minute, newVal)
+			},
+			seconds(newVal) {
+				this.checkValue('second', this.second, newVal)
+			}
+		},
+		computed: {
+			// 当前年、月、日、时、分、秒选择范围
+			years() {
+				return this.getCurrentRange('year')
+			},
+
+			months() {
+				return this.getCurrentRange('month')
+			},
+
+			days() {
+				return this.getCurrentRange('day')
+			},
+
+			hours() {
+				return this.getCurrentRange('hour')
+			},
+
+			minutes() {
+				return this.getCurrentRange('minute')
+			},
+
+			seconds() {
+				return this.getCurrentRange('second')
+			},
+
+			// picker 当前值数组
+			ymd() {
+				return [this.year - this.minYear, this.month - this.minMonth, this.day - this.minDay]
+			},
+			hms() {
+				return [this.hour - this.minHour, this.minute - this.minMinute, this.second - this.minSecond]
+			},
+
+			// 当前 date 是 start
+			currentDateIsStart() {
+				return this.year === this.startYear && this.month === this.startMonth && this.day === this.startDay
+			},
+
+			// 当前 date 是 end
+			currentDateIsEnd() {
+				return this.year === this.endYear && this.month === this.endMonth && this.day === this.endDay
+			},
+
+			// 当前年、月、日、时、分、秒的最小值和最大值
+			minYear() {
+				return this.startYear
+			},
+			maxYear() {
+				return this.endYear
+			},
+			minMonth() {
+				if (this.year === this.startYear) {
+					return this.startMonth
+				} else {
+					return 1
+				}
+			},
+			maxMonth() {
+				if (this.year === this.endYear) {
+					return this.endMonth
+				} else {
+					return 12
+				}
+			},
+			minDay() {
+				if (this.year === this.startYear && this.month === this.startMonth) {
+					return this.startDay
+				} else {
+					return 1
+				}
+			},
+			maxDay() {
+				if (this.year === this.endYear && this.month === this.endMonth) {
+					return this.endDay
+				} else {
+					return this.daysInMonth(this.year, this.month)
+				}
+			},
+			minHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart) {
+						return this.startHour
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					return this.startHour
+				}
+			},
+			maxHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd) {
+						return this.endHour
+					} else {
+						return 23
+					}
+				}
+				if (this.type === 'time') {
+					return this.endHour
+				}
+			},
+			minMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+			},
+			maxMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+			},
+			minSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+			},
+			maxSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+			},
+
+			/**
+			 * for i18n
+			 */
+			selectTimeText() {
+				return t("uni-datetime-picker.selectTime")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return t("uni-datetime-picker.clear")
+			},
+			cancelText() {
+				return t("uni-datetime-picker.cancel")
+			}
+		},
+
+		mounted() {
+			// #ifdef APP-NVUE
+			const res = uni.getSystemInfoSync();
+			this.fixNvueBug = {
+				top: res.windowHeight / 2,
+				left: res.windowWidth / 2
+			}
+			// #endif
+		},
+
+		methods: {
+			/**
+			 * @param {Object} item
+			 * 小于 10 在前面加个 0
+			 */
+
+			lessThanTen(item) {
+				return item < 10 ? '0' + item : item
+			},
+
+			/**
+			 * 解析时分秒字符串，例如：00:00:00
+			 * @param {String} timeString
+			 */
+			parseTimeType(timeString) {
+				if (timeString) {
+					let timeArr = timeString.split(':')
+					this.hour = Number(timeArr[0])
+					this.minute = Number(timeArr[1])
+					this.second = Number(timeArr[2])
+				}
+			},
+
+			/**
+			 * 解析选择器初始值，类型可以是字符串、时间戳，例如：2000-10-02、'08:30:00'、 1610695109000
+			 * @param {String | Number} datetime
+			 */
+			initPickerValue(datetime) {
+				let defaultValue = null
+				if (datetime) {
+					defaultValue = this.compareValueWithStartAndEnd(datetime, this.start, this.end)
+				} else {
+					defaultValue = Date.now()
+					defaultValue = this.compareValueWithStartAndEnd(defaultValue, this.start, this.end)
+				}
+				this.parseValue(defaultValue)
+			},
+
+			/**
+			 * 初始值规则：
+			 * - 用户设置初始值 value
+			 * 	- 设置了起始时间 start、终止时间 end，并 start < value < end，初始值为 value， 否则初始值为 start
+			 * 	- 只设置了起始时间 start，并 start < value，初始值为 value，否则初始值为 start
+			 * 	- 只设置了终止时间 end，并 value < end，初始值为 value，否则初始值为 end
+			 * 	- 无起始终止时间，则初始值为 value
+			 * - 无初始值 value，则初始值为当前本地时间 Date.now()
+			 * @param {Object} value
+			 * @param {Object} dateBase
+			 */
+			compareValueWithStartAndEnd(value, start, end) {
+				let winner = null
+				value = this.superTimeStamp(value)
+				start = this.superTimeStamp(start)
+				end = this.superTimeStamp(end)
+
+				if (start && end) {
+					if (value < start) {
+						winner = new Date(start)
+					} else if (value > end) {
+						winner = new Date(end)
+					} else {
+						winner = new Date(value)
+					}
+				} else if (start && !end) {
+					winner = start <= value ? new Date(value) : new Date(start)
+				} else if (!start && end) {
+					winner = value <= end ? new Date(value) : new Date(end)
+				} else {
+					winner = new Date(value)
+				}
+
+				return winner
+			},
+
+			/**
+			 * 转换为可比较的时间戳，接受日期、时分秒、时间戳
+			 * @param {Object} value
+			 */
+			superTimeStamp(value) {
+				let dateBase = ''
+				if (this.type === 'time' && value && typeof value === 'string') {
+					const now = new Date()
+					const year = now.getFullYear()
+					const month = now.getMonth() + 1
+					const day = now.getDate()
+					dateBase = year + '/' + month + '/' + day + ' '
+				}
+				if (Number(value) && typeof value !== NaN) {
+					value = parseInt(value)
+					dateBase = 0
+				}
+				return this.createTimeStamp(dateBase + value)
+			},
+
+			/**
+			 * 解析默认值 value，字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseValue(value) {
+				if (!value) {
+					return
+				}
+				if (this.type === 'time' && typeof value === "string") {
+					this.parseTimeType(value)
+				} else {
+					let defaultDate = null
+					defaultDate = new Date(value)
+					if (this.type !== 'time') {
+						this.year = defaultDate.getFullYear()
+						this.month = defaultDate.getMonth() + 1
+						this.day = defaultDate.getDate()
+					}
+					if (this.type !== 'date') {
+						this.hour = defaultDate.getHours()
+						this.minute = defaultDate.getMinutes()
+						this.second = defaultDate.getSeconds()
+					}
+				}
+				if (this.hideSecond) {
+					this.second = 0
+				}
+			},
+
+			/**
+			 * 解析可选择时间范围 start、end，年月日字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseDatetimeRange(point, pointType) {
+				// 时间为空，则重置为初始值
+				if (!point) {
+					if (pointType === 'start') {
+						this.startYear = 1920
+						this.startMonth = 1
+						this.startDay = 1
+						this.startHour = 0
+						this.startMinute = 0
+						this.startSecond = 0
+					}
+					if (pointType === 'end') {
+						this.endYear = 2120
+						this.endMonth = 12
+						this.endDay = 31
+						this.endHour = 23
+						this.endMinute = 59
+						this.endSecond = 59
+					}
+					return
+				}
+				if (this.type === 'time') {
+					const pointArr = point.split(':')
+					this[pointType + 'Hour'] = Number(pointArr[0])
+					this[pointType + 'Minute'] = Number(pointArr[1])
+					this[pointType + 'Second'] = Number(pointArr[2])
+				} else {
+					if (!point) {
+						pointType === 'start' ? this.startYear = this.year - 60 : this.endYear = this.year + 60
+						return
+					}
+					if (Number(point) && Number(point) !== NaN) {
+						point = parseInt(point)
+					}
+					// datetime 的 end 没有时分秒, 则不限制
+					const hasTime = /[0-9]:[0-9]/
+					if (this.type === 'datetime' && pointType === 'end' && typeof point === 'string' && !hasTime.test(
+							point)) {
+						point = point + ' 23:59:59'
+					}
+					const pointDate = new Date(point)
+					this[pointType + 'Year'] = pointDate.getFullYear()
+					this[pointType + 'Month'] = pointDate.getMonth() + 1
+					this[pointType + 'Day'] = pointDate.getDate()
+					if (this.type === 'datetime') {
+						this[pointType + 'Hour'] = pointDate.getHours()
+						this[pointType + 'Minute'] = pointDate.getMinutes()
+						this[pointType + 'Second'] = pointDate.getSeconds()
+					}
+				}
+			},
+
+			// 获取 年、月、日、时、分、秒 当前可选范围
+			getCurrentRange(value) {
+				const range = []
+				for (let i = this['min' + this.capitalize(value)]; i <= this['max' + this.capitalize(value)]; i++) {
+					range.push(i)
+				}
+				return range
+			},
+
+			// 字符串首字母大写
+			capitalize(str) {
+				return str.charAt(0).toUpperCase() + str.slice(1)
+			},
+
+			// 检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			checkValue(name, value, values) {
+				if (values.indexOf(value) === -1) {
+					this[name] = values[0]
+				}
+			},
+
+			// 每个月的实际天数
+			daysInMonth(year, month) { // Use 1 for January, 2 for February, etc.
+				return new Date(year, month, 0).getDate();
+			},
+
+			//兼容 iOS、safari 日期格式
+			fixIosDateFormat(value) {
+				if (typeof value === 'string') {
+					value = value.replace(/-/g, '/')
+				}
+				return value
+			},
+
+			/**
+			 * 生成时间戳
+			 * @param {Object} time
+			 */
+			createTimeStamp(time) {
+				if (!time) return
+				if (typeof time === "number") {
+					return time
+				} else {
+					time = time.replace(/-/g, '/')
+					if (this.type === 'date') {
+						time = time + ' ' + '00:00:00'
+					}
+					return Date.parse(time)
+				}
+			},
+
+			/**
+			 * 生成日期或时间的字符串
+			 */
+			createDomSting() {
+				const yymmdd = this.year +
+					'-' +
+					this.lessThanTen(this.month) +
+					'-' +
+					this.lessThanTen(this.day)
+
+				let hhmmss = this.lessThanTen(this.hour) +
+					':' +
+					this.lessThanTen(this.minute)
+
+				if (!this.hideSecond) {
+					hhmmss = hhmmss + ':' + this.lessThanTen(this.second)
+				}
+
+				if (this.type === 'date') {
+					return yymmdd
+				} else if (this.type === 'time') {
+					return hhmmss
+				} else {
+					return yymmdd + ' ' + hhmmss
+				}
+			},
+
+			/**
+			 * 初始化返回值，并抛出 change 事件
+			 */
+			initTime(emit = true) {
+				this.time = this.createDomSting()
+				if (!emit) return
+				if (this.returnType === 'timestamp' && this.type !== 'time') {
+					this.$emit('change', this.createTimeStamp(this.time))
+					this.$emit('input', this.createTimeStamp(this.time))
+					this.$emit('update:modelValue', this.createTimeStamp(this.time))
+				} else {
+					this.$emit('change', this.time)
+					this.$emit('input', this.time)
+					this.$emit('update:modelValue', this.time)
+				}
+			},
+
+			/**
+			 * 用户选择日期或时间更新 data
+			 * @param {Object} e
+			 */
+			bindDateChange(e) {
+				const val = e.detail.value
+				this.year = this.years[val[0]]
+				this.month = this.months[val[1]]
+				this.day = this.days[val[2]]
+			},
+			bindTimeChange(e) {
+				const val = e.detail.value
+				this.hour = this.hours[val[0]]
+				this.minute = this.minutes[val[1]]
+				this.second = this.seconds[val[2]]
+			},
+
+			/**
+			 * 初始化弹出层
+			 */
+			initTimePicker() {
+				if (this.disabled) return
+				const value = this.fixIosDateFormat(this.value)
+				this.initPickerValue(value)
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 触发或关闭弹框
+			 */
+			tiggerTimePicker(e) {
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 用户点击“清空”按钮，清空当前值
+			 */
+			clearTime() {
+				this.time = ''
+				this.$emit('change', this.time)
+				this.$emit('input', this.time)
+				this.$emit('update:modelValue', this.time)
+				this.tiggerTimePicker()
+			},
+
+			/**
+			 * 用户点击“确定”按钮
+			 */
+			setTime() {
+				this.initTime()
+				this.tiggerTimePicker()
+			}
+		}
+	}
+</script>
+
+<style>
+	.uni-datetime-picker {
+		/* #ifndef APP-NVUE */
+		/* width: 100%; */
+		/* #endif */
+	}
+
+	.uni-datetime-picker-view {
+		height: 130px;
+		width: 270px;
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-item {
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		font-size: 14px;
+	}
+
+	.uni-datetime-picker-btn {
+		margin-top: 60px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.uni-datetime-picker-btn-text {
+		font-size: 14px;
+		color: #007AFF;
+	}
+
+	.uni-datetime-picker-btn-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-datetime-picker-cancel {
+		margin-right: 30px;
+	}
+
+	.uni-datetime-picker-mask {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-duration: 0.3s;
+		z-index: 998;
+	}
+
+	.uni-datetime-picker-popup {
+		border-radius: 8px;
+		padding: 30px;
+		width: 270px;
+		/* #ifdef APP-NVUE */
+		height: 500px;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 330px;
+		/* #endif */
+		background-color: #fff;
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		transition-duration: 0.3s;
+		z-index: 999;
+	}
+
+	.fix-nvue-height {
+		/* #ifdef APP-NVUE */
+		height: 330px;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-time {
+		color: grey;
+	}
+
+	.uni-datetime-picker-column {
+		height: 50px;
+	}
+
+	.uni-datetime-picker-timebox {
+
+		border: 1px solid #E5E5E5;
+		border-radius: 5px;
+		padding: 7px 10px;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-timebox-pointer {
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-datetime-picker-disabled {
+		opacity: 0.4;
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-text {
+		font-size: 14px;
+	}
+
+	.uni-datetime-picker-sign {
+		position: absolute;
+		top: 53px;
+		/* 减掉 10px 的元素高度，兼容nvue */
+		color: #999;
+		/* #ifdef APP-NVUE */
+		font-size: 16px;
+		/* #endif */
+	}
+
+	.sign-left {
+		left: 86px;
+	}
+
+	.sign-right {
+		right: 86px;
+	}
+
+	.sign-center {
+		left: 135px;
+	}
+
+	.uni-datetime-picker__container-box {
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 40px;
+	}
+
+	.time-hide-second {
+		width: 180px;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
new file mode 100644
index 0000000..9bdf8bc
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
@@ -0,0 +1,1012 @@
+<template>
+	<view class="uni-date">
+		<view class="uni-date-editor" @click="show">
+			<slot>
+				<view class="uni-date-editor--x" :class="{'uni-date-editor--x__disabled': disabled,
+		'uni-date-x--border': border}">
+					<view v-if="!isRange" class="uni-date-x uni-date-single">
+						<uni-icons type="calendar" color="#c0c4cc" size="22"></uni-icons>
+						<input class="uni-date__x-input" type="text" v-model="singleVal"
+							:placeholder="singlePlaceholderText" :disabled="true" />
+					</view>
+					<view v-else class="uni-date-x uni-date-range">
+						<uni-icons type="calendar" color="#c0c4cc" size="22"></uni-icons>
+						<input class="uni-date__x-input t-c" type="text" v-model="range.startDate"
+							:placeholder="startPlaceholderText" :disabled="true" />
+						<slot>
+							<view class="">{{rangeSeparator}}</view>
+						</slot>
+						<input class="uni-date__x-input t-c" type="text" v-model="range.endDate"
+							:placeholder="endPlaceholderText" :disabled="true" />
+					</view>
+					<view v-if="showClearIcon" class="uni-date__icon-clear" @click.stop="clear">
+						<uni-icons type="clear" color="#c0c4cc" size="24"></uni-icons>
+					</view>
+				</view>
+			</slot>
+		</view>
+
+		<view v-show="popup" class="uni-date-mask" @click="close"></view>
+		<view v-if="!isPhone" ref="datePicker" v-show="popup" class="uni-date-picker__container">
+			<view v-if="!isRange" class="uni-date-single--x" :style="popover">
+				<view class="uni-popper__arrow"></view>
+				<view v-if="hasTime" class="uni-date-changed popup-x-header">
+					<input class="uni-date__input t-c" type="text" v-model="tempSingleDate"
+						:placeholder="selectDateText" />
+					<time-picker type="time" v-model="time" :border="false" :disabled="!tempSingleDate"
+						:start="reactStartTime" :end="reactEndTime" :hideSecond="hideSecond" style="width: 100%;">
+						<input class="uni-date__input t-c" type="text" v-model="time" :placeholder="selectTimeText"
+							:disabled="!tempSingleDate" />
+					</time-picker>
+				</view>
+				<calendar ref="pcSingle" :showMonth="false" :start-date="caleRange.startDate"
+					:end-date="caleRange.endDate" :date="defSingleDate" @change="singleChange"
+					style="padding: 0 8px;" />
+				<view v-if="hasTime" class="popup-x-footer">
+					<!-- <text class="">此刻</text> -->
+					<text class="confirm" @click="confirmSingleChange">{{okText}}</text>
+				</view>
+				<view class="uni-date-popper__arrow"></view>
+			</view>
+
+			<view v-else class="uni-date-range--x" :style="popover">
+				<view class="uni-popper__arrow"></view>
+				<view v-if="hasTime" class="popup-x-header uni-date-changed">
+					<view class="popup-x-header--datetime">
+						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startDate"
+							:placeholder="startDateText" />
+						<time-picker type="time" v-model="tempRange.startTime" :start="reactStartTime" :border="false"
+							:disabled="!tempRange.startDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text"
+								v-model="tempRange.startTime" :placeholder="startTimeText"
+								:disabled="!tempRange.startDate" />
+						</time-picker>
+					</view>
+					<uni-icons type="arrowthinright" color="#999" style="line-height: 40px;"></uni-icons>
+					<view class="popup-x-header--datetime">
+						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endDate"
+							:placeholder="endDateText" />
+						<time-picker type="time" v-model="tempRange.endTime" :end="reactEndTime" :border="false"
+							:disabled="!tempRange.endDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endTime"
+								:placeholder="endTimeText" :disabled="!tempRange.endDate" />
+						</time-picker>
+					</view>
+				</view>
+				<view class="popup-x-body">
+					<calendar ref="left" :showMonth="false" :start-date="caleRange.startDate"
+						:end-date="caleRange.endDate" :range="true" @change="leftChange" :pleStatus="endMultipleStatus"
+						@firstEnterCale="updateRightCale" @monthSwitch="leftMonthSwitch" style="padding: 0 8px;" />
+					<calendar ref="right" :showMonth="false" :start-date="caleRange.startDate"
+						:end-date="caleRange.endDate" :range="true" @change="rightChange"
+						:pleStatus="startMultipleStatus" @firstEnterCale="updateLeftCale"
+						@monthSwitch="rightMonthSwitch" style="padding: 0 8px;border-left: 1px solid #F1F1F1;" />
+				</view>
+				<view v-if="hasTime" class="popup-x-footer">
+					<text class="" @click="clear">{{clearText}}</text>
+					<text class="confirm" @click="confirmRangeChange">{{okText}}</text>
+				</view>
+			</view>
+		</view>
+		<calendar v-show="isPhone" ref="mobile" :clearDate="false" :date="defSingleDate" :defTime="reactMobDefTime"
+			:start-date="caleRange.startDate" :end-date="caleRange.endDate" :selectableTimes="mobSelectableTime"
+			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :typeHasTime="hasTime" :insert="false"
+			:hideSecond="hideSecond" @confirm="mobileChange" />
+	</view>
+</template>
+<script>
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 同时支持 PC 和移动端使用日历选择日期和日期范围
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3962
+	 * @property {String} type 选择器类型
+	 * @property {String|Number|Array|Date} value 绑定值
+	 * @property {String} placeholder 单选择时的占位内容
+	 * @property {String} start 起始时间
+	 * @property {String} end 终止时间
+	 * @property {String} start-placeholder 范围选择时开始日期的占位内容
+	 * @property {String} end-placeholder 范围选择时结束日期的占位内容
+	 * @property {String} range-separator 选择范围时的分隔符
+	 * @property {Boolean} border = [true|false] 是否有边框
+	 * @property {Boolean} disabled = [true|false] 是否禁用
+	 * @property {Boolean} clearIcon = [true|false] 是否显示清除按钮（仅PC端适用）
+	 * @event {Function} change 确定日期时触发的事件
+	 * @event {Function} show 打开弹出层
+	 * @event {Function} close 关闭弹出层
+	 * @event {Function} clear 清除上次选中的状态和值
+	 **/
+	import calendar from './calendar.vue'
+	import timePicker from './time-picker.vue'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+
+	export default {
+		name: 'UniDatetimePicker',
+		options: {
+			virtualHost: true
+		},
+		components: {
+			calendar,
+			timePicker
+		},
+		inject: {
+			form: {
+				from: 'uniForm',
+				default: null
+			},
+			formItem: {
+				from: 'uniFormItem',
+				default: null
+			},
+		},
+		data() {
+			return {
+				isRange: false,
+				hasTime: false,
+				mobileRange: false,
+				// 单选
+				singleVal: '',
+				tempSingleDate: '',
+				defSingleDate: '',
+				time: '',
+				// 范围选
+				caleRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				range: {
+					startDate: '',
+					// startTime: '',
+					endDate: '',
+					// endTime: ''
+				},
+				tempRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				// 左右日历同步数据
+				startMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				endMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				visible: false,
+				popup: false,
+				popover: null,
+				isEmitValue: false,
+				isPhone: false,
+				isFirstShow: true,
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			placeholder: {
+				type: String,
+				default: ''
+			},
+			startPlaceholder: {
+				type: String,
+				default: ''
+			},
+			endPlaceholder: {
+				type: String,
+				default: ''
+			},
+			rangeSeparator: {
+				type: String,
+				default: '-'
+			},
+			border: {
+				type: [Boolean],
+				default: true
+			},
+			disabled: {
+				type: [Boolean],
+				default: false
+			},
+			clearIcon: {
+				type: [Boolean],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			}
+		},
+		watch: {
+			type: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (newVal.indexOf('time') !== -1) {
+						this.hasTime = true
+					} else {
+						this.hasTime = false
+					}
+					if (newVal.indexOf('range') !== -1) {
+						this.isRange = true
+					} else {
+						this.isRange = false
+					}
+				}
+			},
+			// #ifndef VUE3
+			value: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
+			start: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!newVal) return
+					const {
+						defDate,
+						defTime
+					} = this.parseDate(newVal)
+					this.caleRange.startDate = defDate
+					if (this.hasTime) {
+						this.caleRange.startTime = defTime
+					}
+				}
+			},
+			end: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!newVal) return
+					const {
+						defDate,
+						defTime
+					} = this.parseDate(newVal)
+					this.caleRange.endDate = defDate
+					if (this.hasTime) {
+						this.caleRange.endTime = defTime
+					}
+				}
+			},
+		},
+		computed: {
+			reactStartTime() {
+				const activeDate = this.isRange ? this.tempRange.startDate : this.tempSingleDate
+				const res = activeDate === this.caleRange.startDate ? this.caleRange.startTime : ''
+				return res
+			},
+			reactEndTime() {
+				const activeDate = this.isRange ? this.tempRange.endDate : this.tempSingleDate
+				const res = activeDate === this.caleRange.endDate ? this.caleRange.endTime : ''
+				return res
+			},
+			reactMobDefTime() {
+				const times = {
+					start: this.tempRange.startTime,
+					end: this.tempRange.endTime
+				}
+				return this.isRange ? times : this.time
+			},
+			mobSelectableTime() {
+				return {
+					start: this.caleRange.startTime,
+					end: this.caleRange.endTime
+				}
+			},
+			datePopupWidth() {
+				// todo
+				return this.isRange ? 653 : 301
+			},
+
+			/**
+			 * for i18n
+			 */
+			singlePlaceholderText() {
+				return this.placeholder || (this.type === 'date' ? this.selectDateText : t(
+					"uni-datetime-picker.selectDateTime"))
+			},
+			startPlaceholderText() {
+				return this.startPlaceholder || this.startDateText
+			},
+			endPlaceholderText() {
+				return this.endPlaceholder || this.endDateText
+			},
+			selectDateText() {
+				return t("uni-datetime-picker.selectDate")
+			},
+			selectTimeText() {
+				return t("uni-datetime-picker.selectTime")
+			},
+			startDateText() {
+				return this.startPlaceholder || t("uni-datetime-picker.startDate")
+			},
+			startTimeText() {
+				return t("uni-datetime-picker.startTime")
+			},
+			endDateText() {
+				return this.endPlaceholder || t("uni-datetime-picker.endDate")
+			},
+			endTimeText() {
+				return t("uni-datetime-picker.endTime")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return t("uni-datetime-picker.clear")
+			},
+			showClearIcon() {
+				const {
+					clearIcon,
+					disabled,
+					singleVal,
+					range
+				} = this
+				const bool = clearIcon && !disabled && (singleVal || (range.startDate && range.endDate))
+				return bool
+			}
+		},
+		created() {
+			// if (this.form && this.formItem) {
+			// 	this.$watch('formItem.errMsg', (newVal) => {
+			// 		this.localMsg = newVal
+			// 	})
+			// }
+		},
+		mounted() {
+			this.platform()
+		},
+		methods: {
+			initPicker(newVal) {
+				if (!newVal || Array.isArray(newVal) && !newVal.length) {
+					this.$nextTick(() => {
+						this.clear(false)
+					})
+					return
+				}
+				if (!Array.isArray(newVal) && !this.isRange) {
+					const {
+						defDate,
+						defTime
+					} = this.parseDate(newVal)
+					this.singleVal = defDate
+					this.tempSingleDate = defDate
+					this.defSingleDate = defDate
+					if (this.hasTime) {
+						this.singleVal = defDate + ' ' + defTime
+						this.time = defTime
+					}
+				} else {
+					const [before, after] = newVal
+					if (!before && !after) return
+					const defBefore = this.parseDate(before)
+					const defAfter = this.parseDate(after)
+					const startDate = defBefore.defDate
+					const endDate = defAfter.defDate
+					this.range.startDate = this.tempRange.startDate = startDate
+					this.range.endDate = this.tempRange.endDate = endDate
+
+					if (this.hasTime) {
+						this.range.startDate = defBefore.defDate + ' ' + defBefore.defTime
+						this.range.endDate = defAfter.defDate + ' ' + defAfter.defTime
+						this.tempRange.startTime = defBefore.defTime
+						this.tempRange.endTime = defAfter.defTime
+					}
+					const defaultRange = {
+						before: defBefore.defDate,
+						after: defAfter.defDate
+					}
+					this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, defaultRange, {
+						which: 'right'
+					})
+					this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, defaultRange, {
+						which: 'left'
+					})
+				}
+			},
+			updateLeftCale(e) {
+				const left = this.$refs.left
+				// 设置范围选
+				left.cale.setHoverMultiple(e.after)
+				left.setDate(this.$refs.left.nowDate.fullDate)
+			},
+			updateRightCale(e) {
+				const right = this.$refs.right
+				// 设置范围选
+				right.cale.setHoverMultiple(e.after)
+				right.setDate(this.$refs.right.nowDate.fullDate)
+			},
+			platform() {
+				const systemInfo = uni.getSystemInfoSync()
+				this.isPhone = systemInfo.windowWidth <= 500
+				this.windowWidth = systemInfo.windowWidth
+			},
+			show(event) {
+				if (this.disabled) {
+					return
+				}
+				this.platform()
+				if (this.isPhone) {
+					this.$refs.mobile.open()
+					return
+				}
+				this.popover = {
+					top: '10px'
+				}
+				const dateEditor = uni.createSelectorQuery().in(this).select(".uni-date-editor")
+				dateEditor.boundingClientRect(rect => {
+					if (this.windowWidth - rect.left < this.datePopupWidth) {
+						this.popover.right = 0
+					}
+				}).exec()
+				setTimeout(() => {
+					this.popup = !this.popup
+					if (!this.isPhone && this.isRange && this.isFirstShow) {
+						this.isFirstShow = false
+						const {
+							startDate,
+							endDate
+						} = this.range
+						if (startDate && endDate) {
+							if (this.diffDate(startDate, endDate) < 30) {
+								this.$refs.right.next()
+							}
+						} else {
+							this.$refs.right.next()
+							this.$refs.right.cale.lastHover = false
+						}
+					}
+
+				}, 50)
+			},
+
+			close() {
+				setTimeout(() => {
+					this.popup = false
+					this.$emit('maskClick', this.value)
+				}, 20)
+			},
+			setEmit(value) {
+				if (this.returnType === "timestamp" || this.returnType === "date") {
+					if (!Array.isArray(value)) {
+						if (!this.hasTime) {
+							value = value + ' ' + '00:00:00'
+						}
+						value = this.createTimestamp(value)
+						if (this.returnType === "date") {
+							value = new Date(value)
+						}
+					} else {
+						if (!this.hasTime) {
+							value[0] = value[0] + ' ' + '00:00:00'
+							value[1] = value[1] + ' ' + '00:00:00'
+						}
+						value[0] = this.createTimestamp(value[0])
+						value[1] = this.createTimestamp(value[1])
+						if (this.returnType === "date") {
+							value[0] = new Date(value[0])
+							value[1] = new Date(value[1])
+						}
+					}
+				}
+				
+				
+				this.$emit('change', value)
+				this.$emit('input', value)
+				this.$emit('update:modelValue', value)
+				this.isEmitValue = true
+			},
+			createTimestamp(date) {
+				date = this.fixIosDateFormat(date)
+				return Date.parse(new Date(date))
+			},
+			singleChange(e) {
+				this.tempSingleDate = e.fulldate
+				if (this.hasTime) return
+				this.confirmSingleChange()
+			},
+
+			confirmSingleChange() {
+				if (!this.tempSingleDate) {
+					this.popup = false
+					return
+				}
+				if (this.hasTime) {
+					this.singleVal = this.tempSingleDate + ' ' + (this.time ? this.time : '00:00:00')
+				} else {
+					this.singleVal = this.tempSingleDate
+				}
+				this.setEmit(this.singleVal)
+				this.popup = false
+			},
+
+			leftChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, obj)
+			},
+
+			rightChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, obj)
+			},
+
+			mobileChange(e) {
+				if (this.isRange) {
+					const {
+						before,
+						after
+					} = e.range
+					this.handleStartAndEnd(before, after, true)
+					if (this.hasTime) {
+						const {
+							startTime,
+							endTime
+						} = e.timeRange
+						this.tempRange.startTime = startTime
+						this.tempRange.endTime = endTime
+					}
+					this.confirmRangeChange()
+
+				} else {
+					if (this.hasTime) {
+						this.singleVal = e.fulldate + ' ' + e.time
+					} else {
+						this.singleVal = e.fulldate
+					}
+					this.setEmit(this.singleVal)
+				}
+				this.$refs.mobile.close()
+			},
+
+			rangeChange(before, after) {
+				if (!(before && after)) return
+				this.handleStartAndEnd(before, after, true)
+				if (this.hasTime) return
+				this.confirmRangeChange()
+			},
+
+			confirmRangeChange() {
+				if (!this.tempRange.startDate && !this.tempRange.endDate) {
+					this.popup = false
+					return
+				}
+				let start, end
+				if (!this.hasTime) {
+					start = this.range.startDate = this.tempRange.startDate
+					end = this.range.endDate = this.tempRange.endDate
+				} else {
+					start = this.range.startDate = this.tempRange.startDate + ' ' +
+						(this.tempRange.startTime ? this.tempRange.startTime : '00:00:00')
+					end = this.range.endDate = this.tempRange.endDate + ' ' +
+						(this.tempRange.endTime ? this.tempRange.endTime : '00:00:00')
+				}
+				const displayRange = [start, end]
+				this.setEmit(displayRange)
+				this.popup = false
+			},
+
+			handleStartAndEnd(before, after, temp = false) {
+				if (!(before && after)) return
+				const type = temp ? 'tempRange' : 'range'
+				if (this.dateCompare(before, after)) {
+					this[type].startDate = before
+					this[type].endDate = after
+				} else {
+					this[type].startDate = after
+					this[type].endDate = before
+				}
+			},
+
+			/**
+			 * 比较时间大小
+			 */
+			dateCompare(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				if (startDate <= endDate) {
+					return true
+				} else {
+					return false
+				}
+			},
+
+			/**
+			 * 比较时间差
+			 */
+			diffDate(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				const diff = (endDate - startDate) / (24 * 60 * 60 * 1000)
+				return Math.abs(diff)
+			},
+
+			clear(needEmit = true) {
+				if (!this.isRange) {
+					this.singleVal = ''
+					this.tempSingleDate = ''
+					this.time = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.pcSingle && this.$refs.pcSingle.clearCalender()
+					}
+					if (needEmit) {
+						// 校验规则
+						// if(this.form  && this.formItem){
+						// 	const {
+						// 		validateTrigger
+						// 	} = this.form
+						// 	if (validateTrigger === 'blur') {
+						// 		this.formItem.onFieldChange()
+						// 	}
+						// }
+						this.$emit('change', '')
+						this.$emit('input', '')
+						this.$emit('update:modelValue', '')
+					}
+				} else {
+					this.range.startDate = ''
+					this.range.endDate = ''
+					this.tempRange.startDate = ''
+					this.tempRange.startTime = ''
+					this.tempRange.endDate = ''
+					this.tempRange.endTime = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.left && this.$refs.left.clearCalender()
+						this.$refs.right && this.$refs.right.clearCalender()
+						this.$refs.right && this.$refs.right.next()
+					}
+					if (needEmit) {
+						this.$emit('change', [])
+						this.$emit('input', [])
+						this.$emit('update:modelValue', [])
+					}
+				}
+			},
+
+			parseDate(date) {
+				date = this.fixIosDateFormat(date)
+				const defVal = new Date(date)
+				const year = defVal.getFullYear()
+				const month = defVal.getMonth() + 1
+				const day = defVal.getDate()
+				const hour = defVal.getHours()
+				const minute = defVal.getMinutes()
+				const second = defVal.getSeconds()
+				const defDate = year + '-' + this.lessTen(month) + '-' + this.lessTen(day)
+				const defTime = this.lessTen(hour) + ':' + this.lessTen(minute) + (this.hideSecond ? '' : (':' + this
+					.lessTen(second)))
+				return {
+					defDate,
+					defTime
+				}
+			},
+
+			lessTen(item) {
+				return item < 10 ? '0' + item : item
+			},
+
+			//兼容 iOS、safari 日期格式
+			fixIosDateFormat(value) {
+				if (typeof value === 'string') {
+					value = value.replace(/-/g, '/')
+				}
+				return value
+			},
+
+			leftMonthSwitch(e) {
+				// console.log('leftMonthSwitch 返回:', e)
+			},
+			rightMonthSwitch(e) {
+				// console.log('rightMonthSwitch 返回:', e)
+			}
+		}
+	}
+</script>
+
+<style>
+	.uni-date {
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		/* #endif */
+		flex: 1;
+	}
+	.uni-date-x {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 10px;
+		border-radius: 4px;
+		background-color: #fff;
+		color: #666;
+		font-size: 14px;
+		flex: 1;
+	}
+
+	.uni-date-x--border {
+		box-sizing: border-box;
+		border-radius: 4px;
+		border: 1px solid #e5e5e5;
+	}
+
+	.uni-date-editor--x {
+		display: flex;
+		align-items: center;
+		position: relative;
+	}
+
+	.uni-date-editor--x .uni-date__icon-clear {
+		padding: 0 5px;
+		display: flex;
+		align-items: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-date__x-input {
+		padding: 0 8px;
+		/* #ifndef APP-NVUE */
+		width: auto;
+		/* #endif */
+		position: relative;
+		overflow: hidden;
+		flex: 1;
+		line-height: 1;
+		font-size: 14px;
+		height: 35px;
+	}
+
+	.t-c {
+		text-align: center;
+	}
+
+	.uni-date__input {
+		height: 40px;
+		width: 100%;
+		line-height: 40px;
+		font-size: 14px;
+	}
+
+	.uni-date-range__input {
+		text-align: center;
+		max-width: 142px;
+	}
+
+	.uni-date-picker__container {
+		position: relative;
+		/* 		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		box-sizing: border-box;
+		z-index: 996;
+		font-size: 14px; */
+	}
+
+	.uni-date-mask {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0);
+		transition-duration: 0.3s;
+		z-index: 996;
+	}
+
+	.uni-date-single--x {
+		/* padding: 0 8px; */
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-range--x {
+		/* padding: 0 8px; */
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-editor--x__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	.uni-date-editor--logo {
+		width: 16px;
+		height: 16px;
+		vertical-align: middle;
+	}
+
+	/* 添加时间 */
+	.popup-x-header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		/* justify-content: space-between; */
+	}
+
+	.popup-x-header--datetime {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+	}
+
+	.popup-x-body {
+		display: flex;
+	}
+
+	.popup-x-footer {
+		padding: 0 15px;
+		border-top-color: #F1F1F1;
+		border-top-style: solid;
+		border-top-width: 1px;
+		/* background-color: #fff; */
+		line-height: 40px;
+		text-align: right;
+		color: #666;
+	}
+
+	.popup-x-footer text:hover {
+		color: #007aff;
+		cursor: pointer;
+		opacity: 0.8;
+	}
+
+	.popup-x-footer .confirm {
+		margin-left: 20px;
+		color: #007aff;
+	}
+
+	.uni-date-changed {
+		/* background-color: #fff; */
+		text-align: center;
+		color: #333;
+		border-bottom-color: #F1F1F1;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+		/* padding: 0 50px; */
+	}
+
+	.uni-date-changed--time text {
+		/* padding: 0 20px; */
+		height: 50px;
+		line-height: 50px;
+	}
+
+	.uni-date-changed .uni-date-changed--time {
+		/* display: flex; */
+		flex: 1;
+	}
+
+	.uni-date-changed--time-date {
+		color: #333;
+		opacity: 0.6;
+	}
+
+	.mr-50 {
+		margin-right: 50px;
+	}
+
+	/* picker 弹出层通用的指示小三角, todo：扩展至上下左右方向定位 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
new file mode 100644
index 0000000..efa5773
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
@@ -0,0 +1,410 @@
+class Calendar {
+	constructor({
+		date,
+		selected,
+		startDate,
+		endDate,
+		range,
+		// multipleStatus
+	} = {}) {
+		// 当前日期
+		this.date = this.getDate(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 范围开始
+		this.startDate = startDate
+		// 范围结束
+		this.endDate = endDate
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		// this._getWeek(this.date.fullDate)
+		// this.multipleStatus = multipleStatus
+		this.lastHover = false
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		this.selectDate = this.getDate(date)
+		this._getWeek(this.selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	/**
+	 * 重置开始日期
+	 */
+	resetSatrtDate(startDate) {
+		// 范围开始
+		this.startDate = startDate
+
+	}
+
+	/**
+	 * 重置结束日期
+	 */
+	resetEndDate(endDate) {
+		// 范围结束
+		this.endDate = endDate
+	}
+
+	/**
+	 * 获取任意时间
+	 */
+	getDate(date, AddDayCount = 0, str = 'day') {
+		if (!date) {
+			date = new Date()
+		}
+		if (typeof date !== 'object') {
+			date = date.replace(/-/g, '/')
+		}
+		const dd = new Date(date)
+		switch (str) {
+			case 'day':
+				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+			case 'month':
+				if (dd.getDate() === 31) {
+					dd.setDate(dd.getDate() + AddDayCount)
+				} else {
+					dd.setMonth(dd.getMonth() + AddDayCount) // 获取AddDayCount天后的日期
+				}
+				break
+			case 'year':
+				dd.setFullYear(dd.getFullYear() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+		}
+		const y = dd.getFullYear()
+		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
+		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
+		return {
+			fullDate: y + '-' + m + '-' + d,
+			year: y,
+			month: m,
+			date: d,
+			day: dd.getDay()
+		}
+	}
+
+
+	/**
+	 * 获取上月剩余天数
+	 */
+	_getLastMonthDays(firstDay, full) {
+		let dateArr = []
+		for (let i = firstDay; i > 0; i--) {
+			const beforeDate = new Date(full.year, full.month - 1, -i + 1).getDate()
+			dateArr.push({
+				date: beforeDate,
+				month: full.month - 1,
+				disable: true
+			})
+		}
+		return dateArr
+	}
+	/**
+	 * 获取本月天数
+	 */
+	_currentMonthDys(dateData, full) {
+		let dateArr = []
+		let fullDate = this.date.fullDate
+		for (let i = 1; i <= dateData; i++) {
+			let isinfo = false
+			let nowDate = full.year + '-' + (full.month < 10 ?
+				full.month : full.month) + '-' + (i < 10 ?
+				'0' + i : i)
+			// 是否今天
+			let isDay = fullDate === nowDate
+			// 获取打点信息
+			let info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(nowDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				// let dateCompBefore = this.dateCompare(this.startDate, fullDate)
+				// disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
+				disableBefore = this.dateCompare(this.startDate, nowDate)
+			}
+
+			if (this.endDate) {
+				// let dateCompAfter = this.dateCompare(fullDate, this.endDate)
+				// disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
+				disableAfter = this.dateCompare(nowDate, this.endDate)
+			}
+			let multiples = this.multipleStatus.data
+			let checked = false
+			let multiplesStatus = -1
+			if (this.range) {
+				if (multiples) {
+					multiplesStatus = multiples.findIndex((item) => {
+						return this.dateEqual(item, nowDate)
+					})
+				}
+				if (multiplesStatus !== -1) {
+					checked = true
+				}
+			}
+			let data = {
+				fullDate: nowDate,
+				year: full.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.isLogicBefore(nowDate, this.multipleStatus.before, this.multipleStatus.after),
+				afterMultiple: this.isLogicAfter(nowDate, this.multipleStatus.before, this.multipleStatus.after),
+				month: full.month,
+				disable: !(disableBefore && disableAfter),
+				isDay,
+				userChecked: false
+			}
+			if (info) {
+				data.extraInfo = info
+			}
+
+			dateArr.push(data)
+		}
+		return dateArr
+	}
+	/**
+	 * 获取下月天数
+	 */
+	_getNextMonthDays(surplus, full) {
+		let dateArr = []
+		for (let i = 1; i < surplus + 1; i++) {
+			dateArr.push({
+				date: i,
+				month: Number(full.month) + 1,
+				disable: true
+			})
+		}
+		return dateArr
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const dateInfo = this.canlender.find(item => item.fullDate === this.getDate(date).fullDate)
+		return dateInfo
+	}
+
+	/**
+	 * 比较时间大小
+	 */
+	dateCompare(startDate, endDate) {
+		// 计算截止时间
+		startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+		if (startDate <= endDate) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		// 计算截止时间
+		before = new Date(before.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		after = new Date(after.replace('-', '/').replace('-', '/'))
+		if (before.getTime() - after.getTime() === 0) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 *  比较真实起始日期
+	 */
+
+	isLogicBefore(currentDay, before, after) {
+		let logicBefore = before
+		if (before && after) {
+			logicBefore = this.dateCompare(before, after) ? before : after
+		}
+		return this.dateEqual(logicBefore, currentDay)
+	}
+
+	isLogicAfter(currentDay, before, after) {
+		let logicAfter = after
+		if (before && after) {
+			logicAfter = this.dateCompare(before, after) ? after : before
+		}
+		return this.dateEqual(logicAfter, currentDay)
+	}
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDate(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+		if (!this.range) return
+		if (before && after) {
+			if (!this.lastHover) {
+				this.lastHover = true
+				return
+			}
+			this.multipleStatus.before = fullDate
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+			this.multipleStatus.fulldate = ''
+			this.lastHover = false
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+				this.lastHover = false
+			} else {
+				this.multipleStatus.after = fullDate
+				if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus
+						.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus
+						.before);
+				}
+				this.lastHover = true
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 *  鼠标 hover 更新多选状态
+	 */
+	setHoverMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+
+		if (!this.range) return
+		if (this.lastHover) return
+
+		if (!before) {
+			this.multipleStatus.before = fullDate
+		} else {
+			this.multipleStatus.after = fullDate
+			if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+			} else {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 * 更新默认值多选状态
+	 */
+	setDefaultMultiple(before, after) {
+		this.multipleStatus.before = before
+		this.multipleStatus.after = after
+		if (before && after) {
+			if (this.dateCompare(before, after)) {
+				this.multipleStatus.data = this.geDateAll(before, after);
+				this._getWeek(after)
+			} else {
+				this.multipleStatus.data = this.geDateAll(after, before);
+				this._getWeek(before)
+			}
+		}
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	_getWeek(dateData) {
+		const {
+			fullDate,
+			year,
+			month,
+			date,
+			day
+		} = this.getDate(dateData)
+		let firstDay = new Date(year, month - 1, 1).getDay()
+		let currentDay = new Date(year, month, 0).getDate()
+		let dates = {
+			lastMonthDays: this._getLastMonthDays(firstDay, this.getDate(dateData)), // 上个月末尾几天
+			currentMonthDys: this._currentMonthDys(currentDay, this.getDate(dateData)), // 本月天数
+			nextMonthDays: [], // 下个月开始几天
+			weeks: []
+		}
+		let canlender = []
+		const surplus = 42 - (dates.lastMonthDays.length + dates.currentMonthDys.length)
+		dates.nextMonthDays = this._getNextMonthDays(surplus, this.getDate(dateData))
+		canlender = canlender.concat(dates.lastMonthDays, dates.currentMonthDys, dates.nextMonthDays)
+		let weeks = {}
+		// 拼接数组  上个月开始几天 + 本月天数+ 下个月开始几天
+		for (let i = 0; i < canlender.length; i++) {
+			if (i % 7 === 0) {
+				weeks[parseInt(i / 7)] = new Array(7)
+			}
+			weeks[parseInt(i / 7)][i % 7] = canlender[i]
+		}
+		this.canlender = canlender
+		this.weeks = weeks
+	}
+
+	//静态方法
+	// static init(date) {
+	// 	if (!this.instance) {
+	// 		this.instance = new Calendar(date);
+	// 	}
+	// 	return this.instance;
+	// }
+}
+
+
+export default Calendar
diff --git a/uni_modules/uni-datetime-picker/package.json b/uni_modules/uni-datetime-picker/package.json
new file mode 100644
index 0000000..60fa1d0
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uni-datetime-picker",
+  "displayName": "uni-datetime-picker 日期选择器",
+  "version": "2.2.6",
+  "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择",
+  "keywords": [
+    "uni-datetime-picker",
+    "uni-ui",
+    "uniui",
+    "日期时间选择器",
+    "日期时间"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "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-datetime-picker/readme.md b/uni_modules/uni-datetime-picker/readme.md
new file mode 100644
index 0000000..162fbef
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/readme.md
@@ -0,0 +1,21 @@
+
+
+> `重要通知：组件升级更新 2.0.0 后，支持日期+时间范围选择，组件 ui 将使用日历选择日期，ui 变化较大，同时支持 PC 和 移动端。此版本不向后兼容，不再支持单独的时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）。若仍需使用旧版本，可在插件市场下载*非uni_modules版本*，旧版本将不再维护`
+
+## DatetimePicker 时间选择器
+
+> **组件名：uni-datetime-picker**
+> 代码块： `uDatetimePicker`
+
+
+该组件的优势是，支持**时间戳**输入和输出（起始时间、终止时间也支持时间戳），可**同时选择**日期和时间。
+
+若只是需要单独选择日期和时间，不需要时间戳输入和输出，可使用原生的 picker 组件。
+
+**_点击 picker 默认值规则：_**
+
+- 若设置初始值 value, 会显示在 picker 显示框中
+- 若无初始值 value，则初始值 value 为当前本地时间 Date.now()， 但不会显示在 picker 显示框中
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-drawer/changelog.md b/uni_modules/uni-drawer/changelog.md
new file mode 100644
index 0000000..6d2488c
--- /dev/null
+++ b/uni_modules/uni-drawer/changelog.md
@@ -0,0 +1,13 @@
+## 1.2.1（2021-11-22）
+- 修复 vue3中个别scss变量无法找到的问题
+## 1.2.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-drawer](https://uniapp.dcloud.io/component/uniui/uni-drawer)
+## 1.1.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-05-12）
+- 新增 组件示例地址
+## 1.0.6（2021-02-04）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-drawer/components/uni-drawer/keypress.js b/uni_modules/uni-drawer/components/uni-drawer/keypress.js
new file mode 100644
index 0000000..62dda46
--- /dev/null
+++ b/uni_modules/uni-drawer/components/uni-drawer/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-drawer/components/uni-drawer/uni-drawer.vue b/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
new file mode 100644
index 0000000..2471521
--- /dev/null
+++ b/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
@@ -0,0 +1,183 @@
+<template>
+	<view v-if="visibleSync" :class="{ 'uni-drawer--visible': showDrawer }" class="uni-drawer" @touchmove.stop.prevent="clear">
+		<view class="uni-drawer__mask" :class="{ 'uni-drawer__mask--visible': showDrawer && mask }" @tap="close('mask')" />
+		<view class="uni-drawer__content" :class="{'uni-drawer--right': rightMode,'uni-drawer--left': !rightMode, 'uni-drawer__content--visible': showDrawer}" :style="{width:drawerWidth+'px'}">
+			<slot />
+		</view>
+		<!-- #ifdef H5 -->
+		<keypress @esc="close('mask')" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress.js'
+	// #endif
+	/**
+	 * Drawer 抽屉
+	 * @description 抽屉侧滑菜单
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=26
+	 * @property {Boolean} mask = [true | false] 是否显示遮罩
+	 * @property {Boolean} maskClick = [true | false] 点击遮罩是否关闭
+	 * @property {Boolean} mode = [left | right] Drawer 滑出位置
+	 * 	@value left 从左侧滑出
+	 * 	@value right 从右侧侧滑出
+	 * @property {Number} width 抽屉的宽度 ，仅 vue 页面生效
+	 * @event {Function} close 组件关闭时触发事件
+	 */
+	export default {
+		name: 'UniDrawer',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		emits:['change'],
+		props: {
+			/**
+			 * 显示模式（左、右），只在初始化生效
+			 */
+			mode: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 蒙层显示状态
+			 */
+			mask: {
+				type: Boolean,
+				default: true
+			},
+			/**
+			 * 遮罩是否可点击关闭
+			 */
+			maskClick:{
+				type: Boolean,
+				default: true
+			},
+			/**
+			 * 抽屉宽度
+			 */
+			width: {
+				type: Number,
+				default: 220
+			}
+		},
+		data() {
+			return {
+				visibleSync: false,
+				showDrawer: false,
+				rightMode: false,
+				watchTimer: null,
+				drawerWidth: 220
+			}
+		},
+		created() {
+			// #ifndef APP-NVUE
+			this.drawerWidth = this.width
+			// #endif
+			this.rightMode = this.mode === 'right'
+		},
+		methods: {
+			clear(){},
+			close(type) {
+				// fixed by mehaotian 抽屉尚未完全关闭或遮罩禁止点击时不触发以下逻辑
+				if((type === 'mask' && !this.maskClick) || !this.visibleSync) return
+				this._change('showDrawer', 'visibleSync', false)
+			},
+			open() {
+				// fixed by mehaotian 处理重复点击打开的事件
+				if(this.visibleSync) return
+				this._change('visibleSync', 'showDrawer', true)
+			},
+			_change(param1, param2, status) {
+				this[param1] = status
+				if (this.watchTimer) {
+					clearTimeout(this.watchTimer)
+				}
+				this.watchTimer = setTimeout(() => {
+					this[param2] = status
+					this.$emit('change',status)
+				}, status ? 50 : 300)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$uni-mask: rgba($color: #000000, $alpha: 0.4) ;
+	// 抽屉宽度
+	$drawer-width: 220px;
+
+	.uni-drawer {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		overflow: hidden;
+		z-index: 999;
+	}
+
+	.uni-drawer__content {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: absolute;
+		top: 0;
+		width: $drawer-width;
+		bottom: 0;
+		background-color: $uni-bg-color;
+		transition: transform 0.3s ease;
+	}
+
+	.uni-drawer--left {
+		left: 0;
+		/* #ifdef APP-NVUE */
+		transform: translateX(-$drawer-width);
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		transform: translateX(-100%);
+		/* #endif */
+	}
+
+	.uni-drawer--right {
+		right: 0;
+		/* #ifdef APP-NVUE */
+		transform: translateX($drawer-width);
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		transform: translateX(100%);
+		/* #endif */
+	}
+
+	.uni-drawer__content--visible {
+		transform: translateX(0px);
+	}
+
+
+	.uni-drawer__mask {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		opacity: 0;
+		position: absolute;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		background-color: $uni-mask;
+		transition: opacity 0.3s;
+	}
+
+	.uni-drawer__mask--visible {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		opacity: 1;
+	}
+</style>
diff --git a/uni_modules/uni-drawer/package.json b/uni_modules/uni-drawer/package.json
new file mode 100644
index 0000000..dd056e4
--- /dev/null
+++ b/uni_modules/uni-drawer/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-drawer",
+  "displayName": "uni-drawer 抽屉",
+  "version": "1.2.1",
+  "description": "抽屉式导航，用于展示侧滑菜单，侧滑导航。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "drawer",
+    "抽屉",
+    "侧滑导航"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["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-drawer/readme.md b/uni_modules/uni-drawer/readme.md
new file mode 100644
index 0000000..dcf6e6b
--- /dev/null
+++ b/uni_modules/uni-drawer/readme.md
@@ -0,0 +1,10 @@
+
+
+## Drawer 抽屉
+> **组件名：uni-drawer**
+> 代码块： `uDrawer`
+
+抽屉侧滑菜单。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-drawer)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-easyinput/changelog.md b/uni_modules/uni-easyinput/changelog.md
new file mode 100644
index 0000000..1e8c6f9
--- /dev/null
+++ b/uni_modules/uni-easyinput/changelog.md
@@ -0,0 +1,47 @@
+## 1.1.0（2022-06-30）
+- 新增 在 uni-forms 1.4.0 中使用可以在 blur 时校验内容
+- 新增 clear 事件，点击右侧叉号图标触发
+- 新增 change 事件 ，仅在输入框失去焦点或用户按下回车时触发
+- 优化 组件样式，组件获取焦点时高亮显示，图标颜色调整等
+-
+## 1.0.5（2022-06-07）
+- 优化 clearable 显示策略
+## 1.0.4（2022-06-07）
+- 优化 clearable 显示策略
+## 1.0.3（2022-05-20）
+- 修复 关闭图标某些情况下无法取消的bug
+## 1.0.2（2022-04-12）
+- 修复 默认值不生效的bug
+## 1.0.1（2022-04-02）
+- 修复 value不能为0的bug
+## 1.0.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-easyinput](https://uniapp.dcloud.io/component/uniui/uni-easyinput)
+## 0.1.4（2021-08-20）
+- 修复 在 uni-forms 的动态表单中默认值校验不通过的 bug
+## 0.1.3（2021-08-11）
+- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
+## 0.1.2（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 0.1.1
+- 优化 errorMessage 属性支持 Boolean 类型
+## 0.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.0.16（2021-06-29）
+- 修复 confirmType 属性（仅 type="text" 生效）导致多行文本框无法换行的 bug
+## 0.0.15（2021-06-21）
+- 修复 passwordIcon 属性拼写错误的 bug
+## 0.0.14（2021-06-18）
+- 新增 passwordIcon 属性，当type=password时是否显示小眼睛图标
+- 修复 confirmType 属性不生效的问题
+## 0.0.13（2021-06-04）
+- 修复 disabled 状态可清出内容的 bug
+## 0.0.12（2021-05-12）
+- 新增 组件示例地址
+## 0.0.11（2021-05-07）
+- 修复 input-border 属性不生效的问题
+## 0.0.10（2021-04-30）
+- 修复 ios 遮挡文字、显示一半的问题
+## 0.0.9（2021-02-05）
+- 调整为uni_modules目录规范
+- 优化 兼容 nvue 页面
diff --git a/uni_modules/uni-easyinput/components/uni-easyinput/common.js b/uni_modules/uni-easyinput/components/uni-easyinput/common.js
new file mode 100644
index 0000000..df9abe1
--- /dev/null
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/common.js
@@ -0,0 +1,56 @@
+/**
+ * @desc 函数防抖
+ * @param func 目标函数
+ * @param wait 延迟执行毫秒数
+ * @param immediate true - 立即执行， false - 延迟执行
+ */
+export const debounce = function(func, wait = 1000, immediate = true) {
+	let timer;
+	console.log(1);
+	return function() {
+		console.log(123);
+		let context = this,
+			args = arguments;
+		if (timer) clearTimeout(timer);
+		if (immediate) {
+			let callNow = !timer;
+			timer = setTimeout(() => {
+				timer = null;
+			}, wait);
+			if (callNow) func.apply(context, args);
+		} else {
+			timer = setTimeout(() => {
+				func.apply(context, args);
+			}, wait)
+		}
+	}
+}
+/**
+ * @desc 函数节流
+ * @param func 函数
+ * @param wait 延迟执行毫秒数
+ * @param type 1 使用表时间戳，在时间段开始的时候触发 2 使用表定时器，在时间段结束的时候触发
+ */
+export const throttle = (func, wait = 1000, type = 1) => {
+	let previous = 0;
+	let timeout;
+	return function() {
+		let context = this;
+		let args = arguments;
+		if (type === 1) {
+			let now = Date.now();
+
+			if (now - previous > wait) {
+				func.apply(context, args);
+				previous = now;
+			}
+		} else if (type === 2) {
+			if (!timeout) {
+				timeout = setTimeout(() => {
+					timeout = null;
+					func.apply(context, args)
+				}, wait)
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
new file mode 100644
index 0000000..5818d7f
--- /dev/null
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
@@ -0,0 +1,593 @@
+<template>
+	<view class="uni-easyinput" :class="{'uni-easyinput-error':msg}" :style="boxStyle">
+		<view class="uni-easyinput__content" :class="inputContentClass" :style="inputContentStyle">
+			<uni-icons v-if="prefixIcon" class="content-clear-icon" :type="prefixIcon" color="#c0c4cc"
+				@click="onClickIcon('prefix')" size="22"></uni-icons>
+			<textarea v-if="type === 'textarea'" class="uni-easyinput__content-textarea"
+				:class="{'input-padding':inputBorder}" :name="name" :value="val" :placeholder="placeholder"
+				:placeholderStyle="placeholderStyle" :disabled="disabled"
+				placeholder-class="uni-easyinput__placeholder-class" :maxlength="inputMaxlength" :focus="focused"
+				:autoHeight="autoHeight" @input="onInput" @blur="_Blur" @focus="_Focus" @confirm="onConfirm"></textarea>
+			<input v-else :type="type === 'password'?'text':type" class="uni-easyinput__content-input"
+				:style="inputStyle" :name="name" :value="val" :password="!showPassword && type === 'password'"
+				:placeholder="placeholder" :placeholderStyle="placeholderStyle"
+				placeholder-class="uni-easyinput__placeholder-class" :disabled="disabled" :maxlength="inputMaxlength"
+				:focus="focused" :confirmType="confirmType" @focus="_Focus" @blur="_Blur" @input="onInput"
+				@confirm="onConfirm" />
+			<template v-if="type === 'password' && passwordIcon">
+				<!-- 开启密码时显示小眼睛 -->
+				<uni-icons v-if="isVal" class="content-clear-icon" :class="{'is-textarea-icon':type==='textarea'}"
+					:type="showPassword?'eye-slash-filled':'eye-filled'" :size="22"
+					:color="focusShow?'#2979ff':'#c0c4cc'" @click="onEyes">
+				</uni-icons>
+			</template>
+			<template v-else-if="suffixIcon">
+				<uni-icons v-if="suffixIcon" class="content-clear-icon" :type="suffixIcon" color="#c0c4cc"
+					@click="onClickIcon('suffix')" size="22"></uni-icons>
+			</template>
+			<template v-else>
+				<uni-icons v-if="clearable && isVal && !disabled  && type !== 'textarea'" class="content-clear-icon"
+					:class="{'is-textarea-icon':type==='textarea'}" type="clear" :size="clearSize"
+					:color="msg?'#dd524d':(focusShow?'#2979ff':'#c0c4cc')" @click="onClear"></uni-icons>
+			</template>
+			<slot name="right"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Easyinput 输入框
+	 * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3455
+	 * @property {String}	value	输入内容
+	 * @property {String }	type	输入框的类型（默认text） password/text/textarea/..
+	 * 	@value text			文本输入键盘
+	 * 	@value textarea	多行文本输入键盘
+	 * 	@value password	密码输入键盘
+	 * 	@value number		数字输入键盘，注意iOS上app-vue弹出的数字键盘并非9宫格方式
+	 * 	@value idcard		身份证输入键盘，信、支付宝、百度、QQ小程序
+	 * 	@value digit		带小数点的数字键盘	，App的nvue页面、微信、支付宝、百度、头条、QQ小程序支持
+	 * @property {Boolean}	clearable	是否显示右侧清空内容的图标控件，点击可清空输入框内容（默认true）
+	 * @property {Boolean}	autoHeight	是否自动增高输入区域，type为textarea时有效（默认true）
+	 * @property {String }	placeholder	输入框的提示文字
+	 * @property {String }	placeholderStyle	placeholder的样式(内联样式，字符串)，如"color: #ddd"
+	 * @property {Boolean}	focus	是否自动获得焦点（默认false）
+	 * @property {Boolean}	disabled	是否禁用（默认false）
+	 * @property {Number }	maxlength	最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
+	 * @property {String }	confirmType	设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
+	 * @property {Number }	clearSize	清除图标的大小，单位px（默认15）
+	 * @property {String}	prefixIcon	输入框头部图标
+	 * @property {String}	suffixIcon	输入框尾部图标
+	 * @property {Boolean}	trim	是否自动去除两端的空格
+	 * @value both	去除两端空格
+	 * @value left	去除左侧空格
+	 * @value right	去除右侧空格
+	 * @value start	去除左侧空格
+	 * @value end		去除右侧空格
+	 * @value all		去除全部空格
+	 * @value none	不去除空格
+	 * @property {Boolean}	inputBorder	是否显示input输入框的边框（默认true）
+	 * @property {Boolean}	passwordIcon	type=password时是否显示小眼睛图标
+	 * @property {Object}	styles	自定义颜色
+	 * @event {Function}	input	输入框内容发生变化时触发
+	 * @event {Function}	focus	输入框获得焦点时触发
+	 * @event {Function}	blur	输入框失去焦点时触发
+	 * @event {Function}	confirm	点击完成按钮时触发
+	 * @event {Function}	iconClick	点击图标时触发
+	 * @example <uni-easyinput v-model="mobile"></uni-easyinput>
+	 */
+	function obj2strClass(obj) {
+		let classess = ''
+		for (let key in obj) {
+			const val = obj[key]
+			if (val) {
+				classess += `${key} `
+			}
+		}
+		return classess
+	}
+
+	function obj2strStyle(obj) {
+		let style = ''
+		for (let key in obj) {
+			const val = obj[key]
+			style += `${key}:${val};`
+		}
+		return style
+	}
+	export default {
+		name: 'uni-easyinput',
+		emits: ['click', 'iconClick', 'update:modelValue', 'input', 'focus', 'blur', 'confirm', 'clear', 'eyes', 'change'],
+		model: {
+			prop: 'modelValue',
+			event: 'update:modelValue'
+		},
+		options: {
+			virtualHost: true
+		},
+		inject: {
+			form: {
+				from: 'uniForm',
+				default: null
+			},
+			formItem: {
+				from: 'uniFormItem',
+				default: null
+			},
+		},
+		props: {
+			name: String,
+			value: [Number, String],
+			modelValue: [Number, String],
+			type: {
+				type: String,
+				default: 'text'
+			},
+			clearable: {
+				type: Boolean,
+				default: true
+			},
+			autoHeight: {
+				type: Boolean,
+				default: false
+			},
+			placeholder: {
+				type: String,
+				default: ' '
+			},
+			placeholderStyle: String,
+			focus: {
+				type: Boolean,
+				default: false
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			maxlength: {
+				type: [Number, String],
+				default: 140
+			},
+			confirmType: {
+				type: String,
+				default: 'done'
+			},
+			clearSize: {
+				type: [Number, String],
+				default: 24
+			},
+			inputBorder: {
+				type: Boolean,
+				default: true
+			},
+			prefixIcon: {
+				type: String,
+				default: ''
+			},
+			suffixIcon: {
+				type: String,
+				default: ''
+			},
+			trim: {
+				type: [Boolean, String],
+				default: true
+			},
+			passwordIcon: {
+				type: Boolean,
+				default: true
+			},
+			styles: {
+				type: Object,
+				default () {
+					return {
+						color: '#333',
+						disableColor: '#F7F6F6',
+						borderColor: '#e5e5e5'
+					}
+				}
+			},
+			errorMessage: {
+				type: [String, Boolean],
+				default: ''
+			}
+		},
+		data() {
+			return {
+				focused: false,
+				val: '',
+				showMsg: '',
+				border: false,
+				isFirstBorder: false,
+				showClearIcon: false,
+				showPassword: false,
+				focusShow: false,
+				localMsg: ''
+			};
+		},
+		computed: {
+			// 输入框内是否有值
+			isVal() {
+				const val = this.val
+				// fixed by mehaotian 处理值为0的情况，字符串0不在处理范围
+				if (val || val === 0) {
+					return true
+				}
+				return false
+			},
+
+			msg() {
+				// console.log('computed', this.form, this.formItem);
+				// if (this.form) {
+				// 	return this.errorMessage || this.formItem.errMsg;
+				// }
+				// TODO 处理头条 formItem 中 errMsg 不更新的问题
+				return this.localMsg || this.errorMessage
+			},
+			// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，用户可以传入字符串数值
+			inputMaxlength() {
+				return Number(this.maxlength);
+			},
+
+			// 处理外层样式的style
+			boxStyle() {
+				return `color:${this.inputBorder && this.msg?'#e43d33':this.styles.color};`
+			},
+			// input 内容的类和样式处理
+			inputContentClass() {
+				return obj2strClass({
+					'is-input-border': this.inputBorder,
+					'is-input-error-border': this.inputBorder && this.msg,
+					'is-textarea': this.type === 'textarea',
+					'is-disabled': this.disabled
+				})
+			},
+			inputContentStyle() {
+				const focusColor = this.focusShow ? '#2979ff' : this.styles.borderColor
+				const borderColor = this.inputBorder && this.msg ? '#dd524d' : focusColor
+				return obj2strStyle({
+					'border-color': borderColor || '#e5e5e5',
+					'background-color': this.disabled ? this.styles.disableColor : '#fff'
+				})
+			},
+			// input右侧样式
+			inputStyle() {
+				const paddingRight = this.type === 'password' || this.clearable || this.prefixIcon ? '' : '10px'
+				return obj2strStyle({
+					'padding-right': paddingRight,
+					'padding-left': this.prefixIcon ? '' : '10px'
+				})
+			}
+		},
+		watch: {
+			value(newVal) {
+				this.val = newVal
+			},
+			modelValue(newVal) {
+				this.val = newVal
+			},
+			focus(newVal) {
+				this.$nextTick(() => {
+					this.focused = this.focus
+					this.focusShow = this.focus
+				})
+			}
+		},
+		created() {
+			this.init()
+			// TODO 处理头条vue3 computed 不监听 inject 更改的问题（formItem.errMsg）
+			if (this.form && this.formItem) {
+				this.$watch('formItem.errMsg', (newVal) => {
+					this.localMsg = newVal
+				})
+			}
+		},
+		mounted() {
+			this.$nextTick(() => {
+				this.focused = this.focus
+				this.focusShow = this.focus
+			})
+		},
+		methods: {
+			/**
+			 * 初始化变量值
+			 */
+			init() {
+				if (this.value || this.value === 0) {
+					this.val = this.value
+				} else if (this.modelValue || this.modelValue === 0) {
+					this.val = this.modelValue
+				} else {
+					this.val = null
+				}
+			},
+
+			/**
+			 * 点击图标时触发
+			 * @param {Object} type
+			 */
+			onClickIcon(type) {
+				this.$emit('iconClick', type)
+			},
+
+			/**
+			 * 显示隐藏内容，密码框时生效
+			 */
+			onEyes() {
+				this.showPassword = !this.showPassword
+				this.$emit('eyes', this.showPassword)
+			},
+
+			/**
+			 * 输入时触发
+			 * @param {Object} event
+			 */
+			onInput(event) {
+				let value = event.detail.value;
+				// 判断是否去除空格
+				if (this.trim) {
+					if (typeof(this.trim) === 'boolean' && this.trim) {
+						value = this.trimStr(value)
+					}
+					if (typeof(this.trim) === 'string') {
+						value = this.trimStr(value, this.trim)
+					}
+				};
+				if (this.errMsg) this.errMsg = ''
+				this.val = value
+				// TODO 兼容 vue2
+				this.$emit('input', value);
+				// TODO　兼容　vue3
+				this.$emit('update:modelValue', value)
+			},
+
+			/**
+			 * 外部调用方法
+			 * 获取焦点时触发
+			 * @param {Object} event
+			 */
+			onFocus() {
+				this.$nextTick(() => {
+					this.focused = true
+				})
+				this.$emit('focus', null);
+			},
+
+			_Focus(event) {
+				this.focusShow = true
+				this.$emit('focus', event);
+			},
+
+			/**
+			 * 外部调用方法
+			 * 失去焦点时触发
+			 * @param {Object} event
+			 */
+			onBlur() {
+				this.focused = false
+				this.$emit('focus', null);
+			},
+			_Blur(event) {
+				let value = event.detail.value;
+				this.focusShow = false
+				this.$emit('blur', event);
+				// 根据类型返回值，在event中获取的值理论上讲都是string
+				this.$emit('change', this.val)
+				// 失去焦点时参与表单校验
+				if (this.form && this.formItem) {
+					const {
+						validateTrigger
+					} = this.form
+					if (validateTrigger === 'blur') {
+						this.formItem.onFieldChange()
+					}
+				}
+			},
+
+			/**
+			 * 按下键盘的发送键
+			 * @param {Object} e
+			 */
+			onConfirm(e) {
+				this.$emit('confirm', this.val);
+				this.$emit('change', this.val)
+			},
+
+			/**
+			 * 清理内容
+			 * @param {Object} event
+			 */
+			onClear(event) {
+				this.val = '';
+				// TODO 兼容 vue2
+				this.$emit('input', '');
+				// TODO 兼容 vue2
+				// TODO　兼容　vue3
+				this.$emit('update:modelValue', '')
+				// 点击叉号触发
+				this.$emit('clear')
+			},
+
+			/**
+			 * 去除空格
+			 */
+			trimStr(str, pos = 'both') {
+				if (pos === 'both') {
+					return str.trim();
+				} else if (pos === 'left') {
+					return str.trimLeft();
+				} else if (pos === 'right') {
+					return str.trimRight();
+				} else if (pos === 'start') {
+					return str.trimStart()
+				} else if (pos === 'end') {
+					return str.trimEnd()
+				} else if (pos === 'all') {
+					return str.replace(/\s+/g, '');
+				} else if (pos === 'none') {
+					return str;
+				}
+				return str;
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	$uni-error: #e43d33;
+	$uni-border-1: #DCDFE6 !default;
+
+	.uni-easyinput {
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		/* #endif */
+		flex: 1;
+		position: relative;
+		text-align: left;
+		color: #333;
+		font-size: 14px;
+	}
+
+	.uni-easyinput__content {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		display: flex;
+		box-sizing: border-box;
+		// min-height: 36px;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		// 处理border动画刚开始显示黑色的问题
+		border-color: #fff;
+		transition-property: border-color;
+		transition-duration: 0.3s;
+	}
+
+	.uni-easyinput__content-input {
+		/* #ifndef APP-NVUE */
+		width: auto;
+		/* #endif */
+		position: relative;
+		overflow: hidden;
+		flex: 1;
+		line-height: 1;
+		font-size: 14px;
+		height: 35px;
+		// min-height: 36px;
+	}
+
+	.uni-easyinput__placeholder-class {
+		color: #999;
+		font-size: 12px;
+		// font-weight: 200;
+	}
+
+	.is-textarea {
+		align-items: flex-start;
+	}
+
+	.is-textarea-icon {
+		margin-top: 5px;
+	}
+
+	.uni-easyinput__content-textarea {
+		position: relative;
+		overflow: hidden;
+		flex: 1;
+		line-height: 1.5;
+		font-size: 14px;
+		margin: 6px;
+		margin-left: 0;
+		height: 80px;
+		min-height: 80px;
+		/* #ifndef APP-NVUE */
+		min-height: 80px;
+		width: auto;
+		/* #endif */
+	}
+
+	.input-padding {
+		padding-left: 10px;
+	}
+
+	.content-clear-icon {
+		padding: 0 5px;
+	}
+
+	.label-icon {
+		margin-right: 5px;
+		margin-top: -1px;
+	}
+
+	// 显示边框
+	.is-input-border {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border: 1px solid $uni-border-1;
+		border-radius: 4px;
+		/* #ifdef MP-ALIPAY */
+		overflow: hidden;
+		/* #endif */
+	}
+
+	.uni-error-message {
+		position: absolute;
+		bottom: -17px;
+		left: 0;
+		line-height: 12px;
+		color: $uni-error;
+		font-size: 12px;
+		text-align: left;
+	}
+
+	.uni-error-msg--boeder {
+		position: relative;
+		bottom: 0;
+		line-height: 22px;
+	}
+
+	.is-input-error-border {
+		border-color: $uni-error;
+
+		.uni-easyinput__placeholder-class {
+			color: mix(#fff, $uni-error, 50%);
+			;
+		}
+	}
+
+
+	.uni-easyinput--border {
+		margin-bottom: 0;
+		padding: 10px 15px;
+		// padding-bottom: 0;
+		border-top: 1px #eee solid;
+	}
+
+	.uni-easyinput-error {
+		padding-bottom: 0;
+	}
+
+	.is-first-border {
+		/* #ifndef APP-NVUE */
+		border: none;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		border-width: 0;
+		/* #endif */
+	}
+
+	.is-disabled {
+		background-color: #F7F6F6;
+		color: #D5D5D5;
+
+		.uni-easyinput__placeholder-class {
+			color: #D5D5D5;
+			font-size: 12px;
+		}
+	}
+</style>
diff --git a/uni_modules/uni-easyinput/package.json b/uni_modules/uni-easyinput/package.json
new file mode 100644
index 0000000..3cc793e
--- /dev/null
+++ b/uni_modules/uni-easyinput/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uni-easyinput",
+  "displayName": "uni-easyinput 增强输入框",
+  "version": "1.1.0",
+  "description": "Easyinput 组件是对原生input组件的增强",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "input",
+    "uni-easyinput",
+    "输入框"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+      "uni-icons"
+    ],
+    "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-easyinput/readme.md b/uni_modules/uni-easyinput/readme.md
new file mode 100644
index 0000000..f1faf8f
--- /dev/null
+++ b/uni_modules/uni-easyinput/readme.md
@@ -0,0 +1,11 @@
+
+
+### Easyinput 增强输入框
+> **组件名：uni-easyinput**
+> 代码块： `uEasyinput`
+
+
+easyinput 组件是对原生input组件的增强 ，是专门为配合表单组件[uni-forms](https://ext.dcloud.net.cn/plugin?id=2773)而设计的，easyinput 内置了边框，图标等，同时包含 input 所有功能
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-easyinput)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-fab/changelog.md b/uni_modules/uni-fab/changelog.md
new file mode 100644
index 0000000..24e26b1
--- /dev/null
+++ b/uni_modules/uni-fab/changelog.md
@@ -0,0 +1,17 @@
+## 1.2.2（2021-12-29）
+- 更新 组件依赖
+## 1.2.1（2021-11-19）
+- 修复 阴影颜色不正确的bug
+## 1.2.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-fab](https://uniapp.dcloud.io/component/uniui/uni-fab)
+## 1.1.1（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-05-12）
+- 新增 组件示例地址
+## 1.0.6（2021-02-05）
+- 调整为uni_modules目录规范
+- 优化 按钮背景色调整
+- 优化 兼容pc端
diff --git a/uni_modules/uni-fab/components/uni-fab/uni-fab.vue b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
new file mode 100644
index 0000000..bef97f1
--- /dev/null
+++ b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
@@ -0,0 +1,475 @@
+<template>
+	<view class="uni-cursor-point">
+		<view v-if="popMenu && (leftBottom||rightBottom||leftTop||rightTop) && content.length > 0" :class="{
+        'uni-fab--leftBottom': leftBottom,
+        'uni-fab--rightBottom': rightBottom,
+        'uni-fab--leftTop': leftTop,
+        'uni-fab--rightTop': rightTop
+      }" class="uni-fab">
+			<view :class="{
+          'uni-fab__content--left': horizontal === 'left',
+          'uni-fab__content--right': horizontal === 'right',
+          'uni-fab__content--flexDirection': direction === 'vertical',
+          'uni-fab__content--flexDirectionStart': flexDirectionStart,
+          'uni-fab__content--flexDirectionEnd': flexDirectionEnd,
+		  'uni-fab__content--other-platform': !isAndroidNvue
+        }" :style="{ width: boxWidth, height: boxHeight, backgroundColor: styles.backgroundColor }"
+				class="uni-fab__content" elevation="5">
+				<view v-if="flexDirectionStart || horizontalLeft" class="uni-fab__item uni-fab__item--first" />
+				<view v-for="(item, index) in content" :key="index" :class="{ 'uni-fab__item--active': isShow }"
+					class="uni-fab__item" @click="_onItemClick(index, item)">
+					<image :src="item.active ? item.selectedIconPath : item.iconPath" class="uni-fab__item-image"
+						mode="aspectFit" />
+					<text class="uni-fab__item-text"
+						:style="{ color: item.active ? styles.selectedColor : styles.color }">{{ item.text }}</text>
+				</view>
+				<view v-if="flexDirectionEnd || horizontalRight" class="uni-fab__item uni-fab__item--first" />
+			</view>
+		</view>
+		<view :class="{
+		  'uni-fab__circle--leftBottom': leftBottom,
+		  'uni-fab__circle--rightBottom': rightBottom,
+		  'uni-fab__circle--leftTop': leftTop,
+		  'uni-fab__circle--rightTop': rightTop,
+		  'uni-fab__content--other-platform': !isAndroidNvue
+		}" class="uni-fab__circle uni-fab__plus" :style="{ 'background-color': styles.buttonColor }" @click="_onClick">
+			<uni-icons class="fab-circle-icon" type="plusempty" :color="styles.iconColor" size="32"
+				:class="{'uni-fab__plus--active': isShow && content.length > 0}"></uni-icons>
+			<!-- <view class="fab-circle-v"  :class="{'uni-fab__plus--active': isShow && content.length > 0}"></view>
+			<view class="fab-circle-h" :class="{'uni-fab__plus--active': isShow  && content.length > 0}"></view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	let platform = 'other'
+	// #ifdef APP-NVUE
+	platform = uni.getSystemInfoSync().platform
+	// #endif
+
+	/**
+	 * Fab 悬浮按钮
+	 * @description 点击可展开一个图形按钮菜单
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=144
+	 * @property {Object} pattern 可选样式配置项
+	 * @property {Object} horizontal = [left | right] 水平对齐方式
+	 * 	@value left 左对齐
+	 * 	@value right 右对齐
+	 * @property {Object} vertical = [bottom | top] 垂直对齐方式
+	 * 	@value bottom 下对齐
+	 * 	@value top 上对齐
+	 * @property {Object} direction = [horizontal | vertical] 展开菜单显示方式
+	 * 	@value horizontal 水平显示
+	 * 	@value vertical 垂直显示
+	 * @property {Array} content 展开菜单内容配置项
+	 * @property {Boolean} popMenu 是否使用弹出菜单
+	 * @event {Function} trigger 展开菜单点击事件，返回点击信息
+	 * @event {Function} fabClick 悬浮按钮点击事件
+	 */
+	export default {
+		name: 'UniFab',
+		emits: ['fabClick', 'trigger'],
+		props: {
+			pattern: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			horizontal: {
+				type: String,
+				default: 'left'
+			},
+			vertical: {
+				type: String,
+				default: 'bottom'
+			},
+			direction: {
+				type: String,
+				default: 'horizontal'
+			},
+			content: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			show: {
+				type: Boolean,
+				default: false
+			},
+			popMenu: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				fabShow: false,
+				isShow: false,
+				isAndroidNvue: platform === 'android',
+				styles: {
+					color: '#3c3e49',
+					selectedColor: '#007AFF',
+					backgroundColor: '#fff',
+					buttonColor: '#007AFF',
+					iconColor: '#fff'
+				}
+			}
+		},
+		computed: {
+			contentWidth(e) {
+				return (this.content.length + 1) * 55 + 15 + 'px'
+			},
+			contentWidthMin() {
+				return '55px'
+			},
+			// 动态计算宽度
+			boxWidth() {
+				return this.getPosition(3, 'horizontal')
+			},
+			// 动态计算高度
+			boxHeight() {
+				return this.getPosition(3, 'vertical')
+			},
+			// 计算左下位置
+			leftBottom() {
+				return this.getPosition(0, 'left', 'bottom')
+			},
+			// 计算右下位置
+			rightBottom() {
+				return this.getPosition(0, 'right', 'bottom')
+			},
+			// 计算左上位置
+			leftTop() {
+				return this.getPosition(0, 'left', 'top')
+			},
+			rightTop() {
+				return this.getPosition(0, 'right', 'top')
+			},
+			flexDirectionStart() {
+				return this.getPosition(1, 'vertical', 'top')
+			},
+			flexDirectionEnd() {
+				return this.getPosition(1, 'vertical', 'bottom')
+			},
+			horizontalLeft() {
+				return this.getPosition(2, 'horizontal', 'left')
+			},
+			horizontalRight() {
+				return this.getPosition(2, 'horizontal', 'right')
+			}
+		},
+		watch: {
+			pattern: {
+				handler(val, oldVal) {
+					this.styles = Object.assign({}, this.styles, val)
+				},
+				deep: true
+			}
+		},
+		created() {
+			this.isShow = this.show
+			if (this.top === 0) {
+				this.fabShow = true
+			}
+			// 初始化样式
+			this.styles = Object.assign({}, this.styles, this.pattern)
+		},
+		methods: {
+			_onClick() {
+				this.$emit('fabClick')
+				if (!this.popMenu) {
+					return
+				}
+				this.isShow = !this.isShow
+			},
+			open() {
+				this.isShow = true
+			},
+			close() {
+				this.isShow = false
+			},
+			/**
+			 * 按钮点击事件
+			 */
+			_onItemClick(index, item) {
+				this.$emit('trigger', {
+					index,
+					item
+				})
+			},
+			/**
+			 * 获取 位置信息
+			 */
+			getPosition(types, paramA, paramB) {
+				if (types === 0) {
+					return this.horizontal === paramA && this.vertical === paramB
+				} else if (types === 1) {
+					return this.direction === paramA && this.vertical === paramB
+				} else if (types === 2) {
+					return this.direction === paramA && this.horizontal === paramB
+				} else {
+					return this.isShow && this.direction === paramA ? this.contentWidth : this.contentWidthMin
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	$uni-shadow-base:0 1px 5px 2px rgba($color: #000000, $alpha: 0.3) !default;
+
+	.uni-fab {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		z-index: 10;
+		border-radius: 45px;
+		box-shadow: $uni-shadow-base;
+	}
+
+	.uni-cursor-point {
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-fab--active {
+		opacity: 1;
+	}
+
+	.uni-fab--leftBottom {
+		left: 15px;
+		bottom: 30px;
+		/* #ifdef H5 */
+		left: calc(15px + var(--window-left));
+		bottom: calc(30px + var(--window-bottom));
+		/* #endif */
+		// padding: 10px;
+	}
+
+	.uni-fab--leftTop {
+		left: 15px;
+		top: 30px;
+		/* #ifdef H5 */
+		left: calc(15px + var(--window-left));
+		top: calc(30px + var(--window-top));
+		/* #endif */
+		// padding: 10px;
+	}
+
+	.uni-fab--rightBottom {
+		right: 15px;
+		bottom: 30px;
+		/* #ifdef H5 */
+		right: calc(15px + var(--window-right));
+		bottom: calc(30px + var(--window-bottom));
+		/* #endif */
+		// padding: 10px;
+	}
+
+	.uni-fab--rightTop {
+		right: 15px;
+		top: 30px;
+		/* #ifdef H5 */
+		right: calc(15px + var(--window-right));
+		top: calc(30px + var(--window-top));
+		/* #endif */
+		// padding: 10px;
+	}
+
+	.uni-fab__circle {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		width: 55px;
+		height: 55px;
+		background-color: #3c3e49;
+		border-radius: 45px;
+		z-index: 11;
+		// box-shadow: $uni-shadow-base;
+	}
+
+	.uni-fab__circle--leftBottom {
+		left: 15px;
+		bottom: 30px;
+		/* #ifdef H5 */
+		left: calc(15px + var(--window-left));
+		bottom: calc(30px + var(--window-bottom));
+		/* #endif */
+	}
+
+	.uni-fab__circle--leftTop {
+		left: 15px;
+		top: 30px;
+		/* #ifdef H5 */
+		left: calc(15px + var(--window-left));
+		top: calc(30px + var(--window-top));
+		/* #endif */
+	}
+
+	.uni-fab__circle--rightBottom {
+		right: 15px;
+		bottom: 30px;
+		/* #ifdef H5 */
+		right: calc(15px + var(--window-right));
+		bottom: calc(30px + var(--window-bottom));
+		/* #endif */
+	}
+
+	.uni-fab__circle--rightTop {
+		right: 15px;
+		top: 30px;
+		/* #ifdef H5 */
+		right: calc(15px + var(--window-right));
+		top: calc(30px + var(--window-top));
+		/* #endif */
+	}
+
+	.uni-fab__circle--left {
+		left: 0;
+	}
+
+	.uni-fab__circle--right {
+		right: 0;
+	}
+
+	.uni-fab__circle--top {
+		top: 0;
+	}
+
+	.uni-fab__circle--bottom {
+		bottom: 0;
+	}
+
+	.uni-fab__plus {
+		font-weight: bold;
+	}
+
+	// .fab-circle-v {
+	// 	position: absolute;
+	// 	width: 2px;
+	// 	height: 24px;
+	// 	left: 0;
+	// 	top: 0;
+	// 	right: 0;
+	// 	bottom: 0;
+	// 	/* #ifndef APP-NVUE */
+	// 	margin: auto;
+	// 	/* #endif */
+	// 	background-color: white;
+	// 	transform: rotate(0deg);
+	// 	transition: transform 0.3s;
+	// }
+
+	// .fab-circle-h {
+	// 	position: absolute;
+	// 	width: 24px;
+	// 	height: 2px;
+	// 	left: 0;
+	// 	top: 0;
+	// 	right: 0;
+	// 	bottom: 0;
+	// 	/* #ifndef APP-NVUE */
+	// 	margin: auto;
+	// 	/* #endif */
+	// 	background-color: white;
+	// 	transform: rotate(0deg);
+	// 	transition: transform 0.3s;
+	// }
+
+	.fab-circle-icon {
+		transform: rotate(0deg);
+		transition: transform 0.3s;
+		font-weight: 200;
+	}
+
+	.uni-fab__plus--active {
+		transform: rotate(135deg);
+	}
+
+	.uni-fab__content {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		border-radius: 55px;
+		overflow: hidden;
+		transition-property: width, height;
+		transition-duration: 0.2s;
+		width: 55px;
+		border-color: #DDDDDD;
+		border-width: 1rpx;
+		border-style: solid;
+	}
+
+	.uni-fab__content--other-platform {
+		border-width: 0px;
+		box-shadow: $uni-shadow-base;
+	}
+
+	.uni-fab__content--left {
+		justify-content: flex-start;
+	}
+
+	.uni-fab__content--right {
+		justify-content: flex-end;
+	}
+
+	.uni-fab__content--flexDirection {
+		flex-direction: column;
+		justify-content: flex-end;
+	}
+
+	.uni-fab__content--flexDirectionStart {
+		flex-direction: column;
+		justify-content: flex-start;
+	}
+
+	.uni-fab__content--flexDirectionEnd {
+		flex-direction: column;
+		justify-content: flex-end;
+	}
+
+	.uni-fab__item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 55px;
+		height: 55px;
+		opacity: 0;
+		transition: opacity 0.2s;
+	}
+
+	.uni-fab__item--active {
+		opacity: 1;
+	}
+
+	.uni-fab__item-image {
+		width: 20px;
+		height: 20px;
+		margin-bottom: 4px;
+	}
+
+	.uni-fab__item-text {
+		color: #FFFFFF;
+		font-size: 12px;
+		line-height: 12px;
+		margin-top: 2px;
+	}
+
+	.uni-fab__item--first {
+		width: 55px;
+	}
+</style>
diff --git a/uni_modules/uni-fab/components/uni-fab/uni-fab.vue.bak b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue.bak
new file mode 100644
index 0000000..5adc72a
--- /dev/null
+++ b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue.bak
@@ -0,0 +1,379 @@
+<template>
+	<view>
+		<view :class="{
+        leftBottom: leftBottom,
+        rightBottom: rightBottom,
+        leftTop: leftTop,
+        rightTop: rightTop
+      }" v-if="leftBottom||rightBottom||leftTop||rightTop" class="fab-box fab">
+			<view :class="{
+          left: horizontal === 'left' && direction === 'horizontal',
+          top: vertical === 'top' && direction === 'vertical',
+          bottom: vertical === 'bottom' && direction === 'vertical',
+          right: horizontal === 'right' && direction === 'horizontal'
+        }" :style="{ 'background-color': styles.buttonColor }" class="fab-circle" @click="_onClick">
+                <view class="fab-circle-box" :class="{ active: isShow }">
+                    <view class="fab-circle-v"></view>
+                    <view class="fab-circle-h"></view>
+                </view>
+			</view>
+			<view :class="{
+          left: horizontal === 'left',
+          right: horizontal === 'right',
+          flexDirection: direction === 'vertical',
+          flexDirectionStart: flexDirectionStart,
+          flexDirectionEnd: flexDirectionEnd
+        }" :style="{ width: boxWidth, height: boxHeight, background: styles.backgroundColor }" class="fab-content">
+				<view v-if="flexDirectionStart || horizontalLeft" class="fab-item first" />
+				<view v-for="(item, index) in content" :key="index" :class="{ active: isShow }" :style="{
+            color: item.active ? styles.selectedColor : styles.color
+          }" class="fab-item" @click="_onItemClick(index, item)">
+					<image :src="item.active ? item.selectedIconPath : item.iconPath" class="content-image" mode="widthFix" />
+					<text class="text">{{ item.text }}</text>
+				</view>
+				<view v-if="flexDirectionEnd || horizontalRight" class="fab-item first" />
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'UniFab',
+		props: {
+			pattern: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			horizontal: {
+				type: String,
+				default: 'left'
+			},
+			vertical: {
+				type: String,
+				default: 'bottom'
+			},
+			direction: {
+				type: String,
+				default: 'horizontal'
+			},
+			content: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			show: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				fabShow: false,
+				flug: true,
+				isShow: false,
+				styles: {
+					color: '#3c3e49',
+					selectedColor: '#007AFF',
+					backgroundColor: '#fff',
+					buttonColor: '#3c3e49'
+				}
+			}
+		},
+		computed: {
+			contentWidth(e) {
+				return uni.upx2px((this.content.length + 1) * 110 + 20) + 'px'
+			},
+			contentWidthMin() {
+				return uni.upx2px(110) + 'px'
+			},
+			// 动态计算宽度
+			boxWidth() {
+				return this.getPosition(3, 'horizontal')
+			},
+			// 动态计算高度
+			boxHeight() {
+				return this.getPosition(3, 'vertical')
+			},
+			// 计算左下位置
+			leftBottom() {
+				return this.getPosition(0, 'left', 'bottom')
+			},
+			// 计算右下位置
+			rightBottom() {
+				return this.getPosition(0, 'right', 'bottom')
+			},
+			// 计算左上位置
+			leftTop() {
+				return this.getPosition(0, 'left', 'top')
+			},
+			rightTop() {
+				return this.getPosition(0, 'right', 'top')
+			},
+			flexDirectionStart() {
+				return this.getPosition(1, 'vertical', 'top')
+			},
+			flexDirectionEnd() {
+				return this.getPosition(1, 'vertical', 'bottom')
+			},
+			horizontalLeft() {
+				return this.getPosition(2, 'horizontal', 'left')
+			},
+			horizontalRight() {
+				return this.getPosition(2, 'horizontal', 'right')
+			}
+		},
+		watch: {
+			pattern(newValue, oldValue) {
+				//console.log(JSON.stringify(newValue))
+				this.styles = Object.assign({}, this.styles, newValue)
+			}
+		},
+		created() {
+			this.isShow = this.show
+			if (this.top === 0) {
+				this.fabShow = true
+			}
+			// 初始化样式
+			this.styles = Object.assign({}, this.styles, this.pattern)
+		},
+		methods: {
+			_onClick() {
+				this.isShow = !this.isShow
+			},
+			open() {
+				this.isShow = true
+			},
+			close() {
+				this.isShow = false
+			},
+			/**
+			 * 按钮点击事件
+			 */
+			_onItemClick(index, item) {
+				this.$emit('trigger', {
+					index,
+					item
+				})
+			},
+			/**
+			 * 获取 位置信息
+			 */
+			getPosition(types, paramA, paramB) {
+				if (types === 0) {
+					return this.horizontal === paramA && this.vertical === paramB
+				} else if (types === 1) {
+					return this.direction === paramA && this.vertical === paramB
+				} else if (types === 2) {
+					return this.direction === paramA && this.horizontal === paramB
+				} else {
+					return this.isShow && this.direction === paramA ? this.contentWidth : this.contentWidthMin
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+
+	.uni-icon {
+		font-family: uniicons;
+		font-size: 30px;
+		font-weight: normal;
+		font-style: normal;
+		line-height: 1;
+		display: inline-block;
+		text-decoration: none;
+		-webkit-font-smoothing: antialiased;
+	}
+
+	.fab-box {
+		position: fixed;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 2;
+	}
+
+	.fab-box.top {
+		width: 60rpx;
+		height: 60rpx;
+		right: 30rpx;
+		bottom: 60rpx;
+		border: 1px #5989b9 solid;
+		background: #6699cc;
+		border-radius: 10rpx;
+		color: #fff;
+		transition: all 0.3;
+		opacity: 0;
+	}
+
+	.fab-box.active {
+		opacity: 1;
+	}
+
+	.fab-box.fab {
+		z-index: 10;
+	}
+
+	.fab-box.fab.leftBottom {
+		left: 30rpx;
+		bottom: 60rpx;
+	}
+
+	.fab-box.fab.leftTop {
+		left: 30rpx;
+		top: 80rpx;
+		/* #ifdef H5 */
+		top: calc(80rpx + var(--window-top));
+		/* #endif */
+	}
+
+	.fab-box.fab.rightBottom {
+		right: 30rpx;
+		bottom: 60rpx;
+	}
+
+	.fab-box.fab.rightTop {
+		right: 30rpx;
+		top: 80rpx;
+		/* #ifdef H5 */
+		top: calc(80rpx + var(--window-top));
+		/* #endif */
+	}
+
+	.fab-circle {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		width: 110rpx;
+		height: 110rpx;
+		background: #3c3e49;
+		/* background: #5989b9; */
+		border-radius: 50%;
+		box-shadow: 0 0 5px 2px rgba(0, 0, 0, 0.2);
+		z-index: 11;
+	}
+
+    .fab-circle-box {
+        position: absolute;
+        left: 0;
+        top: 0;
+        right: 0;
+        bottom: 0;
+		transition: all 0.3s;
+    }
+
+    .fab-circle-v {
+        position: absolute;
+        width: 8rpx;
+        height: 60rpx;
+        left: 50%;
+        top: 50%;
+        margin: -30rpx 0 0 -4rpx;
+        background-color: white;
+    }
+
+    .fab-circle-h {
+        position: absolute;
+        width: 60rpx;
+        height: 8rpx;
+        left: 50%;
+        top: 50%;
+        margin: -4rpx 0 0 -30rpx;
+        background-color: white;
+    }
+
+	.fab-circle.left {
+		left: 0;
+	}
+
+	.fab-circle.right {
+		right: 0;
+	}
+
+	.fab-circle.top {
+		top: 0;
+	}
+
+	.fab-circle.bottom {
+		bottom: 0;
+	}
+
+	.fab-circle .uni-icon-plusempty {
+		color: #ffffff;
+		font-size: 80rpx;
+		transition: all 0.3s;
+		font-weight: bold;
+	}
+
+	.fab-circle-box.active {
+		transform: rotate(135deg);
+		font-size: 80rpx;
+	}
+
+	.fab-content {
+		background: #6699cc;
+		box-sizing: border-box;
+		display: flex;
+		border-radius: 100rpx;
+		overflow: hidden;
+		box-shadow: 0 0 5px 2px rgba(0, 0, 0, 0.1);
+		transition: all 0.2s;
+		width: 110rpx;
+	}
+
+	.fab-content.left {
+		justify-content: flex-start;
+	}
+
+	.fab-content.right {
+		justify-content: flex-end;
+	}
+
+	.fab-content.flexDirection {
+		flex-direction: column;
+		justify-content: flex-end;
+	}
+
+	.fab-content.flexDirectionStart {
+		flex-direction: column;
+		justify-content: flex-start;
+	}
+
+	.fab-content.flexDirectionEnd {
+		flex-direction: column;
+		justify-content: flex-end;
+	}
+
+	.fab-content .fab-item {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 110rpx;
+		height: 110rpx;
+		font-size: 24rpx;
+		color: #fff;
+		opacity: 0;
+		transition: opacity 0.2s;
+	}
+
+	.fab-content .fab-item.active {
+		opacity: 1;
+	}
+
+	.fab-content .fab-item .content-image {
+		width: 50rpx;
+		height: 50rpx;
+		margin-bottom: 5rpx;
+	}
+
+	.fab-content .fab-item.first {
+		width: 110rpx;
+	}
+</style>
diff --git a/uni_modules/uni-fab/package.json b/uni_modules/uni-fab/package.json
new file mode 100644
index 0000000..0f27daa
--- /dev/null
+++ b/uni_modules/uni-fab/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-fab",
+  "displayName": "uni-fab 悬浮按钮",
+  "version": "1.2.2",
+  "description": "悬浮按钮 fab button ，点击可展开一个图标按钮菜单。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "按钮",
+    "悬浮按钮",
+    "fab"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss","uni-icons"],
+    "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-fab/readme.md b/uni_modules/uni-fab/readme.md
new file mode 100644
index 0000000..9a444e8
--- /dev/null
+++ b/uni_modules/uni-fab/readme.md
@@ -0,0 +1,9 @@
+## Fab 悬浮按钮
+> **组件名：uni-fab**
+> 代码块： `uFab`
+
+
+点击可展开一个图形按钮菜单
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-fab)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-fav/changelog.md b/uni_modules/uni-fav/changelog.md
new file mode 100644
index 0000000..d8a08d4
--- /dev/null
+++ b/uni_modules/uni-fav/changelog.md
@@ -0,0 +1,19 @@
+## 1.2.1（2022-05-30）
+- 新增 stat 属性 ，是否开启uni统计功能
+## 1.2.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-fav](https://uniapp.dcloud.io/component/uniui/uni-fav)
+## 1.1.1（2021-08-24）
+- 新增 支持国际化
+## 1.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.6（2021-05-12）
+- 新增 组件示例地址
+## 1.0.5（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.4（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.0.3（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.0.2（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-fav/components/uni-fav/i18n/en.json b/uni_modules/uni-fav/components/uni-fav/i18n/en.json
new file mode 100644
index 0000000..9a0759e
--- /dev/null
+++ b/uni_modules/uni-fav/components/uni-fav/i18n/en.json
@@ -0,0 +1,4 @@
+{
+	"uni-fav.collect": "collect",
+	"uni-fav.collected": "collected"
+}
diff --git a/uni_modules/uni-fav/components/uni-fav/i18n/index.js b/uni_modules/uni-fav/components/uni-fav/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-fav/components/uni-fav/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-fav/components/uni-fav/i18n/zh-Hans.json b/uni_modules/uni-fav/components/uni-fav/i18n/zh-Hans.json
new file mode 100644
index 0000000..67c89bf
--- /dev/null
+++ b/uni_modules/uni-fav/components/uni-fav/i18n/zh-Hans.json
@@ -0,0 +1,4 @@
+{
+	"uni-fav.collect": "收藏",
+	"uni-fav.collected": "已收藏"
+}
diff --git a/uni_modules/uni-fav/components/uni-fav/i18n/zh-Hant.json b/uni_modules/uni-fav/components/uni-fav/i18n/zh-Hant.json
new file mode 100644
index 0000000..67c89bf
--- /dev/null
+++ b/uni_modules/uni-fav/components/uni-fav/i18n/zh-Hant.json
@@ -0,0 +1,4 @@
+{
+	"uni-fav.collect": "收藏",
+	"uni-fav.collected": "已收藏"
+}
diff --git a/uni_modules/uni-fav/components/uni-fav/uni-fav.vue b/uni_modules/uni-fav/components/uni-fav/uni-fav.vue
new file mode 100644
index 0000000..d2c58df
--- /dev/null
+++ b/uni_modules/uni-fav/components/uni-fav/uni-fav.vue
@@ -0,0 +1,161 @@
+<template>
+	<view :class="[circle === true || circle === 'true' ? 'uni-fav--circle' : '']" :style="[{ backgroundColor: checked ? bgColorChecked : bgColor }]"
+	 @click="onClick" class="uni-fav">
+		<!-- #ifdef MP-ALIPAY -->
+		<view class="uni-fav-star" v-if="!checked && (star === true || star === 'true')">
+			<uni-icons :color="fgColor" :style="{color: checked ? fgColorChecked : fgColor}" size="14" type="star-filled" />
+		</view>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
+		<uni-icons :color="fgColor" :style="{color: checked ? fgColorChecked : fgColor}" class="uni-fav-star" size="14" type="star-filled"
+		 v-if="!checked && (star === true || star === 'true')" />
+		<!-- #endif -->
+		<text :style="{color: checked ? fgColorChecked : fgColor}" class="uni-fav-text">{{ checked ? contentFav : contentDefault }}</text>
+	</view>
+</template>
+
+<script>
+
+	/**
+	 * Fav 收藏按钮
+	 * @description 用于收藏功能，可点击切换选中、不选中的状态
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=864
+	 * @property {Boolean} star = [true|false] 按钮是否带星星
+	 * @property {String} bgColor 未收藏时的背景色
+	 * @property {String} bgColorChecked 已收藏时的背景色
+	 * @property {String} fgColor 未收藏时的文字颜色
+	 * @property {String} fgColorChecked 已收藏时的文字颜色
+	 * @property {Boolean} circle = [true|false] 是否为圆角
+	 * @property {Boolean} checked = [true|false] 是否为已收藏
+	 * @property {Object} contentText = [true|false] 收藏按钮文字
+	 * @property {Boolean} stat 是否开启统计功能
+	 * @event {Function} click 点击 fav按钮触发事件
+	 * @example <uni-fav :checked="true"/>
+	 */
+
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+
+	export default {
+		name: "UniFav",
+		// TODO 兼容 vue3，需要注册事件
+		emits: ['click'],
+		props: {
+			star: {
+				type: [Boolean, String],
+				default: true
+			},
+			bgColor: {
+				type: String,
+				default: "#eeeeee"
+			},
+			fgColor: {
+				type: String,
+				default: "#666666"
+			},
+			bgColorChecked: {
+				type: String,
+				default: "#007aff"
+			},
+			fgColorChecked: {
+				type: String,
+				default: "#FFFFFF"
+			},
+			circle: {
+				type: [Boolean, String],
+				default: false
+			},
+			checked: {
+				type: Boolean,
+				default: false
+			},
+			contentText: {
+				type: Object,
+				default () {
+					return {
+						contentDefault: "",
+						contentFav: ""
+					};
+				}
+			},
+			stat:{
+				type: Boolean,
+				default: false
+			}
+		},
+		computed: {
+			contentDefault() {
+				return this.contentText.contentDefault || t("uni-fav.collect")
+			},
+			contentFav() {
+				return this.contentText.contentFav || t("uni-fav.collected")
+			},
+		},
+		watch: {
+			checked() {
+				if (uni.report && this.stat) {
+					if (this.checked) {
+						uni.report("收藏", "收藏");
+					} else {
+						uni.report("取消收藏", "取消收藏");
+					}
+				}
+			}
+		},
+		methods: {
+			onClick() {
+				this.$emit("click");
+			}
+		}
+	};
+</script>
+
+<style lang="scss" >
+	$fav-height: 25px;
+
+	.uni-fav {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 60px;
+		height: $fav-height;
+		line-height: $fav-height;
+		text-align: center;
+		border-radius: 3px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-fav--circle {
+		border-radius: 30px;
+	}
+
+	.uni-fav-star {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		height: $fav-height;
+		line-height: 24px;
+		margin-right: 3px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-fav-text {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		height: $fav-height;
+		line-height: $fav-height;
+		align-items: center;
+		justify-content: center;
+		font-size: 12px;
+	}
+</style>
diff --git a/uni_modules/uni-fav/package.json b/uni_modules/uni-fav/package.json
new file mode 100644
index 0000000..cc14697
--- /dev/null
+++ b/uni_modules/uni-fav/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "uni-fav",
+  "displayName": "uni-fav 收藏按钮",
+  "version": "1.2.1",
+  "description": " Fav 收藏组件，可自定义颜色、大小。",
+  "keywords": [
+    "fav",
+    "uni-ui",
+    "uniui",
+    "收藏"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "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-fav/readme.md b/uni_modules/uni-fav/readme.md
new file mode 100644
index 0000000..4de125d
--- /dev/null
+++ b/uni_modules/uni-fav/readme.md
@@ -0,0 +1,10 @@
+
+
+## Fav 收藏按钮
+> **组件名：uni-fav**
+> 代码块： `uFav`
+
+用于收藏功能，可点击切换选中、不选中的状态。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-fav)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-file-picker/changelog.md b/uni_modules/uni-file-picker/changelog.md
new file mode 100644
index 0000000..5c81026
--- /dev/null
+++ b/uni_modules/uni-file-picker/changelog.md
@@ -0,0 +1,63 @@
+## 1.0.2（2022-07-04）
+- 修复 在uni-forms下样式不生效的bug
+## 1.0.1（2021-11-23）
+- 修复 参数为对象的情况下，url在某些情况显示错误的bug
+## 1.0.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-file-picker](https://uniapp.dcloud.io/component/uniui/uni-file-picker)
+## 0.2.16（2021-11-08）
+- 修复 传入空对象 ，显示错误的Bug
+## 0.2.15（2021-08-30）
+- 修复 return-type="object" 时且存在v-model时，无法删除文件的Bug
+## 0.2.14（2021-08-23）
+- 新增 参数中返回 fileID 字段
+## 0.2.13（2021-08-23）
+- 修复 腾讯云传入fileID 不能回显的bug
+- 修复 选择图片后，不能放大的问题
+## 0.2.12（2021-08-17）
+- 修复 由于 0.2.11 版本引起的不能回显图片的Bug
+## 0.2.11（2021-08-16）
+- 新增 clearFiles(index) 方法，可以手动删除指定文件
+- 修复 v-model 值设为 null 报错的Bug
+## 0.2.10（2021-08-13）
+- 修复 return-type="object" 时，无法删除文件的Bug
+## 0.2.9（2021-08-03）
+- 修复 auto-upload 属性失效的Bug
+## 0.2.8（2021-07-31）
+- 修复 fileExtname属性不指定值报错的Bug
+## 0.2.7（2021-07-31）
+- 修复 在某种场景下图片不回显的Bug
+## 0.2.6（2021-07-30）
+- 修复 return-type为object下，返回值不正确的Bug
+## 0.2.5（2021-07-30）
+- 修复（重要） H5 平台下如果和uni-forms组件一同使用导致页面卡死的问题
+## 0.2.3（2021-07-28）
+- 优化 调整示例代码
+## 0.2.2（2021-07-27）
+- 修复 vue3 下赋值错误的Bug
+- 优化 h5平台下上传文件导致页面卡死的问题
+## 0.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.1.1（2021-07-02）
+- 修复 sourceType 缺少默认值导致 ios 无法选择文件
+## 0.1.0（2021-06-30）
+- 优化 解耦与uniCloud的强绑定关系 ，如不绑定服务空间，默认autoUpload为false且不可更改
+## 0.0.11（2021-06-30）
+- 修复 由 0.0.10 版本引发的 returnType 属性失效的问题
+## 0.0.10（2021-06-29）
+- 优化 文件上传后进度条消失时机
+## 0.0.9（2021-06-29）
+- 修复 在uni-forms 中，删除文件 ，获取的值不对的Bug
+## 0.0.8（2021-06-15）
+- 修复 删除文件时无法触发 v-model 的Bug
+## 0.0.7（2021-05-12）
+- 新增 组件示例地址
+## 0.0.6（2021-04-09）
+- 修复 选择的文件非 file-extname 字段指定的扩展名报错的Bug
+## 0.0.5（2021-04-09）
+- 优化 更新组件示例
+## 0.0.4（2021-04-09）
+- 优化 file-extname 字段支持字符串写法，多个扩展名需要用逗号分隔
+## 0.0.3（2021-02-05）
+- 调整为uni_modules目录规范
+- 修复 微信小程序不指定 fileExtname 属性选择失败的Bug
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js b/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js
new file mode 100644
index 0000000..24a07f5
--- /dev/null
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js
@@ -0,0 +1,224 @@
+'use strict';
+
+const ERR_MSG_OK = 'chooseAndUploadFile:ok';
+const ERR_MSG_FAIL = 'chooseAndUploadFile:fail';
+
+function chooseImage(opts) {
+	const {
+		count,
+		sizeType = ['original', 'compressed'],
+		sourceType = ['album', 'camera'],
+		extension
+	} = opts
+	return new Promise((resolve, reject) => {
+		uni.chooseImage({
+			count,
+			sizeType,
+			sourceType,
+			extension,
+			success(res) {
+				resolve(normalizeChooseAndUploadFileRes(res, 'image'));
+			},
+			fail(res) {
+				reject({
+					errMsg: res.errMsg.replace('chooseImage:fail', ERR_MSG_FAIL),
+				});
+			},
+		});
+	});
+}
+
+function chooseVideo(opts) {
+	const {
+		camera,
+		compressed,
+		maxDuration,
+		sourceType = ['album', 'camera'],
+		extension
+	} = opts;
+	return new Promise((resolve, reject) => {
+		uni.chooseVideo({
+			camera,
+			compressed,
+			maxDuration,
+			sourceType,
+			extension,
+			success(res) {
+				const {
+					tempFilePath,
+					duration,
+					size,
+					height,
+					width
+				} = res;
+				resolve(normalizeChooseAndUploadFileRes({
+					errMsg: 'chooseVideo:ok',
+					tempFilePaths: [tempFilePath],
+					tempFiles: [
+					{
+						name: (res.tempFile && res.tempFile.name) || '',
+						path: tempFilePath,
+						size,
+						type: (res.tempFile && res.tempFile.type) || '',
+						width,
+						height,
+						duration,
+						fileType: 'video',
+						cloudPath: '',
+					}, ],
+				}, 'video'));
+			},
+			fail(res) {
+				reject({
+					errMsg: res.errMsg.replace('chooseVideo:fail', ERR_MSG_FAIL),
+				});
+			},
+		});
+	});
+}
+
+function chooseAll(opts) {
+	const {
+		count,
+		extension
+	} = opts;
+	return new Promise((resolve, reject) => {
+		let chooseFile = uni.chooseFile;
+		if (typeof wx !== 'undefined' &&
+			typeof wx.chooseMessageFile === 'function') {
+			chooseFile = wx.chooseMessageFile;
+		}
+		if (typeof chooseFile !== 'function') {
+			return reject({
+				errMsg: ERR_MSG_FAIL + ' 请指定 type 类型，该平台仅支持选择 image 或 video。',
+			});
+		}
+		chooseFile({
+			type: 'all',
+			count,
+			extension,
+			success(res) {
+				resolve(normalizeChooseAndUploadFileRes(res));
+			},
+			fail(res) {
+				reject({
+					errMsg: res.errMsg.replace('chooseFile:fail', ERR_MSG_FAIL),
+				});
+			},
+		});
+	});
+}
+
+function normalizeChooseAndUploadFileRes(res, fileType) {
+	res.tempFiles.forEach((item, index) => {
+		if (!item.name) {
+			item.name = item.path.substring(item.path.lastIndexOf('/') + 1);
+		}
+		if (fileType) {
+			item.fileType = fileType;
+		}
+		item.cloudPath =
+			Date.now() + '_' + index + item.name.substring(item.name.lastIndexOf('.'));
+	});
+	if (!res.tempFilePaths) {
+		res.tempFilePaths = res.tempFiles.map((file) => file.path);
+	}
+	return res;
+}
+
+function uploadCloudFiles(files, max = 5, onUploadProgress) {
+	files = JSON.parse(JSON.stringify(files))
+	const len = files.length
+	let count = 0
+	let self = this
+	return new Promise(resolve => {
+		while (count < max) {
+			next()
+		}
+
+		function next() {
+			let cur = count++
+			if (cur >= len) {
+				!files.find(item => !item.url && !item.errMsg) && resolve(files)
+				return
+			}
+			const fileItem = files[cur]
+			const index = self.files.findIndex(v => v.uuid === fileItem.uuid)
+			fileItem.url = ''
+			delete fileItem.errMsg
+
+			uniCloud
+				.uploadFile({
+					filePath: fileItem.path,
+					cloudPath: fileItem.cloudPath,
+					fileType: fileItem.fileType,
+					onUploadProgress: res => {
+						res.index = index
+						onUploadProgress && onUploadProgress(res)
+					}
+				})
+				.then(res => {
+					fileItem.url = res.fileID
+					fileItem.index = index
+					if (cur < len) {
+						next()
+					}
+				})
+				.catch(res => {
+					fileItem.errMsg = res.errMsg || res.message
+					fileItem.index = index
+					if (cur < len) {
+						next()
+					}
+				})
+		}
+	})
+}
+
+
+
+
+
+function uploadFiles(choosePromise, {
+	onChooseFile,
+	onUploadProgress
+}) {
+	return choosePromise
+		.then((res) => {
+			if (onChooseFile) {
+				const customChooseRes = onChooseFile(res);
+				if (typeof customChooseRes !== 'undefined') {
+					return Promise.resolve(customChooseRes).then((chooseRes) => typeof chooseRes === 'undefined' ?
+						res : chooseRes);
+				}
+			}
+			return res;
+		})
+		.then((res) => {
+			if (res === false) {
+				return {
+					errMsg: ERR_MSG_OK,
+					tempFilePaths: [],
+					tempFiles: [],
+				};
+			}
+			return res
+		})
+}
+
+function chooseAndUploadFile(opts = {
+	type: 'all'
+}) {
+	if (opts.type === 'image') {
+		return uploadFiles(chooseImage(opts), opts);
+	}
+	else if (opts.type === 'video') {
+		return uploadFiles(chooseVideo(opts), opts);
+	}
+	return uploadFiles(chooseAll(opts), opts);
+}
+
+export {
+	chooseAndUploadFile,
+	uploadCloudFiles
+};
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
new file mode 100644
index 0000000..0928a41
--- /dev/null
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
@@ -0,0 +1,656 @@
+<template>
+	<view class="uni-file-picker">
+		<view v-if="title" class="uni-file-picker__header">
+			<text class="file-title">{{ title }}</text>
+			<text class="file-count">{{ filesList.length }}/{{ limitLength }}</text>
+		</view>
+		<upload-image v-if="fileMediatype === 'image' && showType === 'grid'" :readonly="readonly"
+			:image-styles="imageStyles" :files-list="filesList" :limit="limitLength" :disablePreview="disablePreview"
+			:delIcon="delIcon" @uploadFiles="uploadFiles" @choose="choose" @delFile="delFile">
+			<slot>
+				<view class="is-add">
+					<view class="icon-add"></view>
+					<view class="icon-add rotate"></view>
+				</view>
+			</slot>
+		</upload-image>
+		<upload-file v-if="fileMediatype !== 'image' || showType !== 'grid'" :readonly="readonly"
+			:list-styles="listStyles" :files-list="filesList" :showType="showType" :delIcon="delIcon"
+			@uploadFiles="uploadFiles" @choose="choose" @delFile="delFile">
+			<slot><button type="primary" size="mini">选择文件</button></slot>
+		</upload-file>
+	</view>
+</template>
+
+<script>
+	import {
+		chooseAndUploadFile,
+		uploadCloudFiles
+	} from './choose-and-upload-file.js'
+	import {
+		get_file_ext,
+		get_extname,
+		get_files_and_is_max,
+		get_file_info,
+		get_file_data
+	} from './utils.js'
+	import uploadImage from './upload-image.vue'
+	import uploadFile from './upload-file.vue'
+	let fileInput = null
+	/**
+	 * FilePicker 文件选择上传
+	 * @description 文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=4079
+	 * @property {Object|Array}	value	组件数据，通常用来回显 ,类型由return-type属性决定
+	 * @property {Boolean}	disabled = [true|false]	组件禁用
+	 * 	@value true 	禁用
+	 * 	@value false 	取消禁用
+	 * @property {Boolean}	readonly = [true|false]	组件只读，不可选择，不显示进度，不显示删除按钮
+	 * 	@value true 	只读
+	 * 	@value false 	取消只读
+	 * @property {String}	return-type = [array|object]	限制 value 格式，当为 object 时 ，组件只能单选，且会覆盖
+	 * 	@value array	规定 value 属性的类型为数组
+	 * 	@value object	规定 value 属性的类型为对象
+	 * @property {Boolean}	disable-preview = [true|false]	禁用图片预览，仅 mode:grid 时生效
+	 * 	@value true 	禁用图片预览
+	 * 	@value false 	取消禁用图片预览
+	 * @property {Boolean}	del-icon = [true|false]	是否显示删除按钮
+	 * 	@value true 	显示删除按钮
+	 * 	@value false 	不显示删除按钮
+	 * @property {Boolean}	auto-upload = [true|false]	是否自动上传，值为true则只触发@select,可自行上传
+	 * 	@value true 	自动上传
+	 * 	@value false 	取消自动上传
+	 * @property {Number|String}	limit	最大选择个数 ，h5 会自动忽略多选的部分
+	 * @property {String}	title	组件标题，右侧显示上传计数
+	 * @property {String}	mode = [list|grid]	选择文件后的文件列表样式
+	 * 	@value list 	列表显示
+	 * 	@value grid 	宫格显示
+	 * @property {String}	file-mediatype = [image|video|all]	选择文件类型
+	 * 	@value image	只选择图片
+	 * 	@value video	只选择视频
+	 * 	@value all		选择所有文件
+	 * @property {Array}	file-extname	选择文件后缀，根据 file-mediatype 属性而不同
+	 * @property {Object}	list-style	mode:list 时的样式
+	 * @property {Object}	image-styles	选择文件后缀，根据 file-mediatype 属性而不同
+	 * @event {Function} select 	选择文件后触发
+	 * @event {Function} progress 文件上传时触发
+	 * @event {Function} success 	上传成功触发
+	 * @event {Function} fail 		上传失败触发
+	 * @event {Function} delete 	文件从列表移除时触发
+	 */
+	export default {
+		name: 'uniFilePicker',
+		components: {
+			uploadImage,
+			uploadFile
+		},
+		options: {
+			virtualHost: true
+		},
+		emits: ['select', 'success', 'fail', 'progress', 'delete', 'update:modelValue', 'input'],
+		props: {
+			// #ifdef VUE3
+			modelValue: {
+				type: [Array, Object],
+				default () {
+					return []
+				}
+			},
+			// #endif
+
+			// #ifndef VUE3
+			value: {
+				type: [Array, Object],
+				default () {
+					return []
+				}
+			},
+			// #endif
+
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			disablePreview: {
+				type: Boolean,
+				default: false
+			},
+			delIcon: {
+				type: Boolean,
+				default: true
+			},
+			// 自动上传
+			autoUpload: {
+				type: Boolean,
+				default: true
+			},
+			// 最大选择个数 ，h5只能限制单选或是多选
+			limit: {
+				type: [Number, String],
+				default: 9
+			},
+			// 列表样式 grid | list | list-card
+			mode: {
+				type: String,
+				default: 'grid'
+			},
+			// 选择文件类型  image/video/all
+			fileMediatype: {
+				type: String,
+				default: 'image'
+			},
+			// 文件类型筛选
+			fileExtname: {
+				type: [Array, String],
+				default () {
+					return []
+				}
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			listStyles: {
+				type: Object,
+				default () {
+					return {
+						// 是否显示边框
+						border: true,
+						// 是否显示分隔线
+						dividline: true,
+						// 线条样式
+						borderStyle: {}
+					}
+				}
+			},
+			imageStyles: {
+				type: Object,
+				default () {
+					return {
+						width: 'auto',
+						height: 'auto'
+					}
+				}
+			},
+			readonly: {
+				type: Boolean,
+				default: false
+			},
+			returnType: {
+				type: String,
+				default: 'array'
+			},
+			sizeType: {
+				type: Array,
+				default () {
+					return ['original', 'compressed']
+				}
+			}
+		},
+		data() {
+			return {
+				files: [],
+				localValue: []
+			}
+		},
+		watch: {
+			// #ifndef VUE3
+			value: {
+				handler(newVal, oldVal) {
+					this.setValue(newVal, oldVal)
+				},
+				immediate: true
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				handler(newVal, oldVal) {
+					this.setValue(newVal, oldVal)
+				},
+				immediate: true
+			},
+			// #endif
+		},
+		computed: {
+			filesList() {
+				let files = []
+				this.files.forEach(v => {
+					files.push(v)
+				})
+				return files
+			},
+			showType() {
+				if (this.fileMediatype === 'image') {
+					return this.mode
+				}
+				return 'list'
+			},
+			limitLength() {
+				if (this.returnType === 'object') {
+					return 1
+				}
+				if (!this.limit) {
+					return 1
+				}
+				if (this.limit >= 9) {
+					return 9
+				}
+				return this.limit
+			}
+		},
+		created() {
+			// TODO 兼容不开通服务空间的情况
+			if (!(uniCloud.config && uniCloud.config.provider)) {
+				this.noSpace = true
+				uniCloud.chooseAndUploadFile = chooseAndUploadFile
+			}
+			this.form = this.getForm('uniForms')
+			this.formItem = this.getForm('uniFormsItem')
+			if (this.form && this.formItem) {
+				if (this.formItem.name) {
+					this.rename = this.formItem.name
+					this.form.inputChildrens.push(this)
+				}
+			}
+		},
+		methods: {
+			/**
+			 * 公开用户使用，清空文件
+			 * @param {Object} index
+			 */
+			clearFiles(index) {
+				if (index !== 0 && !index) {
+					this.files = []
+					this.$nextTick(() => {
+						this.setEmit()
+					})
+				} else {
+					this.files.splice(index, 1)
+				}
+				this.$nextTick(() => {
+					this.setEmit()
+				})
+			},
+			/**
+			 * 公开用户使用，继续上传
+			 */
+			upload() {
+				let files = []
+				this.files.forEach((v, index) => {
+					if (v.status === 'ready' || v.status === 'error') {
+						files.push(Object.assign({}, v))
+					}
+				})
+				return this.uploadFiles(files)
+			},
+			async setValue(newVal, oldVal) {
+				const newData =  async (v) => {
+					const reg = /cloud:\/\/([\w.]+\/?)\S*/
+					let url = ''
+					if(v.fileID){
+						url = v.fileID
+					}else{
+						url = v.url
+					}
+					if (reg.test(url)) {
+						v.fileID = url
+						v.url = await this.getTempFileURL(url)
+					}
+					if(v.url) v.path = v.url
+					return v
+				}
+				if (this.returnType === 'object') {
+					if (newVal) {
+						await newData(newVal)
+					} else {
+						newVal = {}
+					}
+				} else {
+					if (!newVal) newVal = []
+					for(let i =0 ;i < newVal.length ;i++){
+						let v = newVal[i]
+						await newData(v)
+					}
+				}
+				this.localValue = newVal
+				if (this.form && this.formItem &&!this.is_reset) {
+					this.is_reset = false
+					this.formItem.setValue(this.localValue)
+				}
+				let filesData = Object.keys(newVal).length > 0 ? newVal : [];
+				this.files = [].concat(filesData)
+			},
+
+			/**
+			 * 选择文件
+			 */
+			choose() {
+
+				if (this.disabled) return
+				if (this.files.length >= Number(this.limitLength) && this.showType !== 'grid' && this.returnType ===
+					'array') {
+					uni.showToast({
+						title: `您最多选择 ${this.limitLength} 个文件`,
+						icon: 'none'
+					})
+					return
+				}
+				this.chooseFiles()
+			},
+
+			/**
+			 * 选择文件并上传
+			 */
+			chooseFiles() {
+				const _extname = get_extname(this.fileExtname)
+				// 获取后缀
+				uniCloud
+					.chooseAndUploadFile({
+						type: this.fileMediatype,
+						compressed: false,
+						sizeType: this.sizeType,
+						// TODO 如果为空，video 有问题
+						extension: _extname.length > 0 ? _extname : undefined,
+						count: this.limitLength - this.files.length, //默认9
+						onChooseFile: this.chooseFileCallback,
+						onUploadProgress: progressEvent => {
+							this.setProgress(progressEvent, progressEvent.index)
+						}
+					})
+					.then(result => {
+						this.setSuccessAndError(result.tempFiles)
+					})
+					.catch(err => {
+						console.log('选择失败', err)
+					})
+			},
+
+			/**
+			 * 选择文件回调
+			 * @param {Object} res
+			 */
+			async chooseFileCallback(res) {
+				const _extname = get_extname(this.fileExtname)
+				const is_one = (Number(this.limitLength) === 1 &&
+						this.disablePreview &&
+						!this.disabled) ||
+					this.returnType === 'object'
+				// 如果这有一个文件 ，需要清空本地缓存数据
+				if (is_one) {
+					this.files = []
+				}
+
+				let {
+					filePaths,
+					files
+				} = get_files_and_is_max(res, _extname)
+				if (!(_extname && _extname.length > 0)) {
+					filePaths = res.tempFilePaths
+					files = res.tempFiles
+				}
+
+				let currentData = []
+				for (let i = 0; i < files.length; i++) {
+					if (this.limitLength - this.files.length <= 0) break
+					files[i].uuid = Date.now()
+					let filedata = await get_file_data(files[i], this.fileMediatype)
+					filedata.progress = 0
+					filedata.status = 'ready'
+					this.files.push(filedata)
+					currentData.push({
+						...filedata,
+						file: files[i]
+					})
+				}
+				this.$emit('select', {
+					tempFiles: currentData,
+					tempFilePaths: filePaths
+				})
+				res.tempFiles = files
+				// 停止自动上传
+				if (!this.autoUpload || this.noSpace) {
+					res.tempFiles = []
+				}
+			},
+
+			/**
+			 * 批传
+			 * @param {Object} e
+			 */
+			uploadFiles(files) {
+				files = [].concat(files)
+				return uploadCloudFiles.call(this, files, 5, res => {
+						this.setProgress(res, res.index, true)
+					})
+					.then(result => {
+						this.setSuccessAndError(result)
+						return result;
+					})
+					.catch(err => {
+						console.log(err)
+					})
+			},
+
+			/**
+			 * 成功或失败
+			 */
+			async setSuccessAndError(res, fn) {
+				let successData = []
+				let errorData = []
+				let tempFilePath = []
+				let errorTempFilePath = []
+				for (let i = 0; i < res.length; i++) {
+					const item = res[i]
+					const index = item.uuid ? this.files.findIndex(p => p.uuid === item.uuid) : item.index
+
+					if (index === -1 || !this.files) break
+					if (item.errMsg === 'request:fail') {
+						this.files[index].url = item.path
+						this.files[index].status = 'error'
+						this.files[index].errMsg = item.errMsg
+						// this.files[index].progress = -1
+						errorData.push(this.files[index])
+						errorTempFilePath.push(this.files[index].url)
+					} else {
+						this.files[index].errMsg = ''
+						this.files[index].fileID = item.url
+						const reg = /cloud:\/\/([\w.]+\/?)\S*/
+						if (reg.test(item.url)) {
+							this.files[index].url = await this.getTempFileURL(item.url)
+						}else{
+							this.files[index].url = item.url
+						}
+
+						this.files[index].status = 'success'
+						this.files[index].progress += 1
+						successData.push(this.files[index])
+						tempFilePath.push(this.files[index].fileID)
+					}
+				}
+
+				if (successData.length > 0) {
+					this.setEmit()
+					// 状态改变返回
+					this.$emit('success', {
+						tempFiles: this.backObject(successData),
+						tempFilePaths: tempFilePath
+					})
+				}
+
+				if (errorData.length > 0) {
+					this.$emit('fail', {
+						tempFiles: this.backObject(errorData),
+						tempFilePaths: errorTempFilePath
+					})
+				}
+			},
+
+			/**
+			 * 获取进度
+			 * @param {Object} progressEvent
+			 * @param {Object} index
+			 * @param {Object} type
+			 */
+			setProgress(progressEvent, index, type) {
+				const fileLenth = this.files.length
+				const percentNum = (index / fileLenth) * 100
+				const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total)
+				let idx = index
+				if (!type) {
+					idx = this.files.findIndex(p => p.uuid === progressEvent.tempFile.uuid)
+				}
+				if (idx === -1 || !this.files[idx]) return
+				// fix by mehaotian 100 就会消失，-1 是为了让进度条消失
+				this.files[idx].progress = percentCompleted - 1
+				// 上传中
+				this.$emit('progress', {
+					index: idx,
+					progress: parseInt(percentCompleted),
+					tempFile: this.files[idx]
+				})
+			},
+
+			/**
+			 * 删除文件
+			 * @param {Object} index
+			 */
+			delFile(index) {
+				this.$emit('delete', {
+					tempFile: this.files[index],
+					tempFilePath: this.files[index].url
+				})
+				this.files.splice(index, 1)
+				this.$nextTick(() => {
+					this.setEmit()
+				})
+			},
+
+			/**
+			 * 获取文件名和后缀
+			 * @param {Object} name
+			 */
+			getFileExt(name) {
+				const last_len = name.lastIndexOf('.')
+				const len = name.length
+				return {
+					name: name.substring(0, last_len),
+					ext: name.substring(last_len + 1, len)
+				}
+			},
+
+			/**
+			 * 处理返回事件
+			 */
+			setEmit() {
+				let data = []
+				if (this.returnType === 'object') {
+					data = this.backObject(this.files)[0]
+					this.localValue = data?data:null
+				} else {
+					data = this.backObject(this.files)
+					if (!this.localValue) {
+						this.localValue = []
+					}
+					this.localValue = [...data]
+				}
+				// #ifdef VUE3
+				this.$emit('update:modelValue', this.localValue)
+				// #endif
+				// #ifndef VUE3
+				this.$emit('input', this.localValue)
+				// #endif
+			},
+
+			/**
+			 * 处理返回参数
+			 * @param {Object} files
+			 */
+			backObject(files) {
+				let newFilesData = []
+				files.forEach(v => {
+					newFilesData.push({
+						extname: v.extname,
+						fileType: v.fileType,
+						image: v.image,
+						name: v.name,
+						path: v.path,
+						size: v.size,
+						fileID:v.fileID,
+						url: v.url
+					})
+				})
+				return newFilesData
+			},
+			async getTempFileURL(fileList) {
+				fileList = {
+					fileList: [].concat(fileList)
+				}
+				const urls = await uniCloud.getTempFileURL(fileList)
+				return urls.fileList[0].tempFileURL || ''
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniForms') {
+				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;
+			}
+		}
+	}
+</script>
+
+<style>
+	.uni-file-picker {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		overflow: hidden;
+		width: 100%;
+		/* #endif */
+		flex: 1;
+	}
+
+	.uni-file-picker__header {
+		padding-top: 5px;
+		padding-bottom: 10px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: space-between;
+	}
+
+	.file-title {
+		font-size: 14px;
+		color: #333;
+	}
+
+	.file-count {
+		font-size: 14px;
+		color: #999;
+	}
+
+	.is-add {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		justify-content: center;
+	}
+
+	.icon-add {
+		width: 50px;
+		height: 5px;
+		background-color: #f1f1f1;
+		border-radius: 2px;
+	}
+
+	.rotate {
+		position: absolute;
+		transform: rotate(90deg);
+	}
+</style>
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue b/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue
new file mode 100644
index 0000000..625d92e
--- /dev/null
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue
@@ -0,0 +1,325 @@
+<template>
+	<view class="uni-file-picker__files">
+		<view v-if="!readonly" class="files-button" @click="choose">
+			<slot></slot>
+		</view>
+		<!-- :class="{'is-text-box':showType === 'list'}" -->
+		<view v-if="list.length > 0" class="uni-file-picker__lists is-text-box" :style="borderStyle">
+			<!-- ,'is-list-card':showType === 'list-card' -->
+
+			<view class="uni-file-picker__lists-box" v-for="(item ,index) in list" :key="index" :class="{
+				'files-border':index !== 0 && styles.dividline}"
+			 :style="index !== 0 && styles.dividline &&borderLineStyle">
+				<view class="uni-file-picker__item">
+					<!-- :class="{'is-text-image':showType === 'list'}" -->
+					<!-- 	<view class="files__image is-text-image">
+						<image class="header-image" :src="item.logo" mode="aspectFit"></image>
+					</view> -->
+					<view class="files__name">{{item.name}}</view>
+					<view v-if="delIcon&&!readonly" class="icon-del-box icon-files" @click="delFile(index)">
+						<view class="icon-del icon-files"></view>
+						<view class="icon-del rotate"></view>
+					</view>
+				</view>
+				<view v-if="(item.progress && item.progress !== 100) ||item.progress===0 " class="file-picker__progress">
+					<progress class="file-picker__progress-item" :percent="item.progress === -1?0:item.progress" stroke-width="4"
+					 :backgroundColor="item.errMsg?'#ff5a5f':'#EBEBEB'" />
+				</view>
+				<view v-if="item.status === 'error'" class="file-picker__mask" @click.stop="uploadFiles(item,index)">
+					点击重试
+				</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "uploadFile",
+		emits:['uploadFiles','choose','delFile'],
+		props: {
+			filesList: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			delIcon: {
+				type: Boolean,
+				default: true
+			},
+			limit: {
+				type: [Number, String],
+				default: 9
+			},
+			showType: {
+				type: String,
+				default: ''
+			},
+			listStyles: {
+				type: Object,
+				default () {
+					return {
+						// 是否显示边框
+						border: true,
+						// 是否显示分隔线
+						dividline: true,
+						// 线条样式
+						borderStyle: {}
+					}
+				}
+			},
+			readonly:{
+				type:Boolean,
+				default:false
+			}
+		},
+		computed: {
+			list() {
+				let files = []
+				this.filesList.forEach(v => {
+					files.push(v)
+				})
+				return files
+			},
+			styles() {
+				let styles = {
+					border: true,
+					dividline: true,
+					'border-style': {}
+				}
+				return Object.assign(styles, this.listStyles)
+			},
+			borderStyle() {
+				let {
+					borderStyle,
+					border
+				} = this.styles
+				let obj = {}
+				if (!border) {
+					obj.border = 'none'
+				} else {
+					let width = (borderStyle && borderStyle.width) || 1
+					width = this.value2px(width)
+					let radius = (borderStyle && borderStyle.radius) || 5
+					radius = this.value2px(radius)
+					obj = {
+						'border-width': width,
+						'border-style': (borderStyle && borderStyle.style) || 'solid',
+						'border-color': (borderStyle && borderStyle.color) || '#eee',
+						'border-radius': radius
+					}
+				}
+				let classles = ''
+				for (let i in obj) {
+					classles += `${i}:${obj[i]};`
+				}
+				return classles
+			},
+			borderLineStyle() {
+				let obj = {}
+				let {
+					borderStyle
+				} = this.styles
+				if (borderStyle && borderStyle.color) {
+					obj['border-color'] = borderStyle.color
+				}
+				if (borderStyle && borderStyle.width) {
+					let width = borderStyle && borderStyle.width || 1
+					let style = borderStyle && borderStyle.style || 0
+					if (typeof width === 'number') {
+						width += 'px'
+					} else {
+						width = width.indexOf('px') ? width : width + 'px'
+					}
+					obj['border-width'] = width
+
+					if (typeof style === 'number') {
+						style += 'px'
+					} else {
+						style = style.indexOf('px') ? style : style + 'px'
+					}
+					obj['border-top-style'] = style
+				}
+				let classles = ''
+				for (let i in obj) {
+					classles += `${i}:${obj[i]};`
+				}
+				return classles
+			}
+		},
+
+		methods: {
+			uploadFiles(item, index) {
+				this.$emit("uploadFiles", {
+					item,
+					index
+				})
+			},
+			choose() {
+				this.$emit("choose")
+			},
+			delFile(index) {
+				this.$emit('delFile', index)
+			},
+			value2px(value) {
+				if (typeof value === 'number') {
+					value += 'px'
+				} else {
+					value = value.indexOf('px') !== -1 ? value : value + 'px'
+				}
+				return value
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-file-picker__files {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: flex-start;
+	}
+
+	.files-button {
+		// border: 1px red solid;
+	}
+
+	.uni-file-picker__lists {
+		position: relative;
+		margin-top: 5px;
+		overflow: hidden;
+	}
+
+	.file-picker__mask {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		color: #fff;
+		font-size: 14px;
+		background-color: rgba(0, 0, 0, 0.4);
+	}
+
+	.uni-file-picker__lists-box {
+		position: relative;
+	}
+
+	.uni-file-picker__item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		padding: 8px 10px;
+		padding-right: 5px;
+		padding-left: 10px;
+	}
+
+	.files-border {
+		border-top: 1px #eee solid;
+	}
+
+	.files__name {
+		flex: 1;
+		font-size: 14px;
+		color: #666;
+		margin-right: 25px;
+		/* #ifndef APP-NVUE */
+		word-break: break-all;
+		word-wrap: break-word;
+		/* #endif */
+	}
+
+	.icon-files {
+		/* #ifndef APP-NVUE */
+		position: static;
+		background-color: initial;
+		/* #endif */
+	}
+
+	// .icon-files .icon-del {
+	// 	background-color: #333;
+	// 	width: 12px;
+	// 	height: 1px;
+	// }
+
+
+	.is-list-card {
+		border: 1px #eee solid;
+		margin-bottom: 5px;
+		border-radius: 5px;
+		box-shadow: 0 0 2px 0px rgba(0, 0, 0, 0.1);
+		padding: 5px;
+	}
+
+	.files__image {
+		width: 40px;
+		height: 40px;
+		margin-right: 10px;
+	}
+
+	.header-image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.is-text-box {
+		border: 1px #eee solid;
+		border-radius: 5px;
+	}
+
+	.is-text-image {
+		width: 25px;
+		height: 25px;
+		margin-left: 5px;
+	}
+
+	.rotate {
+		position: absolute;
+		transform: rotate(90deg);
+	}
+
+	.icon-del-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		margin: auto 0;
+		/* #endif */
+		align-items: center;
+		justify-content: center;
+		position: absolute;
+		top: 0px;
+		bottom: 0;
+		right: 5px;
+		height: 26px;
+		width: 26px;
+		// border-radius: 50%;
+		// background-color: rgba(0, 0, 0, 0.5);
+		z-index: 2;
+		transform: rotate(-45deg);
+	}
+
+	.icon-del {
+		width: 15px;
+		height: 1px;
+		background-color: #333;
+		// border-radius: 1px;
+	}
+
+	/* #ifdef H5 */
+	@media all and (min-width: 768px) {
+		.uni-file-picker__files {
+			max-width: 375px;
+		}
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue b/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue
new file mode 100644
index 0000000..2a29bc2
--- /dev/null
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue
@@ -0,0 +1,292 @@
+<template>
+	<view class="uni-file-picker__container">
+		<view class="file-picker__box" v-for="(item,index) in filesList" :key="index" :style="boxStyle">
+			<view class="file-picker__box-content" :style="borderStyle">
+				<image class="file-image" :src="item.url" mode="aspectFill" @click.stop="prviewImage(item,index)"></image>
+				<view v-if="delIcon && !readonly" class="icon-del-box" @click.stop="delFile(index)">
+					<view class="icon-del"></view>
+					<view class="icon-del rotate"></view>
+				</view>
+				<view v-if="(item.progress && item.progress !== 100) ||item.progress===0 " class="file-picker__progress">
+					<progress class="file-picker__progress-item" :percent="item.progress === -1?0:item.progress" stroke-width="4"
+					 :backgroundColor="item.errMsg?'#ff5a5f':'#EBEBEB'" />
+				</view>
+				<view v-if="item.errMsg" class="file-picker__mask" @click.stop="uploadFiles(item,index)">
+					点击重试
+				</view>
+			</view>
+		</view>
+		<view v-if="filesList.length < limit && !readonly" class="file-picker__box" :style="boxStyle">
+			<view class="file-picker__box-content is-add" :style="borderStyle" @click="choose">
+				<slot>
+					<view class="icon-add"></view>
+					<view class="icon-add rotate"></view>
+				</slot>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "uploadImage",
+		emits:['uploadFiles','choose','delFile'],
+		props: {
+			filesList: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			disabled:{
+				type: Boolean,
+				default: false
+			},
+			disablePreview: {
+				type: Boolean,
+				default: false
+			},
+			limit: {
+				type: [Number, String],
+				default: 9
+			},
+			imageStyles: {
+				type: Object,
+				default () {
+					return {
+						width: 'auto',
+						height: 'auto',
+						border: {}
+					}
+				}
+			},
+			delIcon: {
+				type: Boolean,
+				default: true
+			},
+			readonly:{
+				type:Boolean,
+				default:false
+			}
+		},
+		computed: {
+			styles() {
+				let styles = {
+					width: 'auto',
+					height: 'auto',
+					border: {}
+				}
+				return Object.assign(styles, this.imageStyles)
+			},
+			boxStyle() {
+				const {
+					width = 'auto',
+						height = 'auto'
+				} = this.styles
+				let obj = {}
+				if (height === 'auto') {
+					if (width !== 'auto') {
+						obj.height = this.value2px(width)
+						obj['padding-top'] = 0
+					} else {
+						obj.height = 0
+					}
+				} else {
+					obj.height = this.value2px(height)
+					obj['padding-top'] = 0
+				}
+
+				if (width === 'auto') {
+					if (height !== 'auto') {
+						obj.width = this.value2px(height)
+					} else {
+						obj.width = '33.3%'
+					}
+				} else {
+					obj.width = this.value2px(width)
+				}
+
+				let classles = ''
+				for(let i in obj){
+					classles+= `${i}:${obj[i]};`
+				}
+				return classles
+			},
+			borderStyle() {
+				let {
+					border
+				} = this.styles
+				let obj = {}
+				const widthDefaultValue = 1
+				const radiusDefaultValue = 3
+				if (typeof border === 'boolean') {
+					obj.border = border ? '1px #eee solid' : 'none'
+				} else {
+					let width = (border && border.width) || widthDefaultValue
+					width = this.value2px(width)
+					let radius = (border && border.radius) || radiusDefaultValue
+					radius = this.value2px(radius)
+					obj = {
+						'border-width': width,
+						'border-style': (border && border.style) || 'solid',
+						'border-color': (border && border.color) || '#eee',
+						'border-radius': radius
+					}
+				}
+				let classles = ''
+				for(let i in obj){
+					classles+= `${i}:${obj[i]};`
+				}
+				return classles
+			}
+		},
+		methods: {
+			uploadFiles(item, index) {
+				this.$emit("uploadFiles", item)
+			},
+			choose() {
+				this.$emit("choose")
+			},
+			delFile(index) {
+				this.$emit('delFile', index)
+			},
+			prviewImage(img, index) {
+				let urls = []
+				if(Number(this.limit) === 1&&this.disablePreview&&!this.disabled){
+					this.$emit("choose")
+				}
+				if(this.disablePreview) return
+				this.filesList.forEach(i => {
+					urls.push(i.url)
+				})
+
+				uni.previewImage({
+					urls: urls,
+					current: index
+				});
+			},
+			value2px(value) {
+				if (typeof value === 'number') {
+					value += 'px'
+				} else {
+					if (value.indexOf('%') === -1) {
+						value = value.indexOf('px') !== -1 ? value : value + 'px'
+					}
+				}
+				return value
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-file-picker__container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		flex-wrap: wrap;
+		margin: -5px;
+	}
+
+	.file-picker__box {
+		position: relative;
+		// flex: 0 0 33.3%;
+		width: 33.3%;
+		height: 0;
+		padding-top: 33.33%;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.file-picker__box-content {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		margin: 5px;
+		border: 1px #eee solid;
+		border-radius: 5px;
+		overflow: hidden;
+	}
+
+	.file-picker__progress {
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		/* border: 1px red solid; */
+		z-index: 2;
+	}
+
+	.file-picker__progress-item {
+		width: 100%;
+	}
+
+	.file-picker__mask {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		color: #fff;
+		font-size: 12px;
+		background-color: rgba(0, 0, 0, 0.4);
+	}
+
+	.file-image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.is-add {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		justify-content: center;
+	}
+
+	.icon-add {
+		width: 50px;
+		height: 5px;
+		background-color: #f1f1f1;
+		border-radius: 2px;
+	}
+
+	.rotate {
+		position: absolute;
+		transform: rotate(90deg);
+	}
+
+	.icon-del-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		justify-content: center;
+		position: absolute;
+		top: 3px;
+		right: 3px;
+		height: 26px;
+		width: 26px;
+		border-radius: 50%;
+		background-color: rgba(0, 0, 0, 0.5);
+		z-index: 2;
+		transform: rotate(-45deg);
+	}
+
+	.icon-del {
+		width: 15px;
+		height: 2px;
+		background-color: #fff;
+		border-radius: 2px;
+	}
+</style>
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/utils.js b/uni_modules/uni-file-picker/components/uni-file-picker/utils.js
new file mode 100644
index 0000000..60aaa3e
--- /dev/null
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/utils.js
@@ -0,0 +1,109 @@
+/**
+ * 获取文件名和后缀
+ * @param {String} name
+ */
+export const get_file_ext = (name) => {
+	const last_len = name.lastIndexOf('.')
+	const len = name.length
+	return {
+		name: name.substring(0, last_len),
+		ext: name.substring(last_len + 1, len)
+	}
+}
+
+/**
+ * 获取扩展名
+ * @param {Array} fileExtname
+ */
+export const get_extname = (fileExtname) => {
+	if (!Array.isArray(fileExtname)) {
+		let extname = fileExtname.replace(/(\[|\])/g, '')
+		return extname.split(',')
+	} else {
+		return fileExtname
+	}
+	return []
+}
+
+/**
+ * 获取文件和检测是否可选
+ */
+export const get_files_and_is_max = (res, _extname) => {
+	let filePaths = []
+	let files = []
+	if(!_extname || _extname.length === 0){
+		return {
+			filePaths,
+			files
+		}
+	}
+	res.tempFiles.forEach(v => {
+		let fileFullName = get_file_ext(v.name)
+		const extname = fileFullName.ext.toLowerCase()
+		if (_extname.indexOf(extname) !== -1) {
+			files.push(v)
+			filePaths.push(v.path)
+		}
+	})
+	if (files.length !== res.tempFiles.length) {
+		uni.showToast({
+			title: `当前选择了${res.tempFiles.length}个文件 ，${res.tempFiles.length - files.length} 个文件格式不正确`,
+			icon: 'none',
+			duration: 5000
+		})
+	}
+
+	return {
+		filePaths,
+		files
+	}
+}
+
+
+/**
+ * 获取图片信息
+ * @param {Object} filepath
+ */
+export const get_file_info = (filepath) => {
+	return new Promise((resolve, reject) => {
+		uni.getImageInfo({
+			src: filepath,
+			success(res) {
+				resolve(res)
+			},
+			fail(err) {
+				reject(err)
+			}
+		})
+	})
+}
+/**
+ * 获取封装数据
+ */
+export const get_file_data = async (files, type = 'image') => {
+	// 最终需要上传数据库的数据
+	let fileFullName = get_file_ext(files.name)
+	const extname = fileFullName.ext.toLowerCase()
+	let filedata = {
+		name: files.name,
+		uuid: files.uuid,
+		extname: extname || '',
+		cloudPath: files.cloudPath,
+		fileType: files.fileType,
+		url: files.path || files.path,
+		size: files.size, //单位是字节
+		image: {},
+		path: files.path,
+		video: {}
+	}
+	if (type === 'image') {
+		const imageinfo = await get_file_info(files.path)
+		delete filedata.video
+		filedata.image.width = imageinfo.width
+		filedata.image.height = imageinfo.height
+		filedata.image.location = imageinfo.path
+	} else {
+		delete filedata.image
+	}
+	return filedata
+}
diff --git a/uni_modules/uni-file-picker/package.json b/uni_modules/uni-file-picker/package.json
new file mode 100644
index 0000000..08bd66e
--- /dev/null
+++ b/uni_modules/uni-file-picker/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-file-picker",
+  "displayName": "uni-file-picker 文件选择上传",
+  "version": "1.0.2",
+  "description": "文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "图片上传",
+    "文件上传"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "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-file-picker/readme.md b/uni_modules/uni-file-picker/readme.md
new file mode 100644
index 0000000..c8399a5
--- /dev/null
+++ b/uni_modules/uni-file-picker/readme.md
@@ -0,0 +1,11 @@
+
+## FilePicker 文件选择上传
+
+> **组件名：uni-file-picker**
+>  代码块： `uFilePicker`
+
+
+文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-file-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-forms/changelog.md b/uni_modules/uni-forms/changelog.md
new file mode 100644
index 0000000..5a4bb79
--- /dev/null
+++ b/uni_modules/uni-forms/changelog.md
@@ -0,0 +1,86 @@
+## 1.4.6（2022-07-13）
+- 修复 model 需要校验的值没有声明对应字段时，导致第一次不触发校验的bug
+## 1.4.5（2022-07-05）
+- 新增 更多表单示例
+- 优化 子表单组件过期提示的问题
+- 优化 子表单组件uni-datetime-picker、uni-data-select、uni-data-picker的显示样式
+## 1.4.4（2022-07-04）
+- 更新 删除组件日志
+## 1.4.3（2022-07-04）
+- 修复 由 1.4.0 引发的 label 插槽不生效的bug
+## 1.4.2（2022-07-04）
+- 修复 子组件找不到 setValue 报错的bug
+## 1.4.1（2022-07-04）
+- 修复 uni-data-picker 在 uni-forms-item 中报错的bug
+- 修复 uni-data-picker 在 uni-forms-item 中宽度不正确的bug
+## 1.4.0（2022-06-30）
+- 【重要】组件逻辑重构，部分用法用旧版本不兼容，请注意兼容问题
+- 【重要】组件使用 Provide/Inject 方式注入依赖，提供了自定义表单组件调用 uni-forms 校验表单的能力
+- 新增 model 属性，等同于原 value/modelValue 属性，旧属性即将废弃
+- 新增 validateTrigger 属性的 blur 值，仅 uni-easyinput 生效
+- 新增 onFieldChange 方法，可以对子表单进行校验，可替代binddata方法
+- 新增 子表单的 setRules 方法，配合自定义校验函数使用
+- 新增 uni-forms-item 的 setRules 方法，配置动态表单使用可动态更新校验规则
+- 优化 动态表单校验方式，废弃拼接name的方式
+## 1.3.3（2022-06-22）
+- 修复 表单校验顺序无序问题
+## 1.3.2（2021-12-09）
+-
+## 1.3.1（2021-11-19）
+- 修复 label 插槽不生效的bug
+## 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-forms](https://uniapp.dcloud.io/component/uniui/uni-forms)
+## 1.2.7（2021-08-13）
+- 修复 没有添加校验规则的字段依然报错的Bug
+## 1.2.6（2021-08-11）
+- 修复 重置表单错误信息无法清除的问题
+## 1.2.5（2021-08-11）
+- 优化 组件文档
+## 1.2.4（2021-08-11）
+- 修复 表单验证只生效一次的问题
+## 1.2.3（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.2.2（2021-07-26）
+- 修复 vue2 下条件编译导致destroyed生命周期失效的Bug
+- 修复 1.2.1 引起的示例在小程序平台报错的Bug
+## 1.2.1（2021-07-22）
+- 修复 动态校验表单，默认值为空的情况下校验失效的Bug
+- 修复 不指定name属性时，运行报错的Bug
+- 优化 label默认宽度从65调整至70，使required为true且四字时不换行
+- 优化 组件示例，新增动态校验示例代码
+- 优化 组件文档，使用方式更清晰
+## 1.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.2（2021-06-25）
+- 修复 pattern 属性在微信小程序平台无效的问题
+## 1.1.1（2021-06-22）
+- 修复 validate-trigger属性为submit且err-show-type属性为toast时不能弹出的Bug
+## 1.1.0（2021-06-22）
+- 修复 只写setRules方法而导致校验不生效的Bug
+- 修复 由上个办法引发的错误提示文字错位的Bug
+## 1.0.48（2021-06-21）
+- 修复 不设置 label 属性 ，无法设置label插槽的问题
+## 1.0.47（2021-06-21）
+- 修复 不设置label属性，label-width属性不生效的bug
+- 修复 setRules 方法与rules属性冲突的问题
+## 1.0.46（2021-06-04）
+- 修复 动态删减数据导致报错的问题
+## 1.0.45（2021-06-04）
+- 新增 modelValue 属性 ，value 即将废弃
+## 1.0.44（2021-06-02）
+- 新增 uni-forms-item 可以设置单独的 rules
+- 新增 validate 事件增加 keepitem 参数，可以选择那些字段不过滤
+- 优化 submit 事件重命名为 validate
+## 1.0.43（2021-05-12）
+- 新增 组件示例地址
+## 1.0.42（2021-04-30）
+- 修复 自定义检验器失效的问题
+## 1.0.41（2021-03-05）
+- 更新 校验器
+- 修复 表单规则设置类型为 number 的情况下，值为0校验失败的Bug
+## 1.0.40（2021-03-04）
+- 修复 动态显示uni-forms-item的情况下，submit 方法获取值错误的Bug
+## 1.0.39（2021-02-05）
+- 调整为uni_modules目录规范
+- 修复 校验器传入 int 等类型 ，返回String类型的Bug
diff --git a/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue b/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
new file mode 100644
index 0000000..250ed87
--- /dev/null
+++ b/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
@@ -0,0 +1,627 @@
+<template>
+	<view class="uni-forms-item"
+		:class="['is-direction-' + localLabelPos ,border?'uni-forms-item--border':'' ,border && isFirstBorder?'is-first-border':'']">
+		<slot name="label">
+			<view class="uni-forms-item__label" :class="{'no-label':!label && !isRequired}"
+				:style="{width:localLabelWidth,justifyContent: localLabelAlign}">
+				<text v-if="isRequired" class="is-required">*</text>
+				<text>{{label}}</text>
+			</view>
+		</slot>
+		<!-- #ifndef APP-NVUE -->
+		<view class="uni-forms-item__content">
+			<slot></slot>
+			<view class="uni-forms-item__error" :class="{'msg--active':msg}">
+				<text>{{msg}}</text>
+			</view>
+		</view>
+		<!-- #endif -->
+		<!-- #ifdef APP-NVUE -->
+		<view class="uni-forms-item__nuve-content">
+			<view class="uni-forms-item__content">
+				<slot></slot>
+			</view>
+			<view class="uni-forms-item__error" :class="{'msg--active':msg}">
+				<text class="error-text">{{msg}}</text>
+			</view>
+		</view>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	/**
+	 * uni-fomrs-item 表单子组件
+	 * @description uni-fomrs-item 表单子组件，提供了基础布局已经校验能力
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=2773
+	 * @property {Boolean} required 是否必填，左边显示红色"*"号
+	 * @property {String } 	label 				输入框左边的文字提示
+	 * @property {Number } 	labelWidth 			label的宽度，单位px（默认65）
+	 * @property {String } 	labelAlign = [left|center|right] label的文字对齐方式（默认left）
+	 * 	@value left		label 左侧显示
+	 * 	@value center	label 居中
+	 * 	@value right	label 右侧对齐
+	 * @property {String } 	errorMessage 		显示的错误提示内容，如果为空字符串或者false，则不显示错误信息
+	 * @property {String } 	name 				表单域的属性名，在使用校验规则时必填
+	 * @property {String } 	leftIcon 			【1.4.0废弃】label左边的图标，限 uni-ui 的图标名称
+	 * @property {String } 	iconColor 		【1.4.0废弃】左边通过icon配置的图标的颜色（默认#606266）
+	 * @property {String} validateTrigger = [bind|submit|blur]	【1.4.0废弃】校验触发器方式 默认 submit
+	 * 	@value bind 	发生变化时触发
+	 * 	@value submit 提交时触发
+	 * 	@value blur 	失去焦点触发
+	 * @property {String } 	labelPosition = [top|left] 【1.4.0废弃】label的文字的位置（默认left）
+	 * 	@value top	顶部显示 label
+	 * 	@value left	左侧显示 label
+	 */
+
+	export default {
+		name: 'uniFormsItem',
+		options: {
+			virtualHost: true
+		},
+		provide() {
+			return {
+				uniFormItem: this
+			}
+		},
+		inject: {
+			form: {
+				from: 'uniForm',
+				default: null
+			},
+		},
+		props: {
+			// 表单校验规则
+			rules: {
+				type: Array,
+				default () {
+					return null;
+				}
+			},
+			// 表单域的属性名，在使用校验规则时必填
+			name: {
+				type: [String, Array],
+				default: ''
+			},
+			required: {
+				type: Boolean,
+				default: false
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			// label的宽度 ，默认 80
+			labelWidth: {
+				type: [String, Number],
+				default: ''
+			},
+			// label 居中方式，默认 left 取值 left/center/right
+			labelAlign: {
+				type: String,
+				default: ''
+			},
+			// 强制显示错误信息
+			errorMessage: {
+				type: [String, Boolean],
+				default: ''
+			},
+			// 1.4.0 弃用，统一使用 form 的校验时机
+			// validateTrigger: {
+			// 	type: String,
+			// 	default: ''
+			// },
+			// 1.4.0 弃用，统一使用 form 的label 位置
+			// labelPosition: {
+			// 	type: String,
+			// 	default: ''
+			// },
+			// 1.4.0 以下属性已经废弃，请使用  #label 插槽代替
+			leftIcon: String,
+			iconColor: {
+				type: String,
+				default: '#606266'
+			},
+		},
+		data() {
+			return {
+				errMsg: '',
+				isRequired: false,
+				userRules: null,
+				localLabelAlign: 'left',
+				localLabelWidth: '65px',
+				localLabelPos: 'left',
+				border: false,
+				isFirstBorder: false,
+			};
+		},
+		computed: {
+			// 处理错误信息
+			msg() {
+				return this.errorMessage || this.errMsg;
+			}
+		},
+		watch: {
+			// 规则发生变化通知子组件更新
+			'form.formRules'(val) {
+				// TODO 处理头条vue3 watch不生效的问题
+				// #ifndef MP-TOUTIAO
+				this.init()
+				// #endif
+			},
+			'form.labelWidth'(val) {
+				// 宽度
+				this.localLabelWidth = this._labelWidthUnit(val)
+
+			},
+			'form.labelPosition'(val) {
+				// 标签位置
+				this.localLabelPos = this._labelPosition()
+			},
+			'form.labelAlign'(val) {
+
+			}
+		},
+		created() {
+			this.init(true)
+			if (this.name && this.form) {
+				// TODO 处理头条vue3 watch不生效的问题
+				// #ifdef MP-TOUTIAO
+				this.$watch('form.formRules', () => {
+					this.init()
+				})
+				// #endif
+
+				// 监听变化
+				this.$watch(
+					() => {
+						const val = this.form._getDataValue(this.name, this.form.localData)
+						return val
+					},
+					(value, oldVal) => {
+						const isEqual = this.form._isEqual(value, oldVal)
+						// 简单判断前后值的变化，只有发生变化才会发生校验
+						// TODO  如果 oldVal = undefined ，那么大概率是源数据里没有值导致 ，这个情况不哦校验 ,可能不严谨 ，需要在做观察
+						// fix by mehaotian 暂时取消 && oldVal !== undefined ，如果formData 中不存在，可能会不校验
+						if (!isEqual) {
+							const val = this.itemSetValue(value)
+							this.onFieldChange(val, false)
+						}
+					}, {
+						immediate: false
+					}
+				);
+			}
+
+		},
+		// #ifndef VUE3
+		destroyed() {
+			if (this.__isUnmounted) return
+			this.unInit()
+		},
+		// #endif
+		// #ifdef VUE3
+		unmounted() {
+			this.__isUnmounted = true
+			this.unInit()
+		},
+		// #endif
+		methods: {
+			/**
+			 * 外部调用方法
+			 * 设置规则 ，主要用于小程序自定义检验规则
+			 * @param {Array} rules 规则源数据
+			 */
+			setRules(rules = null) {
+				this.userRules = rules
+				this.init(false)
+			},
+			// 兼容老版本表单组件
+			setValue() {
+				// console.log('setValue 方法已经弃用，请使用最新版本的 uni-forms 表单组件以及其他关联组件。');
+			},
+			/**
+			 * 外部调用方法
+			 * 校验数据
+			 * @param {any} value 需要校验的数据
+			 * @param {boolean} 是否立即校验
+			 * @return {Array|null} 校验内容
+			 */
+			async onFieldChange(value, formtrigger = true) {
+				const {
+					formData,
+					localData,
+					errShowType,
+					validateCheck,
+					validateTrigger,
+					_isRequiredField,
+					_realName
+				} = this.form
+				const name = _realName(this.name)
+				if (!value) {
+					value = this.form.formData[name]
+				}
+				// fixd by mehaotian 不在校验前清空信息，解决闪屏的问题
+				// this.errMsg = '';
+
+				// fix by mehaotian 解决没有检验规则的情况下，抛出错误的问题
+				const ruleLen = this.itemRules.rules && this.itemRules.rules.length
+				if (!this.validator || !ruleLen || ruleLen === 0) return;
+
+				// 检验时机
+				// let trigger = this.isTrigger(this.itemRules.validateTrigger, this.validateTrigger, validateTrigger);
+				const isRequiredField = _isRequiredField(this.itemRules.rules || []);
+				let result = null;
+				// 只有等于 bind 时 ，才能开启时实校验
+				if (validateTrigger === 'bind' || formtrigger) {
+					// 校验当前表单项
+					result = await this.validator.validateUpdate({
+							[name]: value
+						},
+						formData
+					);
+
+					// 判断是否必填,非必填，不填不校验，填写才校验 ,暂时只处理 undefined  和空的情况
+					if (!isRequiredField && (value === undefined || value === '')) {
+						result = null;
+					}
+
+					// 判断错误信息显示类型
+					if (result && result.errorMessage) {
+						if (errShowType === 'undertext') {
+							// 获取错误信息
+							this.errMsg = !result ? '' : result.errorMessage;
+						}
+						if (errShowType === 'toast') {
+							uni.showToast({
+								title: result.errorMessage || '校验错误',
+								icon: 'none'
+							});
+						}
+						if (errShowType === 'modal') {
+							uni.showModal({
+								title: '提示',
+								content: result.errorMessage || '校验错误'
+							});
+						}
+					} else {
+						this.errMsg = ''
+					}
+					// 通知 form 组件更新事件
+					validateCheck(result ? result : null)
+				} else {
+					this.errMsg = ''
+				}
+				return result ? result : null;
+			},
+			/**
+			 * 初始组件数据
+			 */
+			init(type = false) {
+				const {
+					validator,
+					formRules,
+					childrens,
+					formData,
+					localData,
+					_realName,
+					labelWidth,
+					_getDataValue,
+					_setDataValue
+				} = this.form || {}
+				// 对齐方式
+				this.localLabelAlign = this._justifyContent()
+				// 宽度
+				this.localLabelWidth = this._labelWidthUnit(labelWidth)
+				// 标签位置
+				this.localLabelPos = this._labelPosition()
+				this.isRequired = this.required
+				// 将需要校验的子组件加入form 队列
+				this.form && type && childrens.push(this)
+
+				if (!validator || !formRules) return
+				// 判断第一个 item
+				if (!this.form.isFirstBorder) {
+					this.form.isFirstBorder = true;
+					this.isFirstBorder = true;
+				}
+
+				// 判断 group 里的第一个 item
+				if (this.group) {
+					if (!this.group.isFirstBorder) {
+						this.group.isFirstBorder = true;
+						this.isFirstBorder = true;
+					}
+				}
+				this.border = this.form.border;
+				// 获取子域的真实名称
+				const name = _realName(this.name)
+				const itemRule = this.userRules || this.rules
+				if (typeof formRules === 'object' && itemRule) {
+					// 子规则替换父规则
+					formRules[name] = {
+						rules: itemRule
+					}
+					validator.updateSchema(formRules);
+				}
+				// 注册校验规则
+				const itemRules = formRules[name] || {}
+				this.itemRules = itemRules
+				// 注册校验函数
+				this.validator = validator
+				// 默认值赋予
+				this.itemSetValue(_getDataValue(this.name, localData))
+				this.isRequired = this._isRequired()
+
+			},
+			unInit() {
+				if (this.form) {
+					const {
+						childrens,
+						formData,
+						_realName
+					} = this.form
+					childrens.forEach((item, index) => {
+						if (item === this) {
+							this.form.childrens.splice(index, 1)
+							delete formData[_realName(item.name)]
+						}
+					})
+				}
+			},
+			// 设置item 的值
+			itemSetValue(value) {
+				const name = this.form._realName(this.name)
+				const rules = this.itemRules.rules || []
+				const val = this.form._getValue(name, value, rules)
+				this.form._setDataValue(name, this.form.formData, val)
+				return val
+			},
+
+			/**
+			 * 移除该表单项的校验结果
+			 */
+			clearValidate() {
+				this.errMsg = '';
+			},
+
+			// 是否显示星号
+			_isRequired() {
+				if (this.form) {
+					return this.required || this.form._isRequiredField(this.itemRules.rules || [])
+				}
+				return this.required
+			},
+
+			// 处理对齐方式
+			_justifyContent() {
+				if (this.form) {
+					const {
+						labelAlign
+					} = this.form
+					let labelAli = this.labelAlign ? this.labelAlign : labelAlign;
+					if (labelAli === 'left') return 'flex-start';
+					if (labelAli === 'center') return 'center';
+					if (labelAli === 'right') return 'flex-end';
+				}
+				return 'flex-start';
+			},
+			// 处理 label宽度单位 ,继承父元素的值
+			_labelWidthUnit(labelWidth) {
+
+				// if (this.form) {
+				// 	const {
+				// 		labelWidth
+				// 	} = this.form
+				return this.num2px(this.labelWidth ? this.labelWidth : (labelWidth || (this.label ? 65 : 'auto')))
+				// }
+				// return '65px'
+			},
+			// 处理 label 位置
+			_labelPosition() {
+				if (this.form) return this.form.labelPosition || 'left'
+				return 'left'
+
+			},
+
+			/**
+			 * 触发时机
+			 * @param {Object} rule 当前规则内时机
+			 * @param {Object} itemRlue 当前组件时机
+			 * @param {Object} parentRule 父组件时机
+			 */
+			isTrigger(rule, itemRlue, parentRule) {
+				//  bind  submit
+				if (rule === 'submit' || !rule) {
+					if (rule === undefined) {
+						if (itemRlue !== 'bind') {
+							if (!itemRlue) {
+								return parentRule === '' ? 'bind' : 'submit';
+							}
+							return 'submit';
+						}
+						return 'bind';
+					}
+					return 'submit';
+				}
+				return 'bind';
+			},
+			num2px(num) {
+				if (typeof num === 'number') {
+					return `${num}px`
+				}
+				return num
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.uni-forms-item {
+		position: relative;
+		display: flex;
+		/* #ifdef APP-NVUE */
+		// 在 nvue 中，使用 margin-bottom error 信息会被隐藏
+		padding-bottom: 22px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		margin-bottom: 22px;
+		/* #endif */
+		flex-direction: row;
+
+		&__label {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			text-align: left;
+			font-size: 14px;
+			color: #606266;
+			height: 36px;
+			padding: 0 12px 0 0;
+			/* #ifndef APP-NVUE */
+			vertical-align: middle;
+			flex-shrink: 0;
+			/* #endif */
+
+			/* #ifndef APP-NVUE */
+			box-sizing: border-box;
+
+			/* #endif */
+			&.no-label {
+				padding: 0;
+			}
+		}
+
+		&__content {
+			/* #ifndef MP-TOUTIAO */
+			// display: flex;
+			// align-items: center;
+			/* #endif */
+			position: relative;
+			font-size: 14px;
+			flex: 1;
+			/* #ifndef APP-NVUE */
+			box-sizing: border-box;
+			/* #endif */
+			flex-direction: row;
+
+			/* #ifndef APP || H5 || MP-WEIXIN || APP-NVUE */
+			// TODO 因为小程序平台会多一层标签节点 ，所以需要在多余节点继承当前样式
+			&>uni-easyinput,
+			&>uni-data-picker {
+				width: 100%;
+			}
+
+			/* #endif */
+
+		}
+
+		& .uni-forms-item__nuve-content {
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+		}
+
+		&__error {
+			color: #f56c6c;
+			font-size: 12px;
+			line-height: 1;
+			padding-top: 4px;
+			position: absolute;
+			/* #ifndef APP-NVUE */
+			top: 100%;
+			left: 0;
+			transition: transform 0.3s;
+			transform: translateY(-100%);
+			/* #endif */
+			/* #ifdef APP-NVUE */
+			bottom: 5px;
+			/* #endif */
+
+			opacity: 0;
+
+			.error-text {
+				// 只有 nvue 下这个样式才生效
+				color: #f56c6c;
+				font-size: 12px;
+			}
+
+			&.msg--active {
+				opacity: 1;
+				transform: translateY(0%);
+			}
+		}
+
+		// 位置修饰样式
+		&.is-direction-left {
+			flex-direction: row;
+		}
+
+		&.is-direction-top {
+			flex-direction: column;
+
+			.uni-forms-item__label {
+				padding: 0 0 8px;
+				line-height: 1.5715;
+				text-align: left;
+				/* #ifndef APP-NVUE */
+				white-space: initial;
+				/* #endif */
+			}
+		}
+
+		.is-required {
+			// color: $uni-color-error;
+			color: #dd524d;
+			font-weight: bold;
+		}
+	}
+
+
+	.uni-forms-item--border {
+		margin-bottom: 0;
+		padding: 10px 0;
+		// padding-bottom: 0;
+		border-top: 1px #eee solid;
+
+		/* #ifndef APP-NVUE */
+		.uni-forms-item__content {
+			flex-direction: column;
+			justify-content: flex-start;
+			align-items: flex-start;
+
+			.uni-forms-item__error {
+				position: relative;
+				top: 5px;
+				left: 0;
+				padding-top: 0;
+			}
+		}
+
+		/* #endif */
+
+		/* #ifdef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+
+		.uni-forms-item__error {
+			position: relative;
+			top: 0px;
+			left: 0;
+			padding-top: 0;
+			margin-top: 5px;
+		}
+
+		/* #endif */
+
+	}
+
+	.is-first-border {
+		/* #ifndef APP-NVUE */
+		border: none;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		border-width: 0;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-forms/components/uni-forms/uni-forms.vue b/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
new file mode 100644
index 0000000..ed2f6d9
--- /dev/null
+++ b/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
@@ -0,0 +1,397 @@
+<template>
+	<view class="uni-forms">
+		<form>
+			<slot></slot>
+		</form>
+	</view>
+</template>
+
+<script>
+	import Validator from './validate.js';
+	import {
+		deepCopy,
+		getValue,
+		isRequiredField,
+		setDataValue,
+		getDataValue,
+		realName,
+		isRealName,
+		rawData,
+		isEqual
+	} from './utils.js'
+
+	// #ifndef VUE3
+	// 后续会慢慢废弃这个方法
+	import Vue from 'vue';
+	Vue.prototype.binddata = function(name, value, formName) {
+		if (formName) {
+			this.$refs[formName].setValue(name, value);
+		} else {
+			let formVm;
+			for (let i in this.$refs) {
+				const vm = this.$refs[i];
+				if (vm && vm.$options && vm.$options.name === 'uniForms') {
+					formVm = vm;
+					break;
+				}
+			}
+			if (!formVm) return console.error('当前 uni-froms 组件缺少 ref 属性');
+			formVm.setValue(name, value);
+		}
+	};
+	// #endif
+	/**
+	 * Forms 表单
+	 * @description 由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=2773
+	 * @property {Object} rules	表单校验规则
+	 * @property {String} validateTrigger = [bind|submit|blur]	校验触发器方式 默认 submit
+	 * @value bind		发生变化时触发
+	 * @value submit	提交时触发
+	 * @value blur	  失去焦点时触发
+	 * @property {String} labelPosition = [top|left]	label 位置 默认 left
+	 * @value top		顶部显示 label
+	 * @value left	左侧显示 label
+	 * @property {String} labelWidth	label 宽度，默认 65px
+	 * @property {String} labelAlign = [left|center|right]	label 居中方式  默认 left
+	 * @value left		label 左侧显示
+	 * @value center	label 居中
+	 * @value right		label 右侧对齐
+	 * @property {String} errShowType = [undertext|toast|modal]	校验错误信息提示方式
+	 * @value undertext	错误信息在底部显示
+	 * @value toast			错误信息toast显示
+	 * @value modal			错误信息modal显示
+	 * @event {Function} submit	提交时触发
+	 * @event {Function} validate	校验结果发生变化触发
+	 */
+	export default {
+		name: 'uniForms',
+		emits: ['validate', 'submit'],
+		options: {
+			virtualHost: true
+		},
+		props: {
+			// 即将弃用
+			value: {
+				type: Object,
+				default () {
+					return null;
+				}
+			},
+			// vue3 替换 value 属性
+			modelValue: {
+				type: Object,
+				default () {
+					return null;
+				}
+			},
+			// 1.4.0 开始将不支持 v-model ，且废弃 value 和 modelValue
+			model: {
+				type: Object,
+				default () {
+					return null;
+				}
+			},
+			// 表单校验规则
+			rules: {
+				type: Object,
+				default () {
+					return {};
+				}
+			},
+			//校验错误信息提示方式 默认 undertext 取值 [undertext|toast|modal]
+			errShowType: {
+				type: String,
+				default: 'undertext'
+			},
+			// 校验触发器方式 默认 bind 取值 [bind|submit]
+			validateTrigger: {
+				type: String,
+				default: 'submit'
+			},
+			// label 位置，默认 left 取值  top/left
+			labelPosition: {
+				type: String,
+				default: 'left'
+			},
+			// label 宽度
+			labelWidth: {
+				type: [String, Number],
+				default: ''
+			},
+			// label 居中方式，默认 left 取值 left/center/right
+			labelAlign: {
+				type: String,
+				default: 'left'
+			},
+			border: {
+				type: Boolean,
+				default: false
+			}
+		},
+		provide() {
+			return {
+				uniForm: this
+			}
+		},
+		data() {
+			return {
+				// 表单本地值的记录，不应该与传如的值进行关联
+				formData: {},
+				formRules: {}
+			};
+		},
+		computed: {
+			// 计算数据源变化的
+			localData() {
+				const localVal = this.model || this.modelValue || this.value
+				if (localVal) {
+					return deepCopy(localVal)
+				}
+				return {}
+			}
+		},
+		watch: {
+			// 监听数据变化 ,暂时不使用，需要单独赋值
+			// localData: {},
+			// 监听规则变化
+			rules: {
+				handler: function(val, oldVal) {
+					this.setRules(val)
+				},
+				deep: true,
+				immediate: true
+			}
+		},
+		created() {
+			// #ifdef VUE3
+			let getbinddata = getApp().$vm.$.appContext.config.globalProperties.binddata
+			if (!getbinddata) {
+				getApp().$vm.$.appContext.config.globalProperties.binddata = function(name, value, formName) {
+					if (formName) {
+						this.$refs[formName].setValue(name, value);
+					} else {
+						let formVm;
+						for (let i in this.$refs) {
+							const vm = this.$refs[i];
+							if (vm && vm.$options && vm.$options.name === 'uniForms') {
+								formVm = vm;
+								break;
+							}
+						}
+						if (!formVm) return console.error('当前 uni-froms 组件缺少 ref 属性');
+						formVm.setValue(name, value);
+					}
+				}
+			}
+			// #endif
+
+			// 子组件实例数组
+			this.childrens = []
+			// TODO 兼容旧版 uni-data-picker ,新版本中无效，只是避免报错
+			this.inputChildrens = []
+			this.setRules(this.rules)
+		},
+		methods: {
+			/**
+			 * 外部调用方法
+			 * 设置规则 ，主要用于小程序自定义检验规则
+			 * @param {Array} rules 规则源数据
+			 */
+			setRules(rules) {
+				// TODO 有可能子组件合并规则的时机比这个要早，所以需要合并对象 ，而不是直接赋值，可能会被覆盖
+				this.formRules = Object.assign({}, this.formRules, rules)
+				// 初始化校验函数
+				this.validator = new Validator(rules);
+			},
+
+			/**
+			 * 外部调用方法
+			 * 设置数据，用于设置表单数据，公开给用户使用 ， 不支持在动态表单中使用
+			 * @param {Object} key
+			 * @param {Object} value
+			 */
+			setValue(key, value) {
+				let example = this.childrens.find(child => child.name === key);
+				if (!example) return null;
+				this.formData[key] = getValue(key, value, (this.formRules[key] && this.formRules[key].rules) || [])
+				return example.onFieldChange(this.formData[key]);
+			},
+
+			/**
+			 * 外部调用方法
+			 * 手动提交校验表单
+			 * 对整个表单进行校验的方法，参数为一个回调函数。
+			 * @param {Array} keepitem 保留不参与校验的字段
+			 * @param {type} callback 方法回调
+			 */
+			validate(keepitem, callback) {
+				return this.checkAll(this.formData, keepitem, callback);
+			},
+
+			/**
+			 * 外部调用方法
+			 * 部分表单校验
+			 * @param {Array|String} props 需要校验的字段
+			 * @param {Function} 回调函数
+			 */
+			validateField(props = [], callback) {
+				props = [].concat(props);
+				let invalidFields = {};
+				this.childrens.forEach(item => {
+					const name = realName(item.name)
+					if (props.indexOf(name) !== -1) {
+						invalidFields = Object.assign({}, invalidFields, {
+							[name]: this.formData[name]
+						});
+					}
+				});
+				return this.checkAll(invalidFields, [], callback);
+			},
+
+			/**
+			 * 外部调用方法
+			 * 移除表单项的校验结果。传入待移除的表单项的 prop 属性或者 prop 组成的数组，如不传则移除整个表单的校验结果
+			 * @param {Array|String} props 需要移除校验的字段 ，不填为所有
+			 */
+			clearValidate(props = []) {
+				props = [].concat(props);
+				this.childrens.forEach(item => {
+					if (props.length === 0) {
+						item.errMsg = '';
+					} else {
+						const name = realName(item.name)
+						if (props.indexOf(name) !== -1) {
+							item.errMsg = '';
+						}
+					}
+				});
+			},
+
+			/**
+			 * 外部调用方法 ，即将废弃
+			 * 手动提交校验表单
+			 * 对整个表单进行校验的方法，参数为一个回调函数。
+			 * @param {Array} keepitem 保留不参与校验的字段
+			 * @param {type} callback 方法回调
+			 */
+			submit(keepitem, callback, type) {
+				for (let i in this.dataValue) {
+					const itemData = this.childrens.find(v => v.name === i);
+					if (itemData) {
+						if (this.formData[i] === undefined) {
+							this.formData[i] = this._getValue(i, this.dataValue[i]);
+						}
+					}
+				}
+
+				if (!type) {
+					console.warn('submit 方法即将废弃，请使用validate方法代替！');
+				}
+
+				return this.checkAll(this.formData, keepitem, callback, 'submit');
+			},
+
+			// 校验所有
+			async checkAll(invalidFields, keepitem, callback, type) {
+				// 不存在校验规则 ，则停止校验流程
+				if (!this.validator) return
+				let childrens = []
+				// 处理参与校验的item实例
+				for (let i in invalidFields) {
+					const item = this.childrens.find(v => realName(v.name) === i)
+					if (item) {
+						childrens.push(item)
+					}
+				}
+
+				// 如果validate第一个参数是funciont ,那就走回调
+				if (!callback && typeof keepitem === 'function') {
+					callback = keepitem;
+				}
+
+				let promise;
+				// 如果不存在回调，那么使用 Promise 方式返回
+				if (!callback && typeof callback !== 'function' && Promise) {
+					promise = new Promise((resolve, reject) => {
+						callback = function(valid, invalidFields) {
+							!valid ? resolve(invalidFields) : reject(valid);
+						};
+					});
+				}
+
+				let results = [];
+				// 避免引用错乱 ，建议拷贝对象处理
+				let tempFormData = JSON.parse(JSON.stringify(invalidFields))
+				// 所有子组件参与校验,使用 for 可以使用  awiat
+				for (let i in childrens) {
+					const child = childrens[i]
+					let name = realName(child.name);
+					const result = await child.onFieldChange(tempFormData[name]);
+					if (result) {
+						results.push(result);
+						// toast ,modal 只需要执行第一次就可以
+						if (this.errShowType === 'toast' || this.errShowType === 'modal') break;
+					}
+				}
+
+
+				if (Array.isArray(results)) {
+					if (results.length === 0) results = null;
+				}
+				if (Array.isArray(keepitem)) {
+					keepitem.forEach(v => {
+						let vName = realName(v);
+						let value = getDataValue(v, this.localData)
+						if (value !== undefined) {
+							tempFormData[vName] = value
+						}
+					});
+				}
+
+				// TODO submit 即将废弃
+				if (type === 'submit') {
+					this.$emit('submit', {
+						detail: {
+							value: tempFormData,
+							errors: results
+						}
+					});
+				} else {
+					this.$emit('validate', results);
+				}
+
+				// const resetFormData = rawData(tempFormData, this.localData, this.name)
+				let resetFormData = {}
+				resetFormData = rawData(tempFormData, this.name)
+				callback && typeof callback === 'function' && callback(results, resetFormData);
+
+				if (promise && callback) {
+					return promise;
+				} else {
+					return null;
+				}
+
+			},
+
+			/**
+			 * 返回validate事件
+			 * @param {Object} result
+			 */
+			validateCheck(result) {
+				this.$emit('validate', result);
+			},
+			_getValue: getValue,
+			_isRequiredField: isRequiredField,
+			_setDataValue: setDataValue,
+			_getDataValue: getDataValue,
+			_realName: realName,
+			_isRealName: isRealName,
+			_isEqual: isEqual
+		}
+	};
+</script>
+
+<style lang="scss">
+	.uni-forms {}
+</style>
diff --git a/uni_modules/uni-forms/components/uni-forms/utils.js b/uni_modules/uni-forms/components/uni-forms/utils.js
new file mode 100644
index 0000000..6da2421
--- /dev/null
+++ b/uni_modules/uni-forms/components/uni-forms/utils.js
@@ -0,0 +1,293 @@
+/**
+ * 简单处理对象拷贝
+ * @param {Obejct} 被拷贝对象
+ * @@return {Object} 拷贝对象
+ */
+export const deepCopy = (val) => {
+	return JSON.parse(JSON.stringify(val))
+}
+/**
+ * 过滤数字类型
+ * @param {String} format 数字类型
+ * @@return {Boolean} 返回是否为数字类型
+ */
+export const typeFilter = (format) => {
+	return format === 'int' || format === 'double' || format === 'number' || format === 'timestamp';
+}
+
+/**
+ * 把 value 转换成指定的类型，用于处理初始值，原因是初始值需要入库不能为 undefined
+ * @param {String} key 字段名
+ * @param {any} value 字段值
+ * @param {Object} rules 表单校验规则
+ */
+export const getValue = (key, value, rules) => {
+	const isRuleNumType = rules.find(val => val.format && typeFilter(val.format));
+	const isRuleBoolType = rules.find(val => (val.format && val.format === 'boolean') || val.format === 'bool');
+	// 输入类型为 number
+	if (!!isRuleNumType) {
+		if (!value && value !== 0) {
+			value = null
+		} else {
+			value = isNumber(Number(value)) ? Number(value) : value
+		}
+	}
+
+	// 输入类型为 boolean
+	if (!!isRuleBoolType) {
+		value = isBoolean(value) ? value : false
+	}
+
+	return value;
+}
+
+/**
+ * 获取表单数据
+ * @param {String|Array} name 真实名称，需要使用 realName 获取
+ * @param {Object} data 原始数据
+ * @param {any} value  需要设置的值
+ */
+export const setDataValue = (field, formdata, value) => {
+	formdata[field] = value
+	return value || ''
+}
+
+/**
+ * 获取表单数据
+ * @param {String|Array} field 真实名称，需要使用 realName 获取
+ * @param {Object} data 原始数据
+ */
+export const getDataValue = (field, data) => {
+	return objGet(data, field)
+}
+
+/**
+ * 获取表单类型
+ * @param {String|Array} field 真实名称，需要使用 realName 获取
+ */
+export const getDataValueType = (field, data) => {
+	const value = getDataValue(field, data)
+	return {
+		type: type(value),
+		value
+	}
+}
+
+/**
+ * 获取表单可用的真实name
+ * @param {String|Array} name 表单name
+ * @@return {String} 表单可用的真实name
+ */
+export const realName = (name, data = {}) => {
+	const base_name = _basePath(name)
+	if (typeof base_name === 'object' && Array.isArray(base_name) && base_name.length > 1) {
+		const realname = base_name.reduce((a, b) => a += `#${b}`, '_formdata_')
+		return realname
+	}
+	return base_name[0] || name
+}
+
+/**
+ * 判断是否表单可用的真实name
+ * @param {String|Array} name 表单name
+ * @@return {String} 表单可用的真实name
+ */
+export const isRealName = (name) => {
+	const reg = /^_formdata_#*/
+	return reg.test(name)
+}
+
+/**
+ * 获取表单数据的原始格式
+ * @@return {Object|Array} object 需要解析的数据
+ */
+export const rawData = (object = {}, name) => {
+	let newData = JSON.parse(JSON.stringify(object))
+	let formData = {}
+	for(let i in newData){
+		let path = name2arr(i)
+		objSet(formData,path,newData[i])
+	}
+	return formData
+}
+
+/**
+ * 真实name还原为 array
+ * @param {*} name 
+ */
+export const name2arr = (name) => {
+	let field = name.replace('_formdata_#', '')
+	field = field.split('#').map(v => (isNumber(v) ? Number(v) : v))
+	return field
+}
+
+/**
+ * 对象中设置值
+ * @param {Object|Array} object 源数据
+ * @param {String| Array} path 'a.b.c' 或 ['a',0,'b','c']
+ * @param {String} value 需要设置的值
+ */
+export const objSet = (object, path, value) => {
+	if (typeof object !== 'object') return object;
+	_basePath(path).reduce((o, k, i, _) => {
+		if (i === _.length - 1) { 
+			// 若遍历结束直接赋值
+			o[k] = value
+			return null
+		} else if (k in o) { 
+			// 若存在对应路径，则返回找到的对象，进行下一次遍历
+			return o[k]
+		} else { 
+			// 若不存在对应路径，则创建对应对象，若下一路径是数字，新对象赋值为空数组，否则赋值为空对象
+			o[k] = /^[0-9]{1,}$/.test(_[i + 1]) ? [] : {}
+			return o[k]
+		}
+	}, object)
+	// 返回object
+	return object;
+}
+
+// 处理 path， path有三种形式：'a[0].b.c'、'a.0.b.c' 和 ['a','0','b','c']，需要统一处理成数组，便于后续使用
+function _basePath(path) {
+	// 若是数组，则直接返回
+	if (Array.isArray(path)) return path
+	// 若有 '[',']'，则替换成将 '[' 替换成 '.',去掉 ']'
+	return path.replace(/\[/g, '.').replace(/\]/g, '').split('.')
+}
+
+/**
+ * 从对象中获取值
+ * @param {Object|Array} object 源数据
+ * @param {String| Array} path 'a.b.c' 或 ['a',0,'b','c']
+ * @param {String} defaultVal 如果无法从调用链中获取值的默认值
+ */
+export const objGet = (object, path, defaultVal = 'undefined') => {
+	// 先将path处理成统一格式
+	let newPath = _basePath(path)
+	// 递归处理，返回最后结果
+	let val = newPath.reduce((o, k) => {
+		return (o || {})[k]
+	}, object);
+	return !val || val !== undefined ? val : defaultVal
+}
+
+
+/**
+ * 是否为 number 类型 
+ * @param {any} num 需要判断的值
+ * @return {Boolean} 是否为 number
+ */
+export const isNumber = (num) => {
+	return !isNaN(Number(num))
+}
+
+/**
+ * 是否为 boolean 类型 
+ * @param {any} bool 需要判断的值
+ * @return {Boolean} 是否为 boolean
+ */
+export const isBoolean = (bool) => {
+	return (typeof bool === 'boolean')
+}
+/**
+ * 是否有必填字段
+ * @param {Object} rules 规则
+ * @return {Boolean} 是否有必填字段
+ */
+export const isRequiredField = (rules) => {
+	let isNoField = false;
+	for (let i = 0; i < rules.length; i++) {
+		const ruleData = rules[i];
+		if (ruleData.required) {
+			isNoField = true;
+			break;
+		}
+	}
+	return isNoField;
+}
+
+
+/**
+ * 获取数据类型
+ * @param {Any} obj 需要获取数据类型的值
+ */
+export const type = (obj) => {
+	var class2type = {};
+
+	// 生成class2type映射
+	"Boolean Number String Function Array Date RegExp Object Error".split(" ").map(function(item, index) {
+		class2type["[object " + item + "]"] = item.toLowerCase();
+	})
+	if (obj == null) {
+		return obj + "";
+	}
+	return typeof obj === "object" || typeof obj === "function" ?
+		class2type[Object.prototype.toString.call(obj)] || "object" :
+		typeof obj;
+}
+
+/**
+ * 判断两个值是否相等
+ * @param {any} a 值  
+ * @param {any} b 值  
+ * @return {Boolean} 是否相等
+ */
+export const isEqual = (a, b) => {
+	//如果a和b本来就全等
+	if (a === b) {
+		//判断是否为0和-0
+		return a !== 0 || 1 / a === 1 / b;
+	}
+	//判断是否为null和undefined
+	if (a == null || b == null) {
+		return a === b;
+	}
+	//接下来判断a和b的数据类型
+	var classNameA = toString.call(a),
+		classNameB = toString.call(b);
+	//如果数据类型不相等，则返回false
+	if (classNameA !== classNameB) {
+		return false;
+	}
+	//如果数据类型相等，再根据不同数据类型分别判断
+	switch (classNameA) {
+		case '[object RegExp]':
+		case '[object String]':
+			//进行字符串转换比较
+			return '' + a === '' + b;
+		case '[object Number]':
+			//进行数字转换比较,判断是否为NaN
+			if (+a !== +a) {
+				return +b !== +b;
+			}
+			//判断是否为0或-0
+			return +a === 0 ? 1 / +a === 1 / b : +a === +b;
+		case '[object Date]':
+		case '[object Boolean]':
+			return +a === +b;
+	}
+	//如果是对象类型
+	if (classNameA == '[object Object]') {
+		//获取a和b的属性长度
+		var propsA = Object.getOwnPropertyNames(a),
+			propsB = Object.getOwnPropertyNames(b);
+		if (propsA.length != propsB.length) {
+			return false;
+		}
+		for (var i = 0; i < propsA.length; i++) {
+			var propName = propsA[i];
+			//如果对应属性对应值不相等，则返回false
+			if (a[propName] !== b[propName]) {
+				return false;
+			}
+		}
+		return true;
+	}
+	//如果是数组类型
+	if (classNameA == '[object Array]') {
+		if (a.toString() == b.toString()) {
+			return true;
+		}
+		return false;
+	}
+}
diff --git a/uni_modules/uni-forms/components/uni-forms/validate.js b/uni_modules/uni-forms/components/uni-forms/validate.js
new file mode 100644
index 0000000..69a70db
--- /dev/null
+++ b/uni_modules/uni-forms/components/uni-forms/validate.js
@@ -0,0 +1,486 @@
+var pattern = {
+	email: /^\S+?@\S+?\.\S+?$/,
+	idcard: /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+	url: new RegExp(
+		"^(?!mailto:)(?:(?:http|https|ftp)://|//)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$",
+		'i')
+};
+
+const FORMAT_MAPPING = {
+	"int": 'integer',
+	"bool": 'boolean',
+	"double": 'number',
+	"long": 'number',
+	"password": 'string'
+	// "fileurls": 'array'
+}
+
+function formatMessage(args, resources = '') {
+	var defaultMessage = ['label']
+	defaultMessage.forEach((item) => {
+		if (args[item] === undefined) {
+			args[item] = ''
+		}
+	})
+
+	let str = resources
+	for (let key in args) {
+		let reg = new RegExp('{' + key + '}')
+		str = str.replace(reg, args[key])
+	}
+	return str
+}
+
+function isEmptyValue(value, type) {
+	if (value === undefined || value === null) {
+		return true;
+	}
+
+	if (typeof value === 'string' && !value) {
+		return true;
+	}
+
+	if (Array.isArray(value) && !value.length) {
+		return true;
+	}
+
+	if (type === 'object' && !Object.keys(value).length) {
+		return true;
+	}
+
+	return false;
+}
+
+const types = {
+	integer(value) {
+		return types.number(value) && parseInt(value, 10) === value;
+	},
+	string(value) {
+		return typeof value === 'string';
+	},
+	number(value) {
+		if (isNaN(value)) {
+			return false;
+		}
+		return typeof value === 'number';
+	},
+	"boolean": function(value) {
+		return typeof value === 'boolean';
+	},
+	"float": function(value) {
+		return types.number(value) && !types.integer(value);
+	},
+	array(value) {
+		return Array.isArray(value);
+	},
+	object(value) {
+		return typeof value === 'object' && !types.array(value);
+	},
+	date(value) {
+		return value instanceof Date;
+	},
+	timestamp(value) {
+		if (!this.integer(value) || Math.abs(value).toString().length > 16) {
+			return false
+		}
+		return true;
+	},
+	file(value) {
+		return typeof value.url === 'string';
+	},
+	email(value) {
+		return typeof value === 'string' && !!value.match(pattern.email) && value.length < 255;
+	},
+	url(value) {
+		return typeof value === 'string' && !!value.match(pattern.url);
+	},
+	pattern(reg, value) {
+		try {
+			return new RegExp(reg).test(value);
+		} catch (e) {
+			return false;
+		}
+	},
+	method(value) {
+		return typeof value === 'function';
+	},
+	idcard(value) {
+		return typeof value === 'string' && !!value.match(pattern.idcard);
+	},
+	'url-https'(value) {
+		return this.url(value) && value.startsWith('https://');
+	},
+	'url-scheme'(value) {
+		return value.startsWith('://');
+	},
+	'url-web'(value) {
+		return false;
+	}
+}
+
+class RuleValidator {
+
+	constructor(message) {
+		this._message = message
+	}
+
+	async validateRule(fieldKey, fieldValue, value, data, allData) {
+		var result = null
+
+		let rules = fieldValue.rules
+
+		let hasRequired = rules.findIndex((item) => {
+			return item.required
+		})
+		if (hasRequired < 0) {
+			if (value === null || value === undefined) {
+				return result
+			}
+			if (typeof value === 'string' && !value.length) {
+				return result
+			}
+		}
+
+		var message = this._message
+
+		if (rules === undefined) {
+			return message['default']
+		}
+
+		for (var i = 0; i < rules.length; i++) {
+			let rule = rules[i]
+			let vt = this._getValidateType(rule)
+
+			Object.assign(rule, {
+				label: fieldValue.label || `["${fieldKey}"]`
+			})
+
+			if (RuleValidatorHelper[vt]) {
+				result = RuleValidatorHelper[vt](rule, value, message)
+				if (result != null) {
+					break
+				}
+			}
+
+			if (rule.validateExpr) {
+				let now = Date.now()
+				let resultExpr = rule.validateExpr(value, allData, now)
+				if (resultExpr === false) {
+					result = this._getMessage(rule, rule.errorMessage || this._message['default'])
+					break
+				}
+			}
+
+			if (rule.validateFunction) {
+				result = await this.validateFunction(rule, value, data, allData, vt)
+				if (result !== null) {
+					break
+				}
+			}
+		}
+
+		if (result !== null) {
+			result = message.TAG + result
+		}
+
+		return result
+	}
+
+	async validateFunction(rule, value, data, allData, vt) {
+		let result = null
+		try {
+			let callbackMessage = null
+			const res = await rule.validateFunction(rule, value, allData || data, (message) => {
+				callbackMessage = message
+			})
+			if (callbackMessage || (typeof res === 'string' && res) || res === false) {
+				result = this._getMessage(rule, callbackMessage || res, vt)
+			}
+		} catch (e) {
+			result = this._getMessage(rule, e.message, vt)
+		}
+		return result
+	}
+
+	_getMessage(rule, message, vt) {
+		return formatMessage(rule, message || rule.errorMessage || this._message[vt] || message['default'])
+	}
+
+	_getValidateType(rule) {
+		var result = ''
+		if (rule.required) {
+			result = 'required'
+		} else if (rule.format) {
+			result = 'format'
+		} else if (rule.arrayType) {
+			result = 'arrayTypeFormat'
+		} else if (rule.range) {
+			result = 'range'
+		} else if (rule.maximum !== undefined || rule.minimum !== undefined) {
+			result = 'rangeNumber'
+		} else if (rule.maxLength !== undefined || rule.minLength !== undefined) {
+			result = 'rangeLength'
+		} else if (rule.pattern) {
+			result = 'pattern'
+		} else if (rule.validateFunction) {
+			result = 'validateFunction'
+		}
+		return result
+	}
+}
+
+const RuleValidatorHelper = {
+	required(rule, value, message) {
+		if (rule.required && isEmptyValue(value, rule.format || typeof value)) {
+			return formatMessage(rule, rule.errorMessage || message.required);
+		}
+
+		return null
+	},
+
+	range(rule, value, message) {
+		const {
+			range,
+			errorMessage
+		} = rule;
+
+		let list = new Array(range.length);
+		for (let i = 0; i < range.length; i++) {
+			const item = range[i];
+			if (types.object(item) && item.value !== undefined) {
+				list[i] = item.value;
+			} else {
+				list[i] = item;
+			}
+		}
+
+		let result = false
+		if (Array.isArray(value)) {
+			result = (new Set(value.concat(list)).size === list.length);
+		} else {
+			if (list.indexOf(value) > -1) {
+				result = true;
+			}
+		}
+
+		if (!result) {
+			return formatMessage(rule, errorMessage || message['enum']);
+		}
+
+		return null
+	},
+
+	rangeNumber(rule, value, message) {
+		if (!types.number(value)) {
+			return formatMessage(rule, rule.errorMessage || message.pattern.mismatch);
+		}
+
+		let {
+			minimum,
+			maximum,
+			exclusiveMinimum,
+			exclusiveMaximum
+		} = rule;
+		let min = exclusiveMinimum ? value <= minimum : value < minimum;
+		let max = exclusiveMaximum ? value >= maximum : value > maximum;
+
+		if (minimum !== undefined && min) {
+			return formatMessage(rule, rule.errorMessage || message['number'][exclusiveMinimum ?
+				'exclusiveMinimum' : 'minimum'
+			])
+		} else if (maximum !== undefined && max) {
+			return formatMessage(rule, rule.errorMessage || message['number'][exclusiveMaximum ?
+				'exclusiveMaximum' : 'maximum'
+			])
+		} else if (minimum !== undefined && maximum !== undefined && (min || max)) {
+			return formatMessage(rule, rule.errorMessage || message['number'].range)
+		}
+
+		return null
+	},
+
+	rangeLength(rule, value, message) {
+		if (!types.string(value) && !types.array(value)) {
+			return formatMessage(rule, rule.errorMessage || message.pattern.mismatch);
+		}
+
+		let min = rule.minLength;
+		let max = rule.maxLength;
+		let val = value.length;
+
+		if (min !== undefined && val < min) {
+			return formatMessage(rule, rule.errorMessage || message['length'].minLength)
+		} else if (max !== undefined && val > max) {
+			return formatMessage(rule, rule.errorMessage || message['length'].maxLength)
+		} else if (min !== undefined && max !== undefined && (val < min || val > max)) {
+			return formatMessage(rule, rule.errorMessage || message['length'].range)
+		}
+
+		return null
+	},
+
+	pattern(rule, value, message) {
+		if (!types['pattern'](rule.pattern, value)) {
+			return formatMessage(rule, rule.errorMessage || message.pattern.mismatch);
+		}
+
+		return null
+	},
+
+	format(rule, value, message) {
+		var customTypes = Object.keys(types);
+		var format = FORMAT_MAPPING[rule.format] ? FORMAT_MAPPING[rule.format] : (rule.format || rule.arrayType);
+
+		if (customTypes.indexOf(format) > -1) {
+			if (!types[format](value)) {
+				return formatMessage(rule, rule.errorMessage || message.typeError);
+			}
+		}
+
+		return null
+	},
+
+	arrayTypeFormat(rule, value, message) {
+		if (!Array.isArray(value)) {
+			return formatMessage(rule, rule.errorMessage || message.typeError);
+		}
+
+		for (let i = 0; i < value.length; i++) {
+			const element = value[i];
+			let formatResult = this.format(rule, element, message)
+			if (formatResult !== null) {
+				return formatResult
+			}
+		}
+
+		return null
+	}
+}
+
+class SchemaValidator extends RuleValidator {
+
+	constructor(schema, options) {
+		super(SchemaValidator.message);
+
+		this._schema = schema
+		this._options = options || null
+	}
+
+	updateSchema(schema) {
+		this._schema = schema
+	}
+
+	async validate(data, allData) {
+		let result = this._checkFieldInSchema(data)
+		if (!result) {
+			result = await this.invokeValidate(data, false, allData)
+		}
+		return result.length ? result[0] : null
+	}
+
+	async validateAll(data, allData) {
+		let result = this._checkFieldInSchema(data)
+		if (!result) {
+			result = await this.invokeValidate(data, true, allData)
+		}
+		return result
+	}
+
+	async validateUpdate(data, allData) {
+		let result = this._checkFieldInSchema(data)
+		if (!result) {
+			result = await this.invokeValidateUpdate(data, false, allData)
+		}
+		return result.length ? result[0] : null
+	}
+
+	async invokeValidate(data, all, allData) {
+		let result = []
+		let schema = this._schema
+		for (let key in schema) {
+			let value = schema[key]
+			let errorMessage = await this.validateRule(key, value, data[key], data, allData)
+			if (errorMessage != null) {
+				result.push({
+					key,
+					errorMessage
+				})
+				if (!all) break
+			}
+		}
+		return result
+	}
+
+	async invokeValidateUpdate(data, all, allData) {
+		let result = []
+		for (let key in data) {
+			let errorMessage = await this.validateRule(key, this._schema[key], data[key], data, allData)
+			if (errorMessage != null) {
+				result.push({
+					key,
+					errorMessage
+				})
+				if (!all) break
+			}
+		}
+		return result
+	}
+
+	_checkFieldInSchema(data) {
+		var keys = Object.keys(data)
+		var keys2 = Object.keys(this._schema)
+		if (new Set(keys.concat(keys2)).size === keys2.length) {
+			return ''
+		}
+
+		var noExistFields = keys.filter((key) => {
+			return keys2.indexOf(key) < 0;
+		})
+		var errorMessage = formatMessage({
+			field: JSON.stringify(noExistFields)
+		}, SchemaValidator.message.TAG + SchemaValidator.message['defaultInvalid'])
+		return [{
+			key: 'invalid',
+			errorMessage
+		}]
+	}
+}
+
+function message() {
+	return {
+		TAG: "",
+		default: '验证错误',
+		defaultInvalid: '提交的字段{field}在数据库中并不存在',
+		validateFunction: '验证无效',
+		required: '{label}必填',
+		'enum': '{label}超出范围',
+		timestamp: '{label}格式无效',
+		whitespace: '{label}不能为空',
+		typeError: '{label}类型无效',
+		date: {
+			format: '{label}日期{value}格式无效',
+			parse: '{label}日期无法解析,{value}无效',
+			invalid: '{label}日期{value}无效'
+		},
+		length: {
+			minLength: '{label}长度不能少于{minLength}',
+			maxLength: '{label}长度不能超过{maxLength}',
+			range: '{label}必须介于{minLength}和{maxLength}之间'
+		},
+		number: {
+			minimum: '{label}不能小于{minimum}',
+			maximum: '{label}不能大于{maximum}',
+			exclusiveMinimum: '{label}不能小于等于{minimum}',
+			exclusiveMaximum: '{label}不能大于等于{maximum}',
+			range: '{label}必须介于{minimum}and{maximum}之间'
+		},
+		pattern: {
+			mismatch: '{label}格式不匹配'
+		}
+	};
+}
+
+
+SchemaValidator.message = new message();
+
+export default SchemaValidator
diff --git a/uni_modules/uni-forms/package.json b/uni_modules/uni-forms/package.json
new file mode 100644
index 0000000..e69d39b
--- /dev/null
+++ b/uni_modules/uni-forms/package.json
@@ -0,0 +1,91 @@
+{
+  "id": "uni-forms",
+  "displayName": "uni-forms 表单",
+  "version": "1.4.6",
+  "description": "由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据",
+  "keywords": [
+    "uni-ui",
+    "表单",
+    "校验",
+    "表单校验",
+    "表单验证"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+      "uni-icons"
+    ],
+    "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",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-forms/readme.md b/uni_modules/uni-forms/readme.md
new file mode 100644
index 0000000..63d5a04
--- /dev/null
+++ b/uni_modules/uni-forms/readme.md
@@ -0,0 +1,23 @@
+
+
+## Forms 表单
+
+> **组件名：uni-forms**
+> 代码块： `uForms`、`uni-forms-item`
+> 关联组件：`uni-forms-item`、`uni-easyinput`、`uni-data-checkbox`、`uni-group`。
+
+
+uni-app的内置组件已经有了 `<form>`组件，用于提交表单内容。
+
+然而几乎每个表单都需要做表单验证，为了方便做表单验证，减少重复开发，`uni ui` 又基于 `<form>`组件封装了 `<uni-forms>`组件，内置了表单验证功能。
+
+`<uni-forms>` 提供了 `rules`属性来描述校验规则、`<uni-forms-item>`子组件来包裹具体的表单项，以及给原生或三方组件提供了 `binddata()` 来设置表单值。
+
+每个要校验的表单项，不管input还是checkbox，都必须放在`<uni-forms-item>`组件中，且一个`<uni-forms-item>`组件只能放置一个表单项。
+
+`<uni-forms-item>`组件内部预留了显示error message的区域，默认是在表单项的底部。
+
+另外，`<uni-forms>`组件下面的各个表单项，可以通过`<uni-group>`包裹为不同的分组。同一`<uni-group>`下的不同表单项目将聚拢在一起，同其他group保持垂直间距。`<uni-group>`仅影响视觉效果。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-forms)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-goods-nav/changelog.md b/uni_modules/uni-goods-nav/changelog.md
new file mode 100644
index 0000000..c6264c6
--- /dev/null
+++ b/uni_modules/uni-goods-nav/changelog.md
@@ -0,0 +1,18 @@
+## 1.2.1（2022-05-30）
+- 新增 stat属性，是否开启uni统计功能
+## 1.2.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-goods-nav](https://uniapp.dcloud.io/component/uniui/uni-goods-nav)
+## 1.1.1（2021-08-24）
+- 新增 支持国际化
+## 1.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-05-12）
+- 新增 组件示例地址
+## 1.0.6（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.5（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/en.json b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/en.json
new file mode 100644
index 0000000..dcdba41
--- /dev/null
+++ b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/en.json
@@ -0,0 +1,6 @@
+{
+	"uni-goods-nav.options.shop": "shop",
+	"uni-goods-nav.options.cart": "cart",
+	"uni-goods-nav.buttonGroup.addToCart": "add to cart",
+	"uni-goods-nav.buttonGroup.buyNow": "buy now"
+}
diff --git a/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/index.js b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-goods-nav/components/uni-goods-nav/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-goods-nav/components/uni-goods-nav/i18n/zh-Hans.json b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hans.json
new file mode 100644
index 0000000..48ee344
--- /dev/null
+++ b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hans.json
@@ -0,0 +1,6 @@
+{
+	"uni-goods-nav.options.shop": "店铺",
+	"uni-goods-nav.options.cart": "购物车",
+	"uni-goods-nav.buttonGroup.addToCart": "加入购物车",
+	"uni-goods-nav.buttonGroup.buyNow": "立即购买"
+}
diff --git a/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hant.json b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hant.json
new file mode 100644
index 0000000..d0a0255
--- /dev/null
+++ b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hant.json
@@ -0,0 +1,6 @@
+{
+	"uni-goods-nav.options.shop": "店鋪",
+	"uni-goods-nav.options.cart": "購物車",
+	"uni-goods-nav.buttonGroup.addToCart": "加入購物車",
+	"uni-goods-nav.buttonGroup.buyNow": "立即購買"
+}
diff --git a/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue b/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue
new file mode 100644
index 0000000..8a16b17
--- /dev/null
+++ b/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue
@@ -0,0 +1,229 @@
+<template>
+	<view class="uni-goods-nav">
+		<!-- 底部占位 -->
+		<view class="uni-tab__seat" />
+		<view class="uni-tab__cart-box flex">
+			<view class="flex uni-tab__cart-sub-left">
+				<view v-for="(item,index) in options" :key="index" class="flex uni-tab__cart-button-left uni-tab__shop-cart" @click="onClick(index,item)">
+					<view class="uni-tab__icon">
+						<uni-icons :type="item.icon" size="20" color="#646566"></uni-icons>
+						<!-- <image class="image" :src="item.icon" mode="widthFix" /> -->
+					</view>
+					<text class="uni-tab__text">{{ item.text }}</text>
+					<view class="flex uni-tab__dot-box">
+						<text v-if="item.info" :class="{ 'uni-tab__dots': item.info > 9 }" class="uni-tab__dot " :style="{'backgroundColor':item.infoBackgroundColor?item.infoBackgroundColor:'#ff0000',
+						color:item.infoColor?item.infoColor:'#fff'
+						}">{{ item.info }}</text>
+					</view>
+				</view>
+			</view>
+			<view :class="{'uni-tab__right':fill}" class="flex uni-tab__cart-sub-right ">
+				<view v-for="(item,index) in buttonGroup" :key="index" :style="{background:item.backgroundColor,color:item.color}"
+				 class="flex uni-tab__cart-button-right" @click="buttonClick(index,item)"><text :style="{color:item.color}" class="uni-tab__cart-button-right-text">{{ item.text }}</text></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	/**
+	 * GoodsNav 商品导航
+	 * @description 商品加入购物车、立即购买等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=865
+	 * @property {Array} options 组件参数
+	 * @property {Array} buttonGroup 组件按钮组参数
+	 * @property {Boolean} fill = [true | false] 组件按钮组参数
+	 * @property {Boolean} stat 是否开启统计功能
+	 * @event {Function} click 左侧点击事件
+	 * @event {Function} buttonClick 右侧按钮组点击事件
+	 * @example <uni-goods-nav :fill="true"  options="" buttonGroup="buttonGroup"  @click="" @buttonClick="" />
+	 */
+	export default {
+		name: 'UniGoodsNav',
+		emits:['click','buttonClick'],
+		props: {
+			options: {
+				type: Array,
+				default () {
+					return [{
+						icon: 'shop',
+						text: t("uni-goods-nav.options.shop"),
+					}, {
+						icon: 'cart',
+						text: t("uni-goods-nav.options.cart")
+					}]
+				}
+			},
+			buttonGroup: {
+				type: Array,
+				default () {
+					return [{
+							text: t("uni-goods-nav.buttonGroup.addToCart"),
+							backgroundColor: 'linear-gradient(90deg, #FFCD1E, #FF8A18)',
+							color: '#fff'
+						},
+						{
+							text: t("uni-goods-nav.buttonGroup.buyNow"),
+							backgroundColor: 'linear-gradient(90deg, #FE6035, #EF1224)',
+							color: '#fff'
+						}
+					]
+				}
+			},
+			fill: {
+				type: Boolean,
+				default: false
+			},
+			stat:{
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			onClick(index, item) {
+				this.$emit('click', {
+					index,
+					content: item,
+				})
+			},
+			buttonClick(index, item) {
+				if (uni.report && this.stat) {
+					uni.report(item.text, item.text)
+				}
+				this.$emit('buttonClick', {
+					index,
+					content: item
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.flex {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-goods-nav {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+	}
+
+	.uni-tab__cart-box {
+		flex: 1;
+		height: 50px;
+		background-color: #fff;
+		z-index: 900;
+	}
+
+	.uni-tab__cart-sub-left {
+		padding: 0 5px;
+	}
+
+	.uni-tab__cart-sub-right {
+		flex: 1;
+	}
+
+	.uni-tab__right {
+		margin: 5px 0;
+		margin-right: 10px;
+		border-radius: 100px;
+		overflow: hidden;
+	}
+
+	.uni-tab__cart-button-left {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		// flex: 1;
+		position: relative;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+		margin: 0 10px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-tab__icon {
+		width: 18px;
+		height: 18px;
+	}
+
+	.image {
+		width: 18px;
+		height: 18px;
+	}
+
+	.uni-tab__text {
+		margin-top: 3px;
+		font-size: 12px;
+		color: #646566;
+	}
+
+	.uni-tab__cart-button-right {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+		/* #endif */
+		flex: 1;
+		justify-content: center;
+		align-items: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-tab__cart-button-right-text {
+		font-size: 14px;
+		color: #fff;
+	}
+
+	.uni-tab__cart-button-right:active {
+		opacity: 0.7;
+	}
+
+	.uni-tab__dot-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+		/* #endif */
+		position: absolute;
+		right: -2px;
+		top: 2px;
+		justify-content: center;
+		align-items: center;
+		// width: 0;
+		// height: 0;
+	}
+
+	.uni-tab__dot {
+		// width: 30rpx;
+		// height: 30rpx;
+		padding: 0 4px;
+		line-height: 15px;
+		color: #ffffff;
+		text-align: center;
+		font-size: 12px;
+		background-color: #ff0000;
+		border-radius: 15px;
+	}
+
+	.uni-tab__dots {
+		padding: 0 4px;
+		// width: auto;
+		border-radius: 15px;
+	}
+</style>
diff --git a/uni_modules/uni-goods-nav/package.json b/uni_modules/uni-goods-nav/package.json
new file mode 100644
index 0000000..636e45e
--- /dev/null
+++ b/uni_modules/uni-goods-nav/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-goods-nav",
+  "displayName": "uni-goods-nav 商品导航",
+  "version": "1.2.1",
+  "description": "商品导航组件主要用于电商类应用底部导航，可自定义加入购物车，购买等操作",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "商品导航"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "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-goods-nav/readme.md b/uni_modules/uni-goods-nav/readme.md
new file mode 100644
index 0000000..07df93f
--- /dev/null
+++ b/uni_modules/uni-goods-nav/readme.md
@@ -0,0 +1,10 @@
+
+
+## GoodsNav 商品导航
+> **组件名：uni-goods-nav**
+> 代码块： `uGoodsNav`
+
+商品加入购物车，立即购买等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-goods-nav)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-grid/changelog.md b/uni_modules/uni-grid/changelog.md
new file mode 100644
index 0000000..d301166
--- /dev/null
+++ b/uni_modules/uni-grid/changelog.md
@@ -0,0 +1,13 @@
+## 1.4.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-grid](https://uniapp.dcloud.io/component/uniui/uni-grid)
+## 1.3.2（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 1.3.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.3.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.4（2021-05-12）
+- 新增 组件示例地址
+## 1.2.3（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue b/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue
new file mode 100644
index 0000000..19c08d7
--- /dev/null
+++ b/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue
@@ -0,0 +1,127 @@
+<template>
+	<view v-if="width" :style="'width:'+width+';'+(square?'height:'+width:'')" class="uni-grid-item">
+		<view :class="{ 'uni-grid-item--border': showBorder,  'uni-grid-item--border-top': showBorder && index < column, 'uni-highlight': highlight }"
+		 :style="{'border-right-color': borderColor ,'border-bottom-color': borderColor ,'border-top-color': borderColor }"
+		 class="uni-grid-item__box" @click="_onClick">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * GridItem 宫格
+	 * @description 宫格组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=27
+	 * @property {Number} index 子组件的唯一标识 ，点击gird会返回当前的标识
+	 */
+	export default {
+		name: 'UniGridItem',
+		inject: ['grid'],
+		props: {
+			index: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+				column: 0,
+				showBorder: true,
+				square: true,
+				highlight: true,
+				left: 0,
+				top: 0,
+				openNum: 2,
+				width: 0,
+				borderColor: '#e5e5e5'
+			}
+		},
+		created() {
+			this.column = this.grid.column
+			this.showBorder = this.grid.showBorder
+			this.square = this.grid.square
+			this.highlight = this.grid.highlight
+			this.top = this.hor === 0 ? this.grid.hor : this.hor
+			this.left = this.ver === 0 ? this.grid.ver : this.ver
+			this.borderColor = this.grid.borderColor
+			this.grid.children.push(this)
+			// this.grid.init()
+			this.width = this.grid.width
+		},
+		beforeDestroy() {
+			this.grid.children.forEach((item, index) => {
+				if (item === this) {
+					this.grid.children.splice(index, 1)
+				}
+			})
+		},
+		methods: {
+			_onClick() {
+				this.grid.change({
+					detail: {
+						index: this.index
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-grid-item {
+		/* #ifndef APP-NVUE */
+		height: 100%;
+		display: flex;
+		/* #endif */
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-grid-item__box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		width: 100%;
+		/* #endif */
+		position: relative;
+		flex: 1;
+		flex-direction: column;
+		// justify-content: center;
+		// align-items: center;
+	}
+
+	.uni-grid-item--border {
+		position: relative;
+		/* #ifdef APP-NVUE */
+		border-bottom-color: #D2D2D2;
+		border-bottom-style: solid;
+		border-bottom-width: 0.5px;
+		border-right-color: #D2D2D2;
+		border-right-style: solid;
+		border-right-width: 0.5px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		z-index: 0;
+		border-bottom: 1px #D2D2D2 solid;
+		border-right: 1px #D2D2D2 solid;
+		/* #endif */
+	}
+	.uni-grid-item--border-top {
+		position: relative;
+		/* #ifdef APP-NVUE */
+		border-top-color: #D2D2D2;
+		border-top-style: solid;
+		border-top-width: 0.5px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		border-top: 1px #D2D2D2 solid;
+		z-index: 0;
+		/* #endif */
+	}
+
+
+	.uni-highlight:active {
+		background-color: #f1f1f1;
+	}
+</style>
diff --git a/uni_modules/uni-grid/components/uni-grid/uni-grid.vue b/uni_modules/uni-grid/components/uni-grid/uni-grid.vue
new file mode 100644
index 0000000..0edc7ff
--- /dev/null
+++ b/uni_modules/uni-grid/components/uni-grid/uni-grid.vue
@@ -0,0 +1,142 @@
+<template>
+	<view class="uni-grid-wrap">
+		<view :id="elId" ref="uni-grid" class="uni-grid" :class="{ 'uni-grid--border': showBorder }" :style="{ 'border-left-color':borderColor}">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = uni.requireNativePlugin('dom');
+	// #endif
+
+	/**
+	 * Grid 宫格
+	 * @description 宫格组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=27
+	 * @property {Number} column 每列显示个数
+	 * @property {String} borderColor 边框颜色
+	 * @property {Boolean} showBorder 是否显示边框
+	 * @property {Boolean} square 是否方形显示
+	 * @property {Boolean} Boolean 点击背景是否高亮
+	 * @event {Function} change 点击 grid 触发，e={detail:{index:0}}，index 为当前点击 gird 下标
+	 */
+	export default {
+		name: 'UniGrid',
+		emits:['change'],
+		props: {
+			// 每列显示个数
+			column: {
+				type: Number,
+				default: 3
+			},
+			// 是否显示边框
+			showBorder: {
+				type: Boolean,
+				default: true
+			},
+			// 边框颜色
+			borderColor: {
+				type: String,
+				default: '#D2D2D2'
+			},
+			// 是否正方形显示,默认为 true
+			square: {
+				type: Boolean,
+				default: true
+			},
+			highlight: {
+				type: Boolean,
+				default: true
+			}
+		},
+		provide() {
+			return {
+				grid: this
+			}
+		},
+		data() {
+			const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			return {
+				elId,
+				width: 0
+			}
+		},
+		created() {
+			this.children = []
+		},
+		mounted() {
+			this.$nextTick(()=>{
+				this.init()
+			})
+		},
+		methods: {
+			init() {
+				setTimeout(() => {
+					this._getSize((width) => {
+						this.children.forEach((item, index) => {
+							item.width = width
+						})
+					})
+				}, 50)
+			},
+			change(e) {
+				this.$emit('change', e)
+			},
+			_getSize(fn) {
+				// #ifndef APP-NVUE
+				uni.createSelectorQuery()
+					.in(this)
+					.select(`#${this.elId}`)
+					.boundingClientRect()
+					.exec(ret => {
+						this.width = parseInt((ret[0].width - 1) / this.column) + 'px'
+						fn(this.width)
+					})
+				// #endif
+				// #ifdef APP-NVUE
+				dom.getComponentRect(this.$refs['uni-grid'], (ret) => {
+					this.width = parseInt((ret.size.width - 1) / this.column) + 'px'
+					fn(this.width)
+				})
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-grid-wrap {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: column;
+		/* #ifdef H5 */
+		width: 100%;
+		/* #endif */
+	}
+
+	.uni-grid {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		// flex: 1;
+		flex-direction: row;
+		flex-wrap: wrap;
+	}
+
+	.uni-grid--border {
+		position: relative;
+		/* #ifdef APP-NVUE */
+		border-left-color: #D2D2D2;
+		border-left-style: solid;
+		border-left-width: 0.5px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		z-index: 1;
+		border-left: 1px #D2D2D2 solid;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-grid/package.json b/uni_modules/uni-grid/package.json
new file mode 100644
index 0000000..ccb2c91
--- /dev/null
+++ b/uni_modules/uni-grid/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-grid",
+  "displayName": "uni-grid 宫格",
+  "version": "1.4.0",
+  "description": "Grid 宫格组件，提供移动端常见的宫格布局，如九宫格。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "九宫格",
+    "表格"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss","uni-icons"],
+    "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-grid/readme.md b/uni_modules/uni-grid/readme.md
new file mode 100644
index 0000000..0aa44cc
--- /dev/null
+++ b/uni_modules/uni-grid/readme.md
@@ -0,0 +1,11 @@
+
+
+## Grid 宫格
+> **组件名：uni-grid**
+> 代码块： `uGrid`
+
+
+宫格组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-grid)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-group/changelog.md b/uni_modules/uni-group/changelog.md
new file mode 100644
index 0000000..a7024fd
--- /dev/null
+++ b/uni_modules/uni-group/changelog.md
@@ -0,0 +1,16 @@
+## 1.2.2（2022-05-30）
+- 新增 stat属性，是否开启uni统计功能
+## 1.2.1（2021-11-22）
+- 修复 vue3中某些scss变量无法找到的问题
+## 1.2.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-group](https://uniapp.dcloud.io/component/uniui/uni-group)
+## 1.1.7（2021-11-08）
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+- 优化 组件文档
+## 1.0.3（2021-05-12）
+- 新增 组件示例地址
+## 1.0.2（2021-02-05）
+- 调整为uni_modules目录规范
+- 优化 兼容 nvue 页面
diff --git a/uni_modules/uni-group/components/uni-group/uni-group.vue b/uni_modules/uni-group/components/uni-group/uni-group.vue
new file mode 100644
index 0000000..3425ecd
--- /dev/null
+++ b/uni_modules/uni-group/components/uni-group/uni-group.vue
@@ -0,0 +1,134 @@
+<template>
+	<view class="uni-group" :class="['uni-group--'+mode ,margin?'group-margin':'']" :style="{marginTop: `${top}px` }">
+		<slot name="title">
+			<view v-if="title" class="uni-group__title" :style="{'padding-left':border?'30px':'15px'}">
+				<text class="uni-group__title-text">{{ title }}</text>
+			</view>
+		</slot>
+		<view class="uni-group__content" :class="{'group-conent-padding':border}">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Group 分组
+	 * @description 表单字段分组
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3281
+	 * @property {String} title 主标题
+	 * @property {Number} top 分组间隔
+	 * @property {Number} mode 模式
+	 */
+	export default {
+		name: 'uniGroup',
+		emits:['click'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			top: {
+				type: [Number, String],
+				default: 10
+			},
+			mode: {
+				type: String,
+				default: 'default'
+			},
+			stat:{
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				margin: false,
+				border: false
+			}
+		},
+		watch: {
+			title(newVal) {
+				if (uni.report && this.stat && newVal !== '') {
+					uni.report('title', newVal)
+				}
+			}
+		},
+		created() {
+			this.form = this.getForm()
+			if (this.form) {
+				this.margin = true
+				this.border = this.form.border
+			}
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getForm() {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== 'uniForms') {
+					parent = parent.$parent;
+					if (!parent) return false
+					parentName = parent.$options.name;
+				}
+				return parent;
+			},
+			onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-group {
+		background: #fff;
+		margin-top: 10px;
+		// border: 1px red solid;
+	}
+
+	.group-margin {
+		// margin: 0 -15px;
+	}
+
+	.uni-group__title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding-left: 15px;
+		height: 40px;
+		background-color: #eee;
+		font-weight: normal;
+		color: #666;
+	}
+
+	.uni-group__content {
+		padding: 15px;
+		// padding-bottom: 5px;
+		// background-color: #FFF;
+	}
+
+	.group-conent-padding {
+		padding: 0 15px;
+	}
+
+	.uni-group__title-text {
+		font-size: 14px;
+		color: #666;
+	}
+
+	.distraction {
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-group--card {
+		margin: 10px;
+		border-radius: 5px;
+		overflow: hidden;
+		box-shadow: 0 0 5px 1px rgba($color: #000000, $alpha: 0.08);
+	}
+</style>
diff --git a/uni_modules/uni-group/package.json b/uni_modules/uni-group/package.json
new file mode 100644
index 0000000..ea00a08
--- /dev/null
+++ b/uni_modules/uni-group/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-group",
+  "displayName": "uni-group 分组",
+  "version": "1.2.2",
+  "description": "分组组件可用于将组件用于分组，添加间隔，以产生明显的区块",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "group",
+    "分组",
+    ""
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["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-group/readme.md b/uni_modules/uni-group/readme.md
new file mode 100644
index 0000000..bae67f4
--- /dev/null
+++ b/uni_modules/uni-group/readme.md
@@ -0,0 +1,9 @@
+
+## Group 分组
+> **组件名：uni-group**
+> 代码块： `uGroup`
+
+分组组件可用于将组件分组，添加间隔，以产生明显的区块。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-group)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md
new file mode 100644
index 0000000..6449885
--- /dev/null
+++ b/uni_modules/uni-icons/changelog.md
@@ -0,0 +1,22 @@
+## 1.3.5（2022-01-24）
+- 优化 size 属性可以传入不带单位的字符串数值
+## 1.3.4（2022-01-24）
+- 优化 size 支持其他单位
+## 1.3.3（2022-01-17）
+- 修复 nvue 有些图标不显示的bug，兼容老版本图标
+## 1.3.2（2021-12-01）
+- 优化 示例可复制图标名称
+## 1.3.1（2021-11-23）
+- 优化 兼容旧组件 type 值
+## 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-icons](https://uniapp.dcloud.io/component/uniui/uni-icons)
+## 1.1.7（2021-11-08）
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.5（2021-05-12）
+- 新增 组件示例地址
+## 1.1.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-icons/components/uni-icons/icons.js b/uni_modules/uni-icons/components/uni-icons/icons.js
new file mode 100644
index 0000000..7889936
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/icons.js
@@ -0,0 +1,1169 @@
+export default {
+  "id": "2852637",
+  "name": "uniui图标库",
+  "font_family": "uniicons",
+  "css_prefix_text": "uniui-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "25027049",
+      "name": "yanse",
+      "font_class": "color",
+      "unicode": "e6cf",
+      "unicode_decimal": 59087
+    },
+    {
+      "icon_id": "25027048",
+      "name": "wallet",
+      "font_class": "wallet",
+      "unicode": "e6b1",
+      "unicode_decimal": 59057
+    },
+    {
+      "icon_id": "25015720",
+      "name": "settings-filled",
+      "font_class": "settings-filled",
+      "unicode": "e6ce",
+      "unicode_decimal": 59086
+    },
+    {
+      "icon_id": "25015434",
+      "name": "shimingrenzheng-filled",
+      "font_class": "auth-filled",
+      "unicode": "e6cc",
+      "unicode_decimal": 59084
+    },
+    {
+      "icon_id": "24934246",
+      "name": "shop-filled",
+      "font_class": "shop-filled",
+      "unicode": "e6cd",
+      "unicode_decimal": 59085
+    },
+    {
+      "icon_id": "24934159",
+      "name": "staff-filled-01",
+      "font_class": "staff-filled",
+      "unicode": "e6cb",
+      "unicode_decimal": 59083
+    },
+    {
+      "icon_id": "24932461",
+      "name": "VIP-filled",
+      "font_class": "vip-filled",
+      "unicode": "e6c6",
+      "unicode_decimal": 59078
+    },
+    {
+      "icon_id": "24932462",
+      "name": "plus_circle_fill",
+      "font_class": "plus-filled",
+      "unicode": "e6c7",
+      "unicode_decimal": 59079
+    },
+    {
+      "icon_id": "24932463",
+      "name": "folder_add-filled",
+      "font_class": "folder-add-filled",
+      "unicode": "e6c8",
+      "unicode_decimal": 59080
+    },
+    {
+      "icon_id": "24932464",
+      "name": "yanse-filled",
+      "font_class": "color-filled",
+      "unicode": "e6c9",
+      "unicode_decimal": 59081
+    },
+    {
+      "icon_id": "24932465",
+      "name": "tune-filled",
+      "font_class": "tune-filled",
+      "unicode": "e6ca",
+      "unicode_decimal": 59082
+    },
+    {
+      "icon_id": "24932455",
+      "name": "a-rilidaka-filled",
+      "font_class": "calendar-filled",
+      "unicode": "e6c0",
+      "unicode_decimal": 59072
+    },
+    {
+      "icon_id": "24932456",
+      "name": "notification-filled",
+      "font_class": "notification-filled",
+      "unicode": "e6c1",
+      "unicode_decimal": 59073
+    },
+    {
+      "icon_id": "24932457",
+      "name": "wallet-filled",
+      "font_class": "wallet-filled",
+      "unicode": "e6c2",
+      "unicode_decimal": 59074
+    },
+    {
+      "icon_id": "24932458",
+      "name": "paihangbang-filled",
+      "font_class": "medal-filled",
+      "unicode": "e6c3",
+      "unicode_decimal": 59075
+    },
+    {
+      "icon_id": "24932459",
+      "name": "gift-filled",
+      "font_class": "gift-filled",
+      "unicode": "e6c4",
+      "unicode_decimal": 59076
+    },
+    {
+      "icon_id": "24932460",
+      "name": "fire-filled",
+      "font_class": "fire-filled",
+      "unicode": "e6c5",
+      "unicode_decimal": 59077
+    },
+    {
+      "icon_id": "24928001",
+      "name": "refreshempty",
+      "font_class": "refreshempty",
+      "unicode": "e6bf",
+      "unicode_decimal": 59071
+    },
+    {
+      "icon_id": "24926853",
+      "name": "location-ellipse",
+      "font_class": "location-filled",
+      "unicode": "e6af",
+      "unicode_decimal": 59055
+    },
+    {
+      "icon_id": "24926735",
+      "name": "person-filled",
+      "font_class": "person-filled",
+      "unicode": "e69d",
+      "unicode_decimal": 59037
+    },
+    {
+      "icon_id": "24926703",
+      "name": "personadd-filled",
+      "font_class": "personadd-filled",
+      "unicode": "e698",
+      "unicode_decimal": 59032
+    },
+    {
+      "icon_id": "24923351",
+      "name": "back",
+      "font_class": "back",
+      "unicode": "e6b9",
+      "unicode_decimal": 59065
+    },
+    {
+      "icon_id": "24923352",
+      "name": "forward",
+      "font_class": "forward",
+      "unicode": "e6ba",
+      "unicode_decimal": 59066
+    },
+    {
+      "icon_id": "24923353",
+      "name": "arrowthinright",
+      "font_class": "arrow-right",
+      "unicode": "e6bb",
+      "unicode_decimal": 59067
+    },
+		{
+		  "icon_id": "24923353",
+		  "name": "arrowthinright",
+		  "font_class": "arrowthinright",
+		  "unicode": "e6bb",
+		  "unicode_decimal": 59067
+		},
+    {
+      "icon_id": "24923354",
+      "name": "arrowthinleft",
+      "font_class": "arrow-left",
+      "unicode": "e6bc",
+      "unicode_decimal": 59068
+    },
+		{
+		  "icon_id": "24923354",
+		  "name": "arrowthinleft",
+		  "font_class": "arrowthinleft",
+		  "unicode": "e6bc",
+		  "unicode_decimal": 59068
+		},
+    {
+      "icon_id": "24923355",
+      "name": "arrowthinup",
+      "font_class": "arrow-up",
+      "unicode": "e6bd",
+      "unicode_decimal": 59069
+    },
+		{
+		  "icon_id": "24923355",
+		  "name": "arrowthinup",
+		  "font_class": "arrowthinup",
+		  "unicode": "e6bd",
+		  "unicode_decimal": 59069
+		},
+    {
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrow-down",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
+    },{
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrowthindown",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
+    },
+    {
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "bottom",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
+    },{
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "arrowdown",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
+    },
+    {
+      "icon_id": "24923346",
+      "name": "arrowright",
+      "font_class": "right",
+      "unicode": "e6b5",
+      "unicode_decimal": 59061
+    },
+		{
+		  "icon_id": "24923346",
+		  "name": "arrowright",
+		  "font_class": "arrowright",
+		  "unicode": "e6b5",
+		  "unicode_decimal": 59061
+		},
+    {
+      "icon_id": "24923347",
+      "name": "arrowup",
+      "font_class": "top",
+      "unicode": "e6b6",
+      "unicode_decimal": 59062
+    },
+		{
+		  "icon_id": "24923347",
+		  "name": "arrowup",
+		  "font_class": "arrowup",
+		  "unicode": "e6b6",
+		  "unicode_decimal": 59062
+		},
+    {
+      "icon_id": "24923348",
+      "name": "arrowleft",
+      "font_class": "left",
+      "unicode": "e6b7",
+      "unicode_decimal": 59063
+    },
+		{
+		  "icon_id": "24923348",
+		  "name": "arrowleft",
+		  "font_class": "arrowleft",
+		  "unicode": "e6b7",
+		  "unicode_decimal": 59063
+		},
+    {
+      "icon_id": "24923334",
+      "name": "eye",
+      "font_class": "eye",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "24923335",
+      "name": "eye-filled",
+      "font_class": "eye-filled",
+      "unicode": "e66a",
+      "unicode_decimal": 58986
+    },
+    {
+      "icon_id": "24923336",
+      "name": "eye-slash",
+      "font_class": "eye-slash",
+      "unicode": "e6b3",
+      "unicode_decimal": 59059
+    },
+    {
+      "icon_id": "24923337",
+      "name": "eye-slash-filled",
+      "font_class": "eye-slash-filled",
+      "unicode": "e6b4",
+      "unicode_decimal": 59060
+    },
+    {
+      "icon_id": "24923305",
+      "name": "info-filled",
+      "font_class": "info-filled",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "24923299",
+      "name": "reload-01",
+      "font_class": "reload",
+      "unicode": "e6b2",
+      "unicode_decimal": 59058
+    },
+    {
+      "icon_id": "24923195",
+      "name": "mic_slash_fill",
+      "font_class": "micoff-filled",
+      "unicode": "e6b0",
+      "unicode_decimal": 59056
+    },
+    {
+      "icon_id": "24923165",
+      "name": "map-pin-ellipse",
+      "font_class": "map-pin-ellipse",
+      "unicode": "e6ac",
+      "unicode_decimal": 59052
+    },
+    {
+      "icon_id": "24923166",
+      "name": "map-pin",
+      "font_class": "map-pin",
+      "unicode": "e6ad",
+      "unicode_decimal": 59053
+    },
+    {
+      "icon_id": "24923167",
+      "name": "location",
+      "font_class": "location",
+      "unicode": "e6ae",
+      "unicode_decimal": 59054
+    },
+    {
+      "icon_id": "24923064",
+      "name": "starhalf",
+      "font_class": "starhalf",
+      "unicode": "e683",
+      "unicode_decimal": 59011
+    },
+    {
+      "icon_id": "24923065",
+      "name": "star",
+      "font_class": "star",
+      "unicode": "e688",
+      "unicode_decimal": 59016
+    },
+    {
+      "icon_id": "24923066",
+      "name": "star-filled",
+      "font_class": "star-filled",
+      "unicode": "e68f",
+      "unicode_decimal": 59023
+    },
+    {
+      "icon_id": "24899646",
+      "name": "a-rilidaka",
+      "font_class": "calendar",
+      "unicode": "e6a0",
+      "unicode_decimal": 59040
+    },
+    {
+      "icon_id": "24899647",
+      "name": "fire",
+      "font_class": "fire",
+      "unicode": "e6a1",
+      "unicode_decimal": 59041
+    },
+    {
+      "icon_id": "24899648",
+      "name": "paihangbang",
+      "font_class": "medal",
+      "unicode": "e6a2",
+      "unicode_decimal": 59042
+    },
+    {
+      "icon_id": "24899649",
+      "name": "font",
+      "font_class": "font",
+      "unicode": "e6a3",
+      "unicode_decimal": 59043
+    },
+    {
+      "icon_id": "24899650",
+      "name": "gift",
+      "font_class": "gift",
+      "unicode": "e6a4",
+      "unicode_decimal": 59044
+    },
+    {
+      "icon_id": "24899651",
+      "name": "link",
+      "font_class": "link",
+      "unicode": "e6a5",
+      "unicode_decimal": 59045
+    },
+    {
+      "icon_id": "24899652",
+      "name": "notification",
+      "font_class": "notification",
+      "unicode": "e6a6",
+      "unicode_decimal": 59046
+    },
+    {
+      "icon_id": "24899653",
+      "name": "staff",
+      "font_class": "staff",
+      "unicode": "e6a7",
+      "unicode_decimal": 59047
+    },
+    {
+      "icon_id": "24899654",
+      "name": "VIP",
+      "font_class": "vip",
+      "unicode": "e6a8",
+      "unicode_decimal": 59048
+    },
+    {
+      "icon_id": "24899655",
+      "name": "folder_add",
+      "font_class": "folder-add",
+      "unicode": "e6a9",
+      "unicode_decimal": 59049
+    },
+    {
+      "icon_id": "24899656",
+      "name": "tune",
+      "font_class": "tune",
+      "unicode": "e6aa",
+      "unicode_decimal": 59050
+    },
+    {
+      "icon_id": "24899657",
+      "name": "shimingrenzheng",
+      "font_class": "auth",
+      "unicode": "e6ab",
+      "unicode_decimal": 59051
+    },
+    {
+      "icon_id": "24899565",
+      "name": "person",
+      "font_class": "person",
+      "unicode": "e699",
+      "unicode_decimal": 59033
+    },
+    {
+      "icon_id": "24899566",
+      "name": "email-filled",
+      "font_class": "email-filled",
+      "unicode": "e69a",
+      "unicode_decimal": 59034
+    },
+    {
+      "icon_id": "24899567",
+      "name": "phone-filled",
+      "font_class": "phone-filled",
+      "unicode": "e69b",
+      "unicode_decimal": 59035
+    },
+    {
+      "icon_id": "24899568",
+      "name": "phone",
+      "font_class": "phone",
+      "unicode": "e69c",
+      "unicode_decimal": 59036
+    },
+    {
+      "icon_id": "24899570",
+      "name": "email",
+      "font_class": "email",
+      "unicode": "e69e",
+      "unicode_decimal": 59038
+    },
+    {
+      "icon_id": "24899571",
+      "name": "personadd",
+      "font_class": "personadd",
+      "unicode": "e69f",
+      "unicode_decimal": 59039
+    },
+    {
+      "icon_id": "24899558",
+      "name": "chatboxes-filled",
+      "font_class": "chatboxes-filled",
+      "unicode": "e692",
+      "unicode_decimal": 59026
+    },
+    {
+      "icon_id": "24899559",
+      "name": "contact",
+      "font_class": "contact",
+      "unicode": "e693",
+      "unicode_decimal": 59027
+    },
+    {
+      "icon_id": "24899560",
+      "name": "chatbubble-filled",
+      "font_class": "chatbubble-filled",
+      "unicode": "e694",
+      "unicode_decimal": 59028
+    },
+    {
+      "icon_id": "24899561",
+      "name": "contact-filled",
+      "font_class": "contact-filled",
+      "unicode": "e695",
+      "unicode_decimal": 59029
+    },
+    {
+      "icon_id": "24899562",
+      "name": "chatboxes",
+      "font_class": "chatboxes",
+      "unicode": "e696",
+      "unicode_decimal": 59030
+    },
+    {
+      "icon_id": "24899563",
+      "name": "chatbubble",
+      "font_class": "chatbubble",
+      "unicode": "e697",
+      "unicode_decimal": 59031
+    },
+    {
+      "icon_id": "24881290",
+      "name": "upload-filled",
+      "font_class": "upload-filled",
+      "unicode": "e68e",
+      "unicode_decimal": 59022
+    },
+    {
+      "icon_id": "24881292",
+      "name": "upload",
+      "font_class": "upload",
+      "unicode": "e690",
+      "unicode_decimal": 59024
+    },
+    {
+      "icon_id": "24881293",
+      "name": "weixin",
+      "font_class": "weixin",
+      "unicode": "e691",
+      "unicode_decimal": 59025
+    },
+    {
+      "icon_id": "24881274",
+      "name": "compose",
+      "font_class": "compose",
+      "unicode": "e67f",
+      "unicode_decimal": 59007
+    },
+    {
+      "icon_id": "24881275",
+      "name": "qq",
+      "font_class": "qq",
+      "unicode": "e680",
+      "unicode_decimal": 59008
+    },
+    {
+      "icon_id": "24881276",
+      "name": "download-filled",
+      "font_class": "download-filled",
+      "unicode": "e681",
+      "unicode_decimal": 59009
+    },
+    {
+      "icon_id": "24881277",
+      "name": "pengyouquan",
+      "font_class": "pyq",
+      "unicode": "e682",
+      "unicode_decimal": 59010
+    },
+    {
+      "icon_id": "24881279",
+      "name": "sound",
+      "font_class": "sound",
+      "unicode": "e684",
+      "unicode_decimal": 59012
+    },
+    {
+      "icon_id": "24881280",
+      "name": "trash-filled",
+      "font_class": "trash-filled",
+      "unicode": "e685",
+      "unicode_decimal": 59013
+    },
+    {
+      "icon_id": "24881281",
+      "name": "sound-filled",
+      "font_class": "sound-filled",
+      "unicode": "e686",
+      "unicode_decimal": 59014
+    },
+    {
+      "icon_id": "24881282",
+      "name": "trash",
+      "font_class": "trash",
+      "unicode": "e687",
+      "unicode_decimal": 59015
+    },
+    {
+      "icon_id": "24881284",
+      "name": "videocam-filled",
+      "font_class": "videocam-filled",
+      "unicode": "e689",
+      "unicode_decimal": 59017
+    },
+    {
+      "icon_id": "24881285",
+      "name": "spinner-cycle",
+      "font_class": "spinner-cycle",
+      "unicode": "e68a",
+      "unicode_decimal": 59018
+    },
+    {
+      "icon_id": "24881286",
+      "name": "weibo",
+      "font_class": "weibo",
+      "unicode": "e68b",
+      "unicode_decimal": 59019
+    },
+    {
+      "icon_id": "24881288",
+      "name": "videocam",
+      "font_class": "videocam",
+      "unicode": "e68c",
+      "unicode_decimal": 59020
+    },
+    {
+      "icon_id": "24881289",
+      "name": "download",
+      "font_class": "download",
+      "unicode": "e68d",
+      "unicode_decimal": 59021
+    },
+    {
+      "icon_id": "24879601",
+      "name": "help",
+      "font_class": "help",
+      "unicode": "e679",
+      "unicode_decimal": 59001
+    },
+    {
+      "icon_id": "24879602",
+      "name": "navigate-filled",
+      "font_class": "navigate-filled",
+      "unicode": "e67a",
+      "unicode_decimal": 59002
+    },
+    {
+      "icon_id": "24879603",
+      "name": "plusempty",
+      "font_class": "plusempty",
+      "unicode": "e67b",
+      "unicode_decimal": 59003
+    },
+    {
+      "icon_id": "24879604",
+      "name": "smallcircle",
+      "font_class": "smallcircle",
+      "unicode": "e67c",
+      "unicode_decimal": 59004
+    },
+    {
+      "icon_id": "24879605",
+      "name": "minus-filled",
+      "font_class": "minus-filled",
+      "unicode": "e67d",
+      "unicode_decimal": 59005
+    },
+    {
+      "icon_id": "24879606",
+      "name": "micoff",
+      "font_class": "micoff",
+      "unicode": "e67e",
+      "unicode_decimal": 59006
+    },
+    {
+      "icon_id": "24879588",
+      "name": "closeempty",
+      "font_class": "closeempty",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    },
+    {
+      "icon_id": "24879589",
+      "name": "clear",
+      "font_class": "clear",
+      "unicode": "e66d",
+      "unicode_decimal": 58989
+    },
+    {
+      "icon_id": "24879590",
+      "name": "navigate",
+      "font_class": "navigate",
+      "unicode": "e66e",
+      "unicode_decimal": 58990
+    },
+    {
+      "icon_id": "24879591",
+      "name": "minus",
+      "font_class": "minus",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "24879592",
+      "name": "image",
+      "font_class": "image",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
+    {
+      "icon_id": "24879593",
+      "name": "mic",
+      "font_class": "mic",
+      "unicode": "e671",
+      "unicode_decimal": 58993
+    },
+    {
+      "icon_id": "24879594",
+      "name": "paperplane",
+      "font_class": "paperplane",
+      "unicode": "e672",
+      "unicode_decimal": 58994
+    },
+    {
+      "icon_id": "24879595",
+      "name": "close",
+      "font_class": "close",
+      "unicode": "e673",
+      "unicode_decimal": 58995
+    },
+    {
+      "icon_id": "24879596",
+      "name": "help-filled",
+      "font_class": "help-filled",
+      "unicode": "e674",
+      "unicode_decimal": 58996
+    },
+    {
+      "icon_id": "24879597",
+      "name": "plus-filled",
+      "font_class": "paperplane-filled",
+      "unicode": "e675",
+      "unicode_decimal": 58997
+    },
+    {
+      "icon_id": "24879598",
+      "name": "plus",
+      "font_class": "plus",
+      "unicode": "e676",
+      "unicode_decimal": 58998
+    },
+    {
+      "icon_id": "24879599",
+      "name": "mic-filled",
+      "font_class": "mic-filled",
+      "unicode": "e677",
+      "unicode_decimal": 58999
+    },
+    {
+      "icon_id": "24879600",
+      "name": "image-filled",
+      "font_class": "image-filled",
+      "unicode": "e678",
+      "unicode_decimal": 59000
+    },
+    {
+      "icon_id": "24855900",
+      "name": "locked-filled",
+      "font_class": "locked-filled",
+      "unicode": "e668",
+      "unicode_decimal": 58984
+    },
+    {
+      "icon_id": "24855901",
+      "name": "info",
+      "font_class": "info",
+      "unicode": "e669",
+      "unicode_decimal": 58985
+    },
+    {
+      "icon_id": "24855903",
+      "name": "locked",
+      "font_class": "locked",
+      "unicode": "e66b",
+      "unicode_decimal": 58987
+    },
+    {
+      "icon_id": "24855884",
+      "name": "camera-filled",
+      "font_class": "camera-filled",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "24855885",
+      "name": "chat-filled",
+      "font_class": "chat-filled",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "24855886",
+      "name": "camera",
+      "font_class": "camera",
+      "unicode": "e65a",
+      "unicode_decimal": 58970
+    },
+    {
+      "icon_id": "24855887",
+      "name": "circle",
+      "font_class": "circle",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "24855888",
+      "name": "checkmarkempty",
+      "font_class": "checkmarkempty",
+      "unicode": "e65c",
+      "unicode_decimal": 58972
+    },
+    {
+      "icon_id": "24855889",
+      "name": "chat",
+      "font_class": "chat",
+      "unicode": "e65d",
+      "unicode_decimal": 58973
+    },
+    {
+      "icon_id": "24855890",
+      "name": "circle-filled",
+      "font_class": "circle-filled",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "24855891",
+      "name": "flag",
+      "font_class": "flag",
+      "unicode": "e65f",
+      "unicode_decimal": 58975
+    },
+    {
+      "icon_id": "24855892",
+      "name": "flag-filled",
+      "font_class": "flag-filled",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "24855893",
+      "name": "gear-filled",
+      "font_class": "gear-filled",
+      "unicode": "e661",
+      "unicode_decimal": 58977
+    },
+    {
+      "icon_id": "24855894",
+      "name": "home",
+      "font_class": "home",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "24855895",
+      "name": "home-filled",
+      "font_class": "home-filled",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "24855896",
+      "name": "gear",
+      "font_class": "gear",
+      "unicode": "e664",
+      "unicode_decimal": 58980
+    },
+    {
+      "icon_id": "24855897",
+      "name": "smallcircle-filled",
+      "font_class": "smallcircle-filled",
+      "unicode": "e665",
+      "unicode_decimal": 58981
+    },
+    {
+      "icon_id": "24855898",
+      "name": "map-filled",
+      "font_class": "map-filled",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "24855899",
+      "name": "map",
+      "font_class": "map",
+      "unicode": "e667",
+      "unicode_decimal": 58983
+    },
+    {
+      "icon_id": "24855825",
+      "name": "refresh-filled",
+      "font_class": "refresh-filled",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "24855826",
+      "name": "refresh",
+      "font_class": "refresh",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
+      "icon_id": "24855808",
+      "name": "cloud-upload",
+      "font_class": "cloud-upload",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "24855809",
+      "name": "cloud-download-filled",
+      "font_class": "cloud-download-filled",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "24855810",
+      "name": "cloud-download",
+      "font_class": "cloud-download",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "24855811",
+      "name": "cloud-upload-filled",
+      "font_class": "cloud-upload-filled",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "24855813",
+      "name": "redo",
+      "font_class": "redo",
+      "unicode": "e64a",
+      "unicode_decimal": 58954
+    },
+    {
+      "icon_id": "24855814",
+      "name": "images-filled",
+      "font_class": "images-filled",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
+    {
+      "icon_id": "24855815",
+      "name": "undo-filled",
+      "font_class": "undo-filled",
+      "unicode": "e64c",
+      "unicode_decimal": 58956
+    },
+    {
+      "icon_id": "24855816",
+      "name": "more",
+      "font_class": "more",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "24855817",
+      "name": "more-filled",
+      "font_class": "more-filled",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
+    },
+    {
+      "icon_id": "24855818",
+      "name": "undo",
+      "font_class": "undo",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
+    },
+    {
+      "icon_id": "24855819",
+      "name": "images",
+      "font_class": "images",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "24855821",
+      "name": "paperclip",
+      "font_class": "paperclip",
+      "unicode": "e652",
+      "unicode_decimal": 58962
+    },
+    {
+      "icon_id": "24855822",
+      "name": "settings",
+      "font_class": "settings",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
+      "icon_id": "24855823",
+      "name": "search",
+      "font_class": "search",
+      "unicode": "e654",
+      "unicode_decimal": 58964
+    },
+    {
+      "icon_id": "24855824",
+      "name": "redo-filled",
+      "font_class": "redo-filled",
+      "unicode": "e655",
+      "unicode_decimal": 58965
+    },
+    {
+      "icon_id": "24841702",
+      "name": "list",
+      "font_class": "list",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "24841489",
+      "name": "mail-open-filled",
+      "font_class": "mail-open-filled",
+      "unicode": "e63a",
+      "unicode_decimal": 58938
+    },
+    {
+      "icon_id": "24841491",
+      "name": "hand-thumbsdown-filled",
+      "font_class": "hand-down-filled",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "24841492",
+      "name": "hand-thumbsdown",
+      "font_class": "hand-down",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
+      "icon_id": "24841493",
+      "name": "hand-thumbsup-filled",
+      "font_class": "hand-up-filled",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
+    {
+      "icon_id": "24841494",
+      "name": "hand-thumbsup",
+      "font_class": "hand-up",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "24841496",
+      "name": "heart-filled",
+      "font_class": "heart-filled",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "24841498",
+      "name": "mail-open",
+      "font_class": "mail-open",
+      "unicode": "e643",
+      "unicode_decimal": 58947
+    },
+    {
+      "icon_id": "24841488",
+      "name": "heart",
+      "font_class": "heart",
+      "unicode": "e639",
+      "unicode_decimal": 58937
+    },
+    {
+      "icon_id": "24839963",
+      "name": "loop",
+      "font_class": "loop",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
+      "icon_id": "24839866",
+      "name": "pulldown",
+      "font_class": "pulldown",
+      "unicode": "e632",
+      "unicode_decimal": 58930
+    },
+    {
+      "icon_id": "24813798",
+      "name": "scan",
+      "font_class": "scan",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
+    {
+      "icon_id": "24813786",
+      "name": "bars",
+      "font_class": "bars",
+      "unicode": "e627",
+      "unicode_decimal": 58919
+    },
+    {
+      "icon_id": "24813788",
+      "name": "cart-filled",
+      "font_class": "cart-filled",
+      "unicode": "e629",
+      "unicode_decimal": 58921
+    },
+    {
+      "icon_id": "24813790",
+      "name": "checkbox",
+      "font_class": "checkbox",
+      "unicode": "e62b",
+      "unicode_decimal": 58923
+    },
+    {
+      "icon_id": "24813791",
+      "name": "checkbox-filled",
+      "font_class": "checkbox-filled",
+      "unicode": "e62c",
+      "unicode_decimal": 58924
+    },
+    {
+      "icon_id": "24813794",
+      "name": "shop",
+      "font_class": "shop",
+      "unicode": "e62f",
+      "unicode_decimal": 58927
+    },
+    {
+      "icon_id": "24813795",
+      "name": "headphones",
+      "font_class": "headphones",
+      "unicode": "e630",
+      "unicode_decimal": 58928
+    },
+    {
+      "icon_id": "24813796",
+      "name": "cart",
+      "font_class": "cart",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    }
+  ]
+}
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
new file mode 100644
index 0000000..86e7444
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -0,0 +1,96 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+	<!-- #endif -->
+</template>
+
+<script>
+	import icons from './icons.js';
+	const getVal = (val) => {
+		const reg = /^[0-9]*$/g
+		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
+	} 
+	// #ifdef APP-NVUE
+	var domModule = weex.requireModule('dom');
+	import iconUrl from './uniicons.ttf'
+	domModule.addRule('fontFace', {
+		'fontFamily': "uniicons",
+		'src': "url('"+iconUrl+"')"
+	});
+	// #endif
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icons 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
+	 * @event {Function} click 点击 Icon 触发事件
+	 */
+	export default {
+		name: 'UniIcons',
+		emits:['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			},
+			customPrefix:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				icons: icons.glyphs
+			}
+		},
+		computed:{
+			unicode(){
+				let code = this.icons.find(v=>v.font_class === this.type)
+				if(code){
+					return unescape(`%u${code.unicode}`)
+				}
+				return ''
+			},
+			iconSize(){
+				return getVal(this.size)
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/* #ifndef APP-NVUE */
+	@import './uniicons.css';
+	@font-face {
+		font-family: uniicons;
+		src: url('./uniicons.ttf') format('truetype');
+	}
+
+	/* #endif */
+	.uni-icons {
+		font-family: uniicons;
+		text-decoration: none;
+		text-align: center;
+	}
+
+</style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uni.ttf b/uni_modules/uni-icons/components/uni-icons/uni.ttf
new file mode 100644
index 0000000..60a1968
Binary files /dev/null and b/uni_modules/uni-icons/components/uni-icons/uni.ttf differ
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.css b/uni_modules/uni-icons/components/uni-icons/uniicons.css
new file mode 100644
index 0000000..2f56eab
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.css
@@ -0,0 +1,663 @@
+.uniui-color:before {
+  content: "\e6cf";
+}
+
+.uniui-wallet:before {
+  content: "\e6b1";
+}
+
+.uniui-settings-filled:before {
+  content: "\e6ce";
+}
+
+.uniui-auth-filled:before {
+  content: "\e6cc";
+}
+
+.uniui-shop-filled:before {
+  content: "\e6cd";
+}
+
+.uniui-staff-filled:before {
+  content: "\e6cb";
+}
+
+.uniui-vip-filled:before {
+  content: "\e6c6";
+}
+
+.uniui-plus-filled:before {
+  content: "\e6c7";
+}
+
+.uniui-folder-add-filled:before {
+  content: "\e6c8";
+}
+
+.uniui-color-filled:before {
+  content: "\e6c9";
+}
+
+.uniui-tune-filled:before {
+  content: "\e6ca";
+}
+
+.uniui-calendar-filled:before {
+  content: "\e6c0";
+}
+
+.uniui-notification-filled:before {
+  content: "\e6c1";
+}
+
+.uniui-wallet-filled:before {
+  content: "\e6c2";
+}
+
+.uniui-medal-filled:before {
+  content: "\e6c3";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
+.uniui-fire-filled:before {
+  content: "\e6c5";
+}
+
+.uniui-refreshempty:before {
+  content: "\e6bf";
+}
+
+.uniui-location-filled:before {
+  content: "\e6af";
+}
+
+.uniui-person-filled:before {
+  content: "\e69d";
+}
+
+.uniui-personadd-filled:before {
+  content: "\e698";
+}
+
+.uniui-back:before {
+  content: "\e6b9";
+}
+
+.uniui-forward:before {
+  content: "\e6ba";
+}
+
+.uniui-arrow-right:before {
+  content: "\e6bb";
+}
+
+.uniui-arrowthinright:before {
+  content: "\e6bb";
+}
+
+.uniui-arrow-left:before {
+  content: "\e6bc";
+}
+
+.uniui-arrowthinleft:before {
+  content: "\e6bc";
+}
+
+.uniui-arrow-up:before {
+  content: "\e6bd";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6bd";
+}
+
+.uniui-arrow-down:before {
+  content: "\e6be";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6be";
+}
+
+.uniui-bottom:before {
+  content: "\e6b8";
+}
+
+.uniui-arrowdown:before {
+  content: "\e6b8";
+}
+
+.uniui-right:before {
+  content: "\e6b5";
+}
+
+.uniui-arrowright:before {
+  content: "\e6b5";
+}
+
+.uniui-top:before {
+  content: "\e6b6";
+}
+
+.uniui-arrowup:before {
+  content: "\e6b6";
+}
+
+.uniui-left:before {
+  content: "\e6b7";
+}
+
+.uniui-arrowleft:before {
+  content: "\e6b7";
+}
+
+.uniui-eye:before {
+  content: "\e651";
+}
+
+.uniui-eye-filled:before {
+  content: "\e66a";
+}
+
+.uniui-eye-slash:before {
+  content: "\e6b3";
+}
+
+.uniui-eye-slash-filled:before {
+  content: "\e6b4";
+}
+
+.uniui-info-filled:before {
+  content: "\e649";
+}
+
+.uniui-reload:before {
+  content: "\e6b2";
+}
+
+.uniui-micoff-filled:before {
+  content: "\e6b0";
+}
+
+.uniui-map-pin-ellipse:before {
+  content: "\e6ac";
+}
+
+.uniui-map-pin:before {
+  content: "\e6ad";
+}
+
+.uniui-location:before {
+  content: "\e6ae";
+}
+
+.uniui-starhalf:before {
+  content: "\e683";
+}
+
+.uniui-star:before {
+  content: "\e688";
+}
+
+.uniui-star-filled:before {
+  content: "\e68f";
+}
+
+.uniui-calendar:before {
+  content: "\e6a0";
+}
+
+.uniui-fire:before {
+  content: "\e6a1";
+}
+
+.uniui-medal:before {
+  content: "\e6a2";
+}
+
+.uniui-font:before {
+  content: "\e6a3";
+}
+
+.uniui-gift:before {
+  content: "\e6a4";
+}
+
+.uniui-link:before {
+  content: "\e6a5";
+}
+
+.uniui-notification:before {
+  content: "\e6a6";
+}
+
+.uniui-staff:before {
+  content: "\e6a7";
+}
+
+.uniui-vip:before {
+  content: "\e6a8";
+}
+
+.uniui-folder-add:before {
+  content: "\e6a9";
+}
+
+.uniui-tune:before {
+  content: "\e6aa";
+}
+
+.uniui-auth:before {
+  content: "\e6ab";
+}
+
+.uniui-person:before {
+  content: "\e699";
+}
+
+.uniui-email-filled:before {
+  content: "\e69a";
+}
+
+.uniui-phone-filled:before {
+  content: "\e69b";
+}
+
+.uniui-phone:before {
+  content: "\e69c";
+}
+
+.uniui-email:before {
+  content: "\e69e";
+}
+
+.uniui-personadd:before {
+  content: "\e69f";
+}
+
+.uniui-chatboxes-filled:before {
+  content: "\e692";
+}
+
+.uniui-contact:before {
+  content: "\e693";
+}
+
+.uniui-chatbubble-filled:before {
+  content: "\e694";
+}
+
+.uniui-contact-filled:before {
+  content: "\e695";
+}
+
+.uniui-chatboxes:before {
+  content: "\e696";
+}
+
+.uniui-chatbubble:before {
+  content: "\e697";
+}
+
+.uniui-upload-filled:before {
+  content: "\e68e";
+}
+
+.uniui-upload:before {
+  content: "\e690";
+}
+
+.uniui-weixin:before {
+  content: "\e691";
+}
+
+.uniui-compose:before {
+  content: "\e67f";
+}
+
+.uniui-qq:before {
+  content: "\e680";
+}
+
+.uniui-download-filled:before {
+  content: "\e681";
+}
+
+.uniui-pyq:before {
+  content: "\e682";
+}
+
+.uniui-sound:before {
+  content: "\e684";
+}
+
+.uniui-trash-filled:before {
+  content: "\e685";
+}
+
+.uniui-sound-filled:before {
+  content: "\e686";
+}
+
+.uniui-trash:before {
+  content: "\e687";
+}
+
+.uniui-videocam-filled:before {
+  content: "\e689";
+}
+
+.uniui-spinner-cycle:before {
+  content: "\e68a";
+}
+
+.uniui-weibo:before {
+  content: "\e68b";
+}
+
+.uniui-videocam:before {
+  content: "\e68c";
+}
+
+.uniui-download:before {
+  content: "\e68d";
+}
+
+.uniui-help:before {
+  content: "\e679";
+}
+
+.uniui-navigate-filled:before {
+  content: "\e67a";
+}
+
+.uniui-plusempty:before {
+  content: "\e67b";
+}
+
+.uniui-smallcircle:before {
+  content: "\e67c";
+}
+
+.uniui-minus-filled:before {
+  content: "\e67d";
+}
+
+.uniui-micoff:before {
+  content: "\e67e";
+}
+
+.uniui-closeempty:before {
+  content: "\e66c";
+}
+
+.uniui-clear:before {
+  content: "\e66d";
+}
+
+.uniui-navigate:before {
+  content: "\e66e";
+}
+
+.uniui-minus:before {
+  content: "\e66f";
+}
+
+.uniui-image:before {
+  content: "\e670";
+}
+
+.uniui-mic:before {
+  content: "\e671";
+}
+
+.uniui-paperplane:before {
+  content: "\e672";
+}
+
+.uniui-close:before {
+  content: "\e673";
+}
+
+.uniui-help-filled:before {
+  content: "\e674";
+}
+
+.uniui-paperplane-filled:before {
+  content: "\e675";
+}
+
+.uniui-plus:before {
+  content: "\e676";
+}
+
+.uniui-mic-filled:before {
+  content: "\e677";
+}
+
+.uniui-image-filled:before {
+  content: "\e678";
+}
+
+.uniui-locked-filled:before {
+  content: "\e668";
+}
+
+.uniui-info:before {
+  content: "\e669";
+}
+
+.uniui-locked:before {
+  content: "\e66b";
+}
+
+.uniui-camera-filled:before {
+  content: "\e658";
+}
+
+.uniui-chat-filled:before {
+  content: "\e659";
+}
+
+.uniui-camera:before {
+  content: "\e65a";
+}
+
+.uniui-circle:before {
+  content: "\e65b";
+}
+
+.uniui-checkmarkempty:before {
+  content: "\e65c";
+}
+
+.uniui-chat:before {
+  content: "\e65d";
+}
+
+.uniui-circle-filled:before {
+  content: "\e65e";
+}
+
+.uniui-flag:before {
+  content: "\e65f";
+}
+
+.uniui-flag-filled:before {
+  content: "\e660";
+}
+
+.uniui-gear-filled:before {
+  content: "\e661";
+}
+
+.uniui-home:before {
+  content: "\e662";
+}
+
+.uniui-home-filled:before {
+  content: "\e663";
+}
+
+.uniui-gear:before {
+  content: "\e664";
+}
+
+.uniui-smallcircle-filled:before {
+  content: "\e665";
+}
+
+.uniui-map-filled:before {
+  content: "\e666";
+}
+
+.uniui-map:before {
+  content: "\e667";
+}
+
+.uniui-refresh-filled:before {
+  content: "\e656";
+}
+
+.uniui-refresh:before {
+  content: "\e657";
+}
+
+.uniui-cloud-upload:before {
+  content: "\e645";
+}
+
+.uniui-cloud-download-filled:before {
+  content: "\e646";
+}
+
+.uniui-cloud-download:before {
+  content: "\e647";
+}
+
+.uniui-cloud-upload-filled:before {
+  content: "\e648";
+}
+
+.uniui-redo:before {
+  content: "\e64a";
+}
+
+.uniui-images-filled:before {
+  content: "\e64b";
+}
+
+.uniui-undo-filled:before {
+  content: "\e64c";
+}
+
+.uniui-more:before {
+  content: "\e64d";
+}
+
+.uniui-more-filled:before {
+  content: "\e64e";
+}
+
+.uniui-undo:before {
+  content: "\e64f";
+}
+
+.uniui-images:before {
+  content: "\e650";
+}
+
+.uniui-paperclip:before {
+  content: "\e652";
+}
+
+.uniui-settings:before {
+  content: "\e653";
+}
+
+.uniui-search:before {
+  content: "\e654";
+}
+
+.uniui-redo-filled:before {
+  content: "\e655";
+}
+
+.uniui-list:before {
+  content: "\e644";
+}
+
+.uniui-mail-open-filled:before {
+  content: "\e63a";
+}
+
+.uniui-hand-down-filled:before {
+  content: "\e63c";
+}
+
+.uniui-hand-down:before {
+  content: "\e63d";
+}
+
+.uniui-hand-up-filled:before {
+  content: "\e63e";
+}
+
+.uniui-hand-up:before {
+  content: "\e63f";
+}
+
+.uniui-heart-filled:before {
+  content: "\e641";
+}
+
+.uniui-mail-open:before {
+  content: "\e643";
+}
+
+.uniui-heart:before {
+  content: "\e639";
+}
+
+.uniui-loop:before {
+  content: "\e633";
+}
+
+.uniui-pulldown:before {
+  content: "\e632";
+}
+
+.uniui-scan:before {
+  content: "\e62a";
+}
+
+.uniui-bars:before {
+  content: "\e627";
+}
+
+.uniui-cart-filled:before {
+  content: "\e629";
+}
+
+.uniui-checkbox:before {
+  content: "\e62b";
+}
+
+.uniui-checkbox-filled:before {
+  content: "\e62c";
+}
+
+.uniui-shop:before {
+  content: "\e62f";
+}
+
+.uniui-headphones:before {
+  content: "\e630";
+}
+
+.uniui-cart:before {
+  content: "\e631";
+}
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
new file mode 100644
index 0000000..835f33b
Binary files /dev/null and b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf differ
diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
new file mode 100644
index 0000000..d1c4e77
--- /dev/null
+++ b/uni_modules/uni-icons/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-icons",
+  "displayName": "uni-icons 图标",
+  "version": "1.3.5",
+  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "icon",
+    "图标"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.2.14"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["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-icons/readme.md b/uni_modules/uni-icons/readme.md
new file mode 100644
index 0000000..86234ba
--- /dev/null
+++ b/uni_modules/uni-icons/readme.md
@@ -0,0 +1,8 @@
+## Icons 图标
+> **组件名：uni-icons**
+> 代码块： `uIcons`
+
+用于展示 icons 图标 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-icons)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-indexed-list/changelog.md b/uni_modules/uni-indexed-list/changelog.md
new file mode 100644
index 0000000..08fa71c
--- /dev/null
+++ b/uni_modules/uni-indexed-list/changelog.md
@@ -0,0 +1,17 @@
+## 1.2.1（2021-11-22）
+- 修复 vue3中某些scss变量无法找到的问题
+## 1.2.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-indexed-list](https://uniapp.dcloud.io/component/uniui/uni-indexed-list)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.11（2021-05-12）
+- 新增 组件示例地址
+## 1.0.10（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.8（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 PC 端
diff --git a/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list-item.vue b/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list-item.vue
new file mode 100644
index 0000000..19284bd
--- /dev/null
+++ b/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list-item.vue
@@ -0,0 +1,144 @@
+<template>
+	<view>
+		<view v-if="loaded || list.itemIndex < 15" class="uni-indexed-list__title-wrapper">
+			<text v-if="list.items && list.items.length > 0" class="uni-indexed-list__title">{{ list.key }}</text>
+		</view>
+		<view v-if="(loaded || list.itemIndex < 15) && list.items && list.items.length > 0" class="uni-indexed-list__list">
+			<view v-for="(item, index) in list.items" :key="index" class="uni-indexed-list__item" hover-class="uni-indexed-list__item--hover">
+				<view class="uni-indexed-list__item-container" @click="onClick(idx, index)">
+					<view class="uni-indexed-list__item-border" :class="{'uni-indexed-list__item-border--last':index===list.items.length-1}">
+						<view v-if="showSelect" style="margin-right: 20rpx;">
+							<uni-icons :type="item.checked ? 'checkbox-filled' : 'circle'" :color="item.checked ? '#007aff' : '#C0C0C0'" size="24" />
+						</view>
+						<text class="uni-indexed-list__item-content">{{ item.name }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'UniIndexedList',
+		emits:['itemClick'],
+		props: {
+			loaded: {
+				type: Boolean,
+				default: false
+			},
+			idx: {
+				type: Number,
+				default: 0
+			},
+			list: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			showSelect: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			onClick(idx, index) {
+				this.$emit("itemClick", {
+					idx,
+					index
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-indexed-list__list {
+		background-color: $uni-bg-color;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		border-top-style: solid;
+		border-top-width: 1px;
+		border-top-color: #DEDEDE;
+	}
+
+	.uni-indexed-list__item {
+		font-size: 14px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.uni-indexed-list__item-container {
+		padding-left: 15px;
+		flex: 1;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-indexed-list__item-border {
+		flex: 1;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		height: 50px;
+		padding: 25px;
+		padding-left: 0;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+		border-bottom-color:  #DEDEDE;
+	}
+
+	.uni-indexed-list__item-border--last {
+		border-bottom-width: 0px;
+	}
+
+	.uni-indexed-list__item-content {
+		flex: 1;
+		font-size: 14px;
+		color: #191919;
+	}
+
+	.uni-indexed-list {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-indexed-list__title-wrapper {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		width: 100%;
+		/* #endif */
+		background-color: #f7f7f7;
+	}
+
+	.uni-indexed-list__title {
+		padding: 6px 12px;
+		line-height: 24px;
+		font-size: 16px;
+		font-weight: 500;
+	}
+</style>
diff --git a/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list.vue b/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list.vue
new file mode 100644
index 0000000..ee3a7ec
--- /dev/null
+++ b/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list.vue
@@ -0,0 +1,367 @@
+<template>
+	<view class="uni-indexed-list" ref="list" id="list">
+		<!-- #ifdef APP-NVUE -->
+		<list class="uni-indexed-list__scroll" scrollable="true" show-scrollbar="false">
+			<cell v-for="(list, idx) in lists" :key="idx" :ref="'uni-indexed-list-' + idx">
+				<!-- #endif -->
+				<!-- #ifndef APP-NVUE -->
+				<scroll-view :scroll-into-view="scrollViewId" class="uni-indexed-list__scroll" scroll-y>
+					<view v-for="(list, idx) in lists" :key="idx" :id="'uni-indexed-list-' + idx">
+						<!-- #endif -->
+						<indexed-list-item :list="list" :loaded="loaded" :idx="idx" :showSelect="showSelect"
+							@itemClick="onClick"></indexed-list-item>
+						<!-- #ifndef APP-NVUE -->
+					</view>
+				</scroll-view>
+				<!-- #endif -->
+				<!-- #ifdef APP-NVUE -->
+			</cell>
+		</list>
+		<!-- #endif -->
+		<view class="uni-indexed-list__menu" @touchstart="touchStart" @touchmove.stop.prevent="touchMove"
+			@touchend="touchEnd" @mousedown.stop="mousedown" @mousemove.stop.prevent="mousemove"
+			@mouseleave.stop="mouseleave">
+			<view v-for="(list, key) in lists" :key="key" class="uni-indexed-list__menu-item"
+				:class="touchmoveIndex == key ? 'uni-indexed-list__menu--active' : ''">
+				<text class="uni-indexed-list__menu-text"
+					:class="touchmoveIndex == key ? 'uni-indexed-list__menu-text--active' : ''">{{ list.key }}</text>
+			</view>
+		</view>
+		<view v-if="touchmove" class="uni-indexed-list__alert-wrapper">
+			<text class="uni-indexed-list__alert">{{ lists[touchmoveIndex].key }}</text>
+		</view>
+	</view>
+</template>
+<script>
+	import indexedListItem from './uni-indexed-list-item.vue'
+	// #ifdef APP-NVUE
+	const dom = weex.requireModule('dom');
+	// #endif
+	// #ifdef APP-PLUS
+	function throttle(func, delay) {
+		var prev = Date.now();
+		return function() {
+			var context = this;
+			var args = arguments;
+			var now = Date.now();
+			if (now - prev >= delay) {
+				func.apply(context, args);
+				prev = Date.now();
+			}
+		}
+	}
+
+	function touchMove(e) {
+		let pageY = e.touches[0].pageY
+		let index = Math.floor((pageY - this.winOffsetY) / this.itemHeight)
+		if (this.touchmoveIndex === index) {
+			return false
+		}
+		let item = this.lists[index]
+		if (item) {
+			// #ifndef APP-NVUE
+			this.scrollViewId = 'uni-indexed-list-' + index
+			this.touchmoveIndex = index
+			// #endif
+			// #ifdef APP-NVUE
+			dom.scrollToElement(this.$refs['uni-indexed-list-' + index][0], {
+				animated: false
+			})
+			this.touchmoveIndex = index
+			// #endif
+		}
+	}
+	const throttleTouchMove = throttle(touchMove, 40)
+	// #endif
+
+	/**
+	 * IndexedList 索引列表
+	 * @description 用于展示索引列表
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=375
+	 * @property {Boolean} showSelect = [true|false] 展示模式
+	 * 	@value true 展示模式
+	 * 	@value false 选择模式
+	 * @property {Object} options 索引列表需要的数据对象
+	 * @event {Function} click 点击列表事件 ，返回当前选择项的事件对象
+	 * @example <uni-indexed-list options="" showSelect="false" @click=""></uni-indexed-list>
+	 */
+	export default {
+		name: 'UniIndexedList',
+		components: {
+			indexedListItem
+		},
+		emits: ['click'],
+		props: {
+			options: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			showSelect: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				lists: [],
+				winHeight: 0,
+				itemHeight: 0,
+				winOffsetY: 0,
+				touchmove: false,
+				touchmoveIndex: -1,
+				scrollViewId: '',
+				touchmovable: true,
+				loaded: false,
+				isPC: false
+			}
+		},
+		watch: {
+			options: {
+				handler: function() {
+					this.setList()
+				},
+				deep: true
+			}
+		},
+		mounted() {
+			// #ifdef H5
+			this.isPC = this.IsPC()
+			// #endif
+			setTimeout(() => {
+				this.setList()
+			}, 50)
+			setTimeout(() => {
+				this.loaded = true
+			}, 300);
+		},
+		methods: {
+			setList() {
+				let index = 0;
+				this.lists = []
+				this.options.forEach((value, index) => {
+					if (value.data.length === 0) {
+						return
+					}
+					let indexBefore = index
+					let items = value.data.map(item => {
+						let obj = {}
+						obj['key'] = value.letter
+						obj['name'] = item
+						obj['itemIndex'] = index
+						index++
+						obj.checked = item.checked ? item.checked : false
+						return obj
+					})
+					this.lists.push({
+						title: value.letter,
+						key: value.letter,
+						items: items,
+						itemIndex: indexBefore
+					})
+				})
+				// #ifndef APP-NVUE
+				uni.createSelectorQuery()
+					.in(this)
+					.select('#list')
+					.boundingClientRect()
+					.exec(ret => {
+						this.winOffsetY = ret[0].top
+						this.winHeight = ret[0].height
+						this.itemHeight = this.winHeight / this.lists.length
+					})
+				// #endif
+				// #ifdef APP-NVUE
+				dom.getComponentRect(this.$refs['list'], (res) => {
+					this.winOffsetY = res.size.top
+					this.winHeight = res.size.height
+					this.itemHeight = this.winHeight / this.lists.length
+				})
+				// #endif
+			},
+			touchStart(e) {
+				this.touchmove = true
+				let pageY = this.isPC ? e.pageY : e.touches[0].pageY
+				let index = Math.floor((pageY - this.winOffsetY) / this.itemHeight)
+				let item = this.lists[index]
+				if (item) {
+					this.scrollViewId = 'uni-indexed-list-' + index
+					this.touchmoveIndex = index
+					// #ifdef APP-NVUE
+					dom.scrollToElement(this.$refs['uni-indexed-list-' + index][0], {
+						animated: false
+					})
+					// #endif
+				}
+			},
+			touchMove(e) {
+				// #ifndef APP-PLUS
+				let pageY = this.isPC ? e.pageY : e.touches[0].pageY
+				let index = Math.floor((pageY - this.winOffsetY) / this.itemHeight)
+				if (this.touchmoveIndex === index) {
+					return false
+				}
+				let item = this.lists[index]
+				if (item) {
+					this.scrollViewId = 'uni-indexed-list-' + index
+					this.touchmoveIndex = index
+				}
+				// #endif
+				// #ifdef APP-PLUS
+				throttleTouchMove.call(this, e)
+				// #endif
+			},
+			touchEnd() {
+				this.touchmove = false
+				// this.touchmoveIndex = -1
+			},
+
+			/**
+			 * 兼容 PC @tian
+			 */
+
+			mousedown(e) {
+				if (!this.isPC) return
+				this.touchStart(e)
+			},
+			mousemove(e) {
+				if (!this.isPC) return
+				this.touchMove(e)
+			},
+			mouseleave(e) {
+				if (!this.isPC) return
+				this.touchEnd(e)
+			},
+
+			// #ifdef H5
+			IsPC() {
+				var userAgentInfo = navigator.userAgent;
+				var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+				var flag = true;
+				for (let v = 0; v < Agents.length - 1; v++) {
+					if (userAgentInfo.indexOf(Agents[v]) > 0) {
+						flag = false;
+						break;
+					}
+				}
+				return flag;
+			},
+			// #endif
+
+
+			onClick(e) {
+				let {
+					idx,
+					index
+				} = e
+				let obj = {}
+				for (let key in this.lists[idx].items[index]) {
+					obj[key] = this.lists[idx].items[index][key]
+				}
+				let select = []
+				if (this.showSelect) {
+					this.lists[idx].items[index].checked = !this.lists[idx].items[index].checked
+					this.lists.forEach((value, idx) => {
+						value.items.forEach((item, index) => {
+							if (item.checked) {
+								let obj = {}
+								for (let key in this.lists[idx].items[index]) {
+									obj[key] = this.lists[idx].items[index][key]
+								}
+								select.push(obj)
+							}
+						})
+					})
+				}
+				this.$emit('click', {
+					item: obj,
+					select: select
+				})
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.uni-indexed-list {
+		position: absolute;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-indexed-list__scroll {
+		flex: 1;
+	}
+
+	.uni-indexed-list__menu {
+		width: 24px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-indexed-list__menu-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		align-items: center;
+		justify-content: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-indexed-list__menu-text {
+		font-size: 12px;
+		text-align: center;
+		color: #aaa;
+	}
+
+	.uni-indexed-list__menu--active {
+		// background-color: rgb(200, 200, 200);
+	}
+
+	.uni-indexed-list__menu--active {}
+
+	.uni-indexed-list__menu-text--active {
+		border-radius: 16px;
+		width: 16px;
+		height: 16px;
+		line-height: 16px;
+		background-color: #007aff;
+		color: #fff;
+	}
+
+	.uni-indexed-list__alert-wrapper {
+		position: absolute;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-indexed-list__alert {
+		width: 80px;
+		height: 80px;
+		border-radius: 80px;
+		text-align: center;
+		line-height: 80px;
+		font-size: 35px;
+		color: #fff;
+		background-color: rgba(0, 0, 0, 0.5);
+	}
+</style>
diff --git a/uni_modules/uni-indexed-list/package.json b/uni_modules/uni-indexed-list/package.json
new file mode 100644
index 0000000..125c0e7
--- /dev/null
+++ b/uni_modules/uni-indexed-list/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "uni-indexed-list",
+  "displayName": "uni-indexed-list 索引列表",
+  "version": "1.2.1",
+  "description": "索引列表组件，右侧带索引的列表，方便快速定位到具体内容，通常用于城市/机场选择等场景",
+  "keywords": [
+    "uni-ui",
+    "索引列表",
+    "索引",
+    "列表"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "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-indexed-list/readme.md b/uni_modules/uni-indexed-list/readme.md
new file mode 100644
index 0000000..44ad84b
--- /dev/null
+++ b/uni_modules/uni-indexed-list/readme.md
@@ -0,0 +1,11 @@
+
+
+## IndexedList 索引列表
+> **组件名：uni-indexed-list**
+> 代码块： `uIndexedList`
+
+
+用于展示索引列表。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-indexed-list)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-link/changelog.md b/uni_modules/uni-link/changelog.md
new file mode 100644
index 0000000..2cfbf59
--- /dev/null
+++ b/uni_modules/uni-link/changelog.md
@@ -0,0 +1,17 @@
+## 1.0.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-link](https://uniapp.dcloud.io/component/uniui/uni-link)
+## 1.1.7（2021-11-08）
+## 0.0.7（2021-09-03）
+- 修复 在 nvue 下不显示的 bug
+## 0.0.6（2021-07-30）
+- 新增 支持自定义插槽
+## 0.0.5（2021-06-21）
+- 新增 download 属性，H5平台下载文件名
+## 0.0.4（2021-05-12）
+- 新增 组件示例地址
+## 0.0.3（2021-03-09）
+- 新增 href 属性支持 tel:|mailto:
+
+## 0.0.2（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-link/components/uni-link/uni-link.vue b/uni_modules/uni-link/components/uni-link/uni-link.vue
new file mode 100644
index 0000000..27c5468
--- /dev/null
+++ b/uni_modules/uni-link/components/uni-link/uni-link.vue
@@ -0,0 +1,128 @@
+<template>
+	<a v-if="isShowA" class="uni-link" :href="href"
+		:class="{'uni-link--withline':showUnderLine===true||showUnderLine==='true'}"
+		:style="{color,fontSize:fontSize+'px'}" :download="download">
+		<slot>{{text}}</slot>
+	</a>
+	<!-- #ifndef APP-NVUE -->
+	<text v-else class="uni-link" :class="{'uni-link--withline':showUnderLine===true||showUnderLine==='true'}"
+		:style="{color,fontSize:fontSize+'px'}" @click="openURL">
+		<slot>{{text}}</slot>
+	</text>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<text v-else class="uni-link" :class="{'uni-link--withline':showUnderLine===true||showUnderLine==='true'}"
+		:style="{color,fontSize:fontSize+'px'}" @click="openURL">
+		{{text}}
+	</text>
+	<!-- #endif -->
+</template>
+
+<script>
+	/**
+	 * Link 外部网页超链接组件
+	 * @description uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打开新网页
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=1182
+	 * @property {String} href 点击后打开的外部网页url
+	 * @property {String} text 显示的文字
+	 * @property {String} downlaod H5平台下载文件名
+	 * @property {Boolean} showUnderLine 是否显示下划线
+	 * @property {String} copyTips 在小程序端复制链接时显示的提示语
+	 * @property {String} color 链接文字颜色
+	 * @property {String} fontSize 链接文字大小
+	 * @example * <uni-link href="https://ext.dcloud.net.cn" text="https://ext.dcloud.net.cn"></uni-link>
+	 */
+	export default {
+		name: 'uniLink',
+		props: {
+			href: {
+				type: String,
+				default: ''
+			},
+			text: {
+				type: String,
+				default: ''
+			},
+			download: {
+				type: String,
+				default: ''
+			},
+			showUnderLine: {
+				type: [Boolean, String],
+				default: true
+			},
+			copyTips: {
+				type: String,
+				default: '已自动复制网址，请在手机浏览器里粘贴该网址'
+			},
+			color: {
+				type: String,
+				default: '#999999'
+			},
+			fontSize: {
+				type: [Number, String],
+				default: 14
+			}
+		},
+		computed: {
+			isShowA() {
+				// #ifdef H5
+				this._isH5 = true;
+				// #endif
+				if ((this.isMail() || this.isTel()) && this._isH5 === true) {
+					return true;
+				}
+				return false;
+			}
+		},
+		created() {
+			this._isH5 = null;
+		},
+		methods: {
+			isMail() {
+				return this.href.startsWith('mailto:');
+			},
+			isTel() {
+				return this.href.startsWith('tel:');
+			},
+			openURL() {
+				// #ifdef APP-PLUS
+				if (this.isTel()) {
+					this.makePhoneCall(this.href.replace('tel:', ''));
+				} else {
+					plus.runtime.openURL(this.href);
+				}
+				// #endif
+				// #ifdef H5
+				window.open(this.href)
+				// #endif
+				// #ifdef MP
+				uni.setClipboardData({
+					data: this.href
+				});
+				uni.showModal({
+					content: this.copyTips,
+					showCancel: false
+				});
+				// #endif
+			},
+			makePhoneCall(phoneNumber) {
+				uni.makePhoneCall({
+					phoneNumber
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	/* #ifndef APP-NVUE */
+	.uni-link {
+		cursor: pointer;
+	}
+
+	/* #endif */
+	.uni-link--withline {
+		text-decoration: underline;
+	}
+</style>
diff --git a/uni_modules/uni-link/package.json b/uni_modules/uni-link/package.json
new file mode 100644
index 0000000..77b1986
--- /dev/null
+++ b/uni_modules/uni-link/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-link",
+  "displayName": "uni-link 超链接",
+  "version": "1.0.0",
+  "description": "uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "link",
+    "超链接",
+    ""
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["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"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-link/readme.md b/uni_modules/uni-link/readme.md
new file mode 100644
index 0000000..7f09e94
--- /dev/null
+++ b/uni_modules/uni-link/readme.md
@@ -0,0 +1,11 @@
+
+
+## Link 链接
+> **组件名：uni-link**
+> 代码块： `uLink`
+
+
+uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打开新网页。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-link)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-list/changelog.md b/uni_modules/uni-list/changelog.md
new file mode 100644
index 0000000..6aa6e4e
--- /dev/null
+++ b/uni_modules/uni-list/changelog.md
@@ -0,0 +1,20 @@
+## 1.2.1（2022-03-30）
+- 删除无用文件
+## 1.2.0（2021-11-23）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-list](https://uniapp.dcloud.io/component/uniui/uni-list)
+## 1.1.3（2021-08-30）
+- 修复 在vue3中to属性在发行应用的时候报错的bug
+## 1.1.2（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.1.1（2021-07-21）
+- 修复 与其他组件嵌套使用时，点击失效的Bug
+## 1.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.17（2021-05-12）
+- 新增 组件示例地址
+## 1.0.16（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.0.15（2021-02-05）
+- 调整为uni_modules目录规范
+- 修复 uni-list-chat 角标显示不正常的问题
diff --git a/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue b/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue
new file mode 100644
index 0000000..b9349c2
--- /dev/null
+++ b/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue
@@ -0,0 +1,107 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<cell>
+		<!-- #endif -->
+		<view class="uni-list-ad">
+			<view v-if="borderShow" :class="{'uni-list--border':border,'uni-list-item--first':isFirstChild}"></view>
+			<ad style="width: 200px;height: 300px;border-width: 1px;border-color: red;border-style: solid;" adpid="1111111111"
+			 unit-id="" appid="" apid="" type="feed" @error="aderror" @close="closeAd"></ad>
+		</view>
+		<!-- #ifdef APP-NVUE -->
+	</cell>
+	<!-- #endif -->
+
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = uni.requireNativePlugin('dom');
+	// #endif
+	export default {
+		name: 'UniListAd',
+		props: {
+			title: {
+				type: String,
+				default: '',
+
+			}
+		},
+		// inject: ['list'],
+		data() {
+			return {
+				isFirstChild: false,
+				border: false,
+				borderShow: true,
+			}
+		},
+
+		mounted() {
+			this.list = this.getForm()
+			if (this.list) {
+				if (!this.list.firstChildAppend) {
+					this.list.firstChildAppend = true
+					this.isFirstChild = true
+				}
+				this.border = this.list.border
+			}
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniList') {
+				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;
+			},
+			aderror(e) {
+				console.log("aderror: " + JSON.stringify(e.detail));
+			},
+			closeAd(e) {
+				this.borderShow = false
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-list-ad {
+		position: relative;
+		border: 1px red solid;
+	}
+
+	.uni-list--border {
+		position: relative;
+		padding-bottom: 1px;
+		/* #ifdef APP-PLUS */
+		border-top-color: $uni-border-color;
+		border-top-style: solid;
+		border-top-width: 0.5px;
+		/* #endif */
+		margin-left: $uni-spacing-row-lg;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-list--border:after {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		height: 1px;
+		content: '';
+		-webkit-transform: scaleY(.5);
+		transform: scaleY(.5);
+		background-color: $uni-border-color;
+	}
+
+	.uni-list-item--first:after {
+		height: 0px;
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.scss b/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.scss
new file mode 100644
index 0000000..311f8d9
--- /dev/null
+++ b/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.scss
@@ -0,0 +1,58 @@
+/**
+ * 这里是 uni-list 组件内置的常用样式变量
+ * 如果需要覆盖样式，这里提供了基本的组件样式变量，您可以尝试修改这里的变量，去完成样式替换，而不用去修改源码
+ *
+ */
+
+// 背景色
+$background-color : #fff;
+// 分割线颜色
+$divide-line-color : #e5e5e5;
+
+// 默认头像大小，如需要修改此值，注意同步修改 js 中的值 const avatarWidth = xx ，目前只支持方形头像
+// nvue 页面不支持修改头像大小
+$avatar-width : 45px ;
+
+// 头像边框
+$avatar-border-radius: 5px;
+$avatar-border-color: #eee;
+$avatar-border-width: 1px;
+
+// 标题文字样式
+$title-size : 16px;
+$title-color : #3b4144;
+$title-weight : normal;
+
+// 描述文字样式
+$note-size : 12px;
+$note-color : #999;
+$note-weight : normal;
+
+// 右侧额外内容默认样式
+$right-text-size : 12px;
+$right-text-color : #999;
+$right-text-weight : normal;
+
+// 角标样式
+// nvue 页面不支持修改圆点位置以及大小
+// 角标在左侧时，角标的位置，默认为 0 ，负数左/下移动，正数右/上移动
+$badge-left: 0px;
+$badge-top: 0px;
+
+// 显示圆点时，圆点大小
+$dot-width: 10px;
+$dot-height: 10px;
+
+// 显示角标时，角标大小和字体大小
+$badge-size : 18px;
+$badge-font : 12px;
+// 显示角标时，角标前景色
+$badge-color : #fff;
+// 显示角标时，角标背景色
+$badge-background-color : #ff5a5f;
+// 显示角标时，角标左右间距
+$badge-space : 6px;
+
+// 状态样式
+// 选中颜色
+$hover : #f5f5f5;
diff --git a/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue b/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue
new file mode 100644
index 0000000..2b31008
--- /dev/null
+++ b/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue
@@ -0,0 +1,538 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<cell>
+		<!-- #endif -->
+		<view :hover-class="!clickable && !link ? '' : 'uni-list-chat--hover'" class="uni-list-chat" @click.stop="onClick">
+			<view :class="{ 'uni-list--border': border, 'uni-list-chat--first': isFirstChild }"></view>
+			<view class="uni-list-chat__container">
+				<view class="uni-list-chat__header-warp">
+					<view v-if="avatarCircle || avatarList.length === 0" class="uni-list-chat__header" :class="{ 'header--circle': avatarCircle }">
+						<image class="uni-list-chat__header-image" :class="{ 'header--circle': avatarCircle }" :src="avatar" mode="aspectFill"></image>
+					</view>
+					<!-- 头像组 -->
+					<view v-else class="uni-list-chat__header">
+						<view v-for="(item, index) in avatarList" :key="index" class="uni-list-chat__header-box" :class="computedAvatar"
+						 :style="{ width: imageWidth + 'px', height: imageWidth + 'px' }">
+							<image class="uni-list-chat__header-image" :style="{ width: imageWidth + 'px', height: imageWidth + 'px' }" :src="item.url"
+							 mode="aspectFill"></image>
+						</view>
+					</view>
+				</view>
+				<view v-if="badgeText && badgePositon === 'left'" class="uni-list-chat__badge uni-list-chat__badge-pos" :class="[isSingle]">
+					<text class="uni-list-chat__badge-text">{{ badgeText === 'dot' ? '' : badgeText }}</text>
+				</view>
+				<view class="uni-list-chat__content">
+					<view class="uni-list-chat__content-main">
+						<text class="uni-list-chat__content-title uni-ellipsis">{{ title }}</text>
+						<text class="uni-list-chat__content-note uni-ellipsis">{{ note }}</text>
+					</view>
+					<view class="uni-list-chat__content-extra">
+						<slot>
+							<text class="uni-list-chat__content-extra-text">{{ time }}</text>
+							<view v-if="badgeText && badgePositon === 'right'" class="uni-list-chat__badge" :class="[isSingle, badgePositon === 'right' ? 'uni-list-chat--right' : '']">
+								<text class="uni-list-chat__badge-text">{{ badgeText === 'dot' ? '' : badgeText }}</text>
+							</view>
+						</slot>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- #ifdef APP-NVUE -->
+	</cell>
+	<!-- #endif -->
+</template>
+
+<script>
+	// 头像大小
+	const avatarWidth = 45;
+
+	/**
+	 * ListChat 聊天列表
+	 * @description 聊天列表,用于创建聊天类列表
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=24
+	 * @property {String} 	title 							标题
+	 * @property {String} 	note 							描述
+	 * @property {Boolean} 	clickable = [true|false] 		是否开启点击反馈，默认为false
+	 * @property {String} 	badgeText						数字角标内容
+	 * @property {String}  	badgePositon = [left|right]		角标位置，默认为 right
+	 * @property {String} 	link = [false｜navigateTo|redirectTo|reLaunch|switchTab] 是否展示右侧箭头并开启点击反馈，默认为false
+	 *  @value false	 	不开启
+	 *  @value navigateTo 	同 uni.navigateTo()
+	 * 	@value redirectTo 	同 uni.redirectTo()
+	 * 	@value reLaunch   	同 uni.reLaunch()
+	 * 	@value switchTab  	同 uni.switchTab()
+	 * @property {String | PageURIString} 	to  			跳转目标页面
+	 * @property {String} 	time							右侧时间显示
+	 * @property {Boolean} 	avatarCircle = [true|false]		是否显示圆形头像，默认为false
+	 * @property {String} 	avatar							头像地址，avatarCircle 不填时生效
+	 * @property {Array} 	avatarList 						头像组，格式为 [{url:''}]
+	 * @event {Function} 	click 							点击 uniListChat 触发事件
+	 */
+	export default {
+		name: 'UniListChat',
+		emits:['click'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			note: {
+				type: String,
+				default: ''
+			},
+			clickable: {
+				type: Boolean,
+				default: false
+			},
+			link: {
+				type: [Boolean, String],
+				default: false
+			},
+			to: {
+				type: String,
+				default: ''
+			},
+			badgeText: {
+				type: [String, Number],
+				default: ''
+			},
+			badgePositon: {
+				type: String,
+				default: 'right'
+			},
+			time: {
+				type: String,
+				default: ''
+			},
+			avatarCircle: {
+				type: Boolean,
+				default: false
+			},
+			avatar: {
+				type: String,
+				default: ''
+			},
+			avatarList: {
+				type: Array,
+				default () {
+					return [];
+				}
+			}
+		},
+		// inject: ['list'],
+		computed: {
+			isSingle() {
+				if (this.badgeText === 'dot') {
+					return 'uni-badge--dot';
+				} else {
+					const badgeText = this.badgeText.toString();
+					if (badgeText.length > 1) {
+						return 'uni-badge--complex';
+					} else {
+						return 'uni-badge--single';
+					}
+				}
+			},
+			computedAvatar() {
+				if (this.avatarList.length > 4) {
+					this.imageWidth = avatarWidth * 0.31;
+					return 'avatarItem--3';
+				} else if (this.avatarList.length > 1) {
+					this.imageWidth = avatarWidth * 0.47;
+					return 'avatarItem--2';
+				} else {
+					this.imageWidth = avatarWidth;
+					return 'avatarItem--1';
+				}
+			}
+		},
+		data() {
+			return {
+				isFirstChild: false,
+				border: true,
+				// avatarList: 3,
+				imageWidth: 50
+			};
+		},
+		mounted() {
+			this.list = this.getForm()
+			if (this.list) {
+				if (!this.list.firstChildAppend) {
+					this.list.firstChildAppend = true;
+					this.isFirstChild = true;
+				}
+				this.border = this.list.border;
+			}
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniList') {
+				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;
+			},
+			onClick() {
+				if (this.to !== '') {
+					this.openPage();
+					return;
+				}
+
+				if (this.clickable || this.link) {
+					this.$emit('click', {
+						data: {}
+					});
+				}
+			},
+			openPage() {
+				if (['navigateTo', 'redirectTo', 'reLaunch', 'switchTab'].indexOf(this.link) !== -1) {
+					this.pageApi(this.link);
+				} else {
+					this.pageApi('navigateTo');
+				}
+			},
+			pageApi(api) {
+				uni[api]({
+					url: this.to,
+					success: res => {
+						this.$emit('click', {
+							data: res
+						});
+					},
+					fail: err => {
+						this.$emit('click', {
+							data: err
+						});
+						console.error(err.errMsg);
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss" >
+	$uni-font-size-lg:16px;
+	$uni-spacing-row-sm: 5px;
+	$uni-spacing-row-base: 10px;
+	$uni-spacing-row-lg: 15px;
+	$background-color: #fff;
+	$divide-line-color: #e5e5e5;
+	$avatar-width: 45px;
+	$avatar-border-radius: 5px;
+	$avatar-border-color: #eee;
+	$avatar-border-width: 1px;
+	$title-size: 16px;
+	$title-color: #3b4144;
+	$title-weight: normal;
+	$note-size: 12px;
+	$note-color: #999;
+	$note-weight: normal;
+	$right-text-size: 12px;
+	$right-text-color: #999;
+	$right-text-weight: normal;
+	$badge-left: 0px;
+	$badge-top: 0px;
+	$dot-width: 10px;
+	$dot-height: 10px;
+	$badge-size: 18px;
+	$badge-font: 12px;
+	$badge-color: #fff;
+	$badge-background-color: #ff5a5f;
+	$badge-space: 6px;
+	$hover: #f5f5f5;
+
+	.uni-list-chat {
+		font-size: $uni-font-size-lg;
+		position: relative;
+		flex-direction: column;
+		justify-content: space-between;
+		background-color: $background-color;
+	}
+
+	// .uni-list-chat--disabled {
+	// 	opacity: 0.3;
+	// }
+
+	.uni-list-chat--hover {
+		background-color: $hover;
+	}
+
+	.uni-list--border {
+		position: relative;
+		margin-left: $uni-spacing-row-lg;
+		/* #ifdef APP-PLUS */
+		border-top-color: $divide-line-color;
+		border-top-style: solid;
+		border-top-width: 0.5px;
+		/* #endif */
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-list--border:after {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		height: 1px;
+		content: '';
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+		background-color: $divide-line-color;
+	}
+
+	.uni-list-item--first:after {
+		height: 0px;
+	}
+
+	/* #endif */
+
+	.uni-list-chat--first {
+		border-top-width: 0px;
+	}
+
+	.uni-ellipsis {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		/* #endif */
+	}
+
+	.uni-ellipsis-2 {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+		/* #endif */
+
+		/* #ifdef APP-NVUE */
+		lines: 2;
+		/* #endif */
+	}
+
+	.uni-list-chat__container {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+		padding: $uni-spacing-row-base $uni-spacing-row-lg;
+		position: relative;
+		overflow: hidden;
+	}
+
+	.uni-list-chat__header-warp {
+		position: relative;
+	}
+
+	.uni-list-chat__header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		align-content: center;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		flex-wrap: wrap-reverse;
+		/* #ifdef APP-NVUE */
+		width: 50px;
+		height: 50px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		width: $avatar-width;
+		height: $avatar-width;
+		/* #endif */
+
+		border-radius: $avatar-border-radius;
+		border-color: $avatar-border-color;
+		border-width: $avatar-border-width;
+		border-style: solid;
+		overflow: hidden;
+	}
+
+	.uni-list-chat__header-box {
+		/* #ifndef APP-PLUS */
+		box-sizing: border-box;
+		display: flex;
+		width: $avatar-width;
+		height: $avatar-width;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 50px;
+		height: 50px;
+		/* #endif */
+		overflow: hidden;
+		border-radius: 2px;
+	}
+
+	.uni-list-chat__header-image {
+		margin: 1px;
+		/* #ifdef APP-NVUE */
+		width: 50px;
+		height: 50px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		width: $avatar-width;
+		height: $avatar-width;
+		/* #endif */
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-list-chat__header-image {
+		display: block;
+		width: 100%;
+		height: 100%;
+	}
+
+	.avatarItem--1 {
+		width: 100%;
+		height: 100%;
+	}
+
+	.avatarItem--2 {
+		width: 47%;
+		height: 47%;
+	}
+
+	.avatarItem--3 {
+		width: 32%;
+		height: 32%;
+	}
+
+	/* #endif */
+	.header--circle {
+		border-radius: 50%;
+	}
+
+	.uni-list-chat__content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+		overflow: hidden;
+		padding: 2px 0;
+	}
+
+	.uni-list-chat__content-main {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: space-between;
+		padding-left: $uni-spacing-row-base;
+		flex: 1;
+		overflow: hidden;
+	}
+
+	.uni-list-chat__content-title {
+		font-size: $title-size;
+		color: $title-color;
+		font-weight: $title-weight;
+		overflow: hidden;
+	}
+
+	.uni-list-chat__content-note {
+		margin-top: 3px;
+		color: $note-color;
+		font-size: $note-size;
+		font-weight: $title-weight;
+		overflow: hidden;
+	}
+
+	.uni-list-chat__content-extra {
+		/* #ifndef APP-NVUE */
+		flex-shrink: 0;
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: space-between;
+		align-items: flex-end;
+		margin-left: 5px;
+	}
+
+	.uni-list-chat__content-extra-text {
+		color: $right-text-color;
+		font-size: $right-text-size;
+		font-weight: $right-text-weight;
+		overflow: hidden;
+	}
+
+	.uni-list-chat__badge-pos {
+		position: absolute;
+		/* #ifdef APP-NVUE */
+		left: 55px;
+		top: 3px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		left: calc(#{$avatar-width} + 10px - #{$badge-space} + #{$badge-left});
+		top: calc(#{$uni-spacing-row-base}/ 2 + 1px + #{$badge-top});
+		/* #endif */
+	}
+
+	.uni-list-chat__badge {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		border-radius: 100px;
+		background-color: $badge-background-color;
+	}
+
+	.uni-list-chat__badge-text {
+		color: $badge-color;
+		font-size: $badge-font;
+	}
+
+	.uni-badge--single {
+		/* #ifndef APP-NVUE */
+		// left: calc(#{$avatar-width} + 7px + #{$badge-left});
+		/* #endif */
+		width: $badge-size;
+		height: $badge-size;
+	}
+
+	.uni-badge--complex {
+		/* #ifdef APP-NVUE */
+		left: 50px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		width: auto;
+		/* #endif */
+		height: $badge-size;
+		padding: 0 $badge-space;
+	}
+
+	.uni-badge--dot {
+		/* #ifdef APP-NVUE */
+		left: 60px;
+		top: 6px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		left: calc(#{$avatar-width} + 15px - #{$dot-width}/ 2 + 1px + #{$badge-left});
+		/* #endif */
+		width: $dot-width;
+		height: $dot-height;
+		padding: 0;
+	}
+
+	.uni-list-chat--right {
+		/* #ifdef APP-NVUE */
+		left: 0;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue b/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
new file mode 100644
index 0000000..2c7d9ea
--- /dev/null
+++ b/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
@@ -0,0 +1,454 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<cell>
+		<!-- #endif -->
+
+		<view :class="{ 'uni-list-item--disabled': disabled }"
+			:hover-class="(!clickable && !link) || disabled || showSwitch ? '' : 'uni-list-item--hover'"
+			class="uni-list-item" @click="onClick">
+			<view v-if="!isFirstChild" class="border--left" :class="{ 'uni-list--border': border }"></view>
+			<view class="uni-list-item__container"
+				:class="{ 'container--right': showArrow || link, 'flex--direction': direction === 'column' }">
+				<slot name="header">
+					<view class="uni-list-item__header">
+						<view v-if="thumb" class="uni-list-item__icon">
+							<image :src="thumb" class="uni-list-item__icon-img" :class="['uni-list--' + thumbSize]" />
+						</view>
+						<view v-else-if="showExtraIcon" class="uni-list-item__icon">
+							<uni-icons :color="extraIcon.color" :size="extraIcon.size" :type="extraIcon.type" />
+						</view>
+					</view>
+				</slot>
+				<slot name="body">
+					<view class="uni-list-item__content"
+						:class="{ 'uni-list-item__content--center': thumb || showExtraIcon || showBadge || showSwitch }">
+						<text v-if="title" class="uni-list-item__content-title"
+							:class="[ellipsis !== 0 && ellipsis <= 2 ? 'uni-ellipsis-' + ellipsis : '']">{{ title }}</text>
+						<text v-if="note" class="uni-list-item__content-note">{{ note }}</text>
+					</view>
+				</slot>
+				<slot name="footer">
+					<view v-if="rightText || showBadge || showSwitch" class="uni-list-item__extra"
+						:class="{ 'flex--justify': direction === 'column' }">
+						<text v-if="rightText" class="uni-list-item__extra-text">{{ rightText }}</text>
+						<uni-badge v-if="showBadge" :type="badgeType" :text="badgeText" :custom-style="badgeStyle" />
+						<switch v-if="showSwitch" :disabled="disabled" :checked="switchChecked"
+							@change="onSwitchChange" />
+					</view>
+				</slot>
+			</view>
+			<uni-icons v-if="showArrow || link" :size="16" class="uni-icon-wrapper" color="#bbb" type="arrowright" />
+		</view>
+		<!-- #ifdef APP-NVUE -->
+	</cell>
+	<!-- #endif -->
+</template>
+
+<script>
+	/**
+	 * ListItem 列表子组件
+	 * @description 列表子组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=24
+	 * @property {String} 	title 							标题
+	 * @property {String} 	note 							描述
+	 * @property {String} 	thumb 							左侧缩略图，若thumb有值，则不会显示扩展图标
+	 * @property {String}  	thumbSize = [lg|base|sm]		略缩图大小
+	 * 	@value 	 lg			大图
+	 * 	@value 	 base		一般
+	 * 	@value 	 sm			小图
+	 * @property {String} 	badgeText						数字角标内容
+	 * @property {String} 	badgeType 						数字角标类型，参考[uni-icons](https://ext.dcloud.net.cn/plugin?id=21)
+	 * @property {Object}   badgeStyle           数字角标样式
+	 * @property {String} 	rightText 						右侧文字内容
+	 * @property {Boolean} 	disabled = [true|false]			是否禁用
+	 * @property {Boolean} 	clickable = [true|false] 		是否开启点击反馈
+	 * @property {String} 	link = [navigateTo|redirectTo|reLaunch|switchTab] 是否展示右侧箭头并开启点击反馈
+	 *  @value 	navigateTo 	同 uni.navigateTo()
+	 * 	@value redirectTo 	同 uni.redirectTo()
+	 * 	@value reLaunch   	同 uni.reLaunch()
+	 * 	@value switchTab  	同 uni.switchTab()
+	 * @property {String | PageURIString} 	to  			跳转目标页面
+	 * @property {Boolean} 	showBadge = [true|false] 		是否显示数字角标
+	 * @property {Boolean} 	showSwitch = [true|false] 		是否显示Switch
+	 * @property {Boolean} 	switchChecked = [true|false] 	Switch是否被选中
+	 * @property {Boolean} 	showExtraIcon = [true|false] 	左侧是否显示扩展图标
+	 * @property {Object} 	extraIcon 						扩展图标参数，格式为 {color: '#4cd964',size: '22',type: 'spinner'}
+	 * @property {String} 	direction = [row|column]		排版方向
+	 * @value row 			水平排列
+	 * @value column 		垂直排列
+	 * @event {Function} 	click 							点击 uniListItem 触发事件
+	 * @event {Function} 	switchChange 					点击切换 Switch 时触发
+	 */
+	export default {
+		name: 'UniListItem',
+		emits: ['click', 'switchChange'],
+		props: {
+			direction: {
+				type: String,
+				default: 'row'
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			note: {
+				type: String,
+				default: ''
+			},
+			ellipsis: {
+				type: [Number,String],
+				default: 0
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			clickable: {
+				type: Boolean,
+				default: false
+			},
+			showArrow: {
+				type: [Boolean, String],
+				default: false
+			},
+			link: {
+				type: [Boolean, String],
+				default: false
+			},
+			to: {
+				type: String,
+				default: ''
+			},
+			showBadge: {
+				type: [Boolean, String],
+				default: false
+			},
+			showSwitch: {
+				type: [Boolean, String],
+				default: false
+			},
+			switchChecked: {
+				type: [Boolean, String],
+				default: false
+			},
+			badgeText: {
+				type: String,
+				default: ''
+			},
+			badgeType: {
+				type: String,
+				default: 'success'
+			},
+			badgeStyle:{
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			rightText: {
+				type: String,
+				default: ''
+			},
+			thumb: {
+				type: String,
+				default: ''
+			},
+			thumbSize: {
+				type: String,
+				default: 'base'
+			},
+			showExtraIcon: {
+				type: [Boolean, String],
+				default: false
+			},
+			extraIcon: {
+				type: Object,
+				default () {
+					return {
+						type: '',
+						color: '#000000',
+						size: 20
+					};
+				}
+			},
+			border: {
+				type: Boolean,
+				default: true
+			}
+		},
+		// inject: ['list'],
+		data() {
+			return {
+				isFirstChild: false
+			};
+		},
+		mounted() {
+			this.list = this.getForm()
+			// 判断是否存在 uni-list 组件
+			if (this.list) {
+				if (!this.list.firstChildAppend) {
+					this.list.firstChildAppend = true;
+					this.isFirstChild = true;
+				}
+			}
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniList') {
+				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;
+			},
+			onClick() {
+				if (this.to !== '') {
+					this.openPage();
+					return;
+				}
+				if (this.clickable || this.link) {
+					this.$emit('click', {
+						data: {}
+					});
+				}
+			},
+			onSwitchChange(e) {
+				this.$emit('switchChange', e.detail);
+			},
+			openPage() {
+				if (['navigateTo', 'redirectTo', 'reLaunch', 'switchTab'].indexOf(this.link) !== -1) {
+					this.pageApi(this.link);
+				} else {
+					this.pageApi('navigateTo');
+				}
+			},
+			pageApi(api) {
+				let callback = {
+					url: this.to,
+					success: res => {
+						this.$emit('click', {
+							data: res
+						});
+					},
+					fail: err => {
+						this.$emit('click', {
+							data: err
+						});
+					}
+				}
+				switch (api) {
+					case 'navigateTo':
+						uni.navigateTo(callback)
+						break
+					case 'redirectTo':
+						uni.redirectTo(callback)
+						break
+					case 'reLaunch':
+						uni.reLaunch(callback)
+						break
+					case 'switchTab':
+						uni.switchTab(callback)
+						break
+					default:
+					uni.navigateTo(callback)
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	$uni-font-size-sm:12px;
+	$uni-font-size-base:14px;
+	$uni-font-size-lg:16px;
+	$uni-spacing-col-lg: 12px;
+	$uni-spacing-row-lg: 15px;
+	$uni-img-size-sm:20px;
+	$uni-img-size-base:26px;
+	$uni-img-size-lg:40px;
+	$uni-border-color:#e5e5e5;
+	$uni-bg-color-hover:#f1f1f1;
+	$uni-text-color-grey:#999;
+	$list-item-pd: $uni-spacing-col-lg $uni-spacing-row-lg;
+	.uni-list-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		font-size: $uni-font-size-lg;
+		position: relative;
+		justify-content: space-between;
+		align-items: center;
+		background-color: #fff;
+		flex-direction: row;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+	.uni-list-item--disabled {
+		opacity: 0.3;
+	}
+	.uni-list-item--hover {
+		background-color: $uni-bg-color-hover;
+	}
+	.uni-list-item__container {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: $list-item-pd;
+		padding-left: $uni-spacing-row-lg;
+		flex: 1;
+		overflow: hidden;
+		// align-items: center;
+	}
+	.container--right {
+		padding-right: 0;
+	}
+	// .border--left {
+	// 	margin-left: $uni-spacing-row-lg;
+	// }
+	.uni-list--border {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		/* #ifdef APP-NVUE */
+		border-top-color: $uni-border-color;
+		border-top-style: solid;
+		border-top-width: 0.5px;
+		/* #endif */
+	}
+	/* #ifndef APP-NVUE */
+	.uni-list--border:after {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		height: 1px;
+		content: '';
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+		background-color: $uni-border-color;
+	}
+	/* #endif */
+	.uni-list-item__content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		padding-right: 8px;
+		flex: 1;
+		color: #3b4144;
+		// overflow: hidden;
+		flex-direction: column;
+		justify-content: space-between;
+		overflow: hidden;
+	}
+	.uni-list-item__content--center {
+		justify-content: center;
+	}
+	.uni-list-item__content-title {
+		font-size: $uni-font-size-base;
+		color: #3b4144;
+		overflow: hidden;
+	}
+	.uni-list-item__content-note {
+		margin-top: 6rpx;
+		color: $uni-text-color-grey;
+		font-size: $uni-font-size-sm;
+		overflow: hidden;
+	}
+	.uni-list-item__extra {
+		// width: 25%;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: flex-end;
+		align-items: center;
+	}
+	.uni-list-item__header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+	}
+	.uni-list-item__icon {
+		margin-right: 18rpx;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+	}
+	.uni-list-item__icon-img {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		height: $uni-img-size-base;
+		width: $uni-img-size-base;
+		margin-right: 10px;
+	}
+	.uni-icon-wrapper {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		padding: 0 10px;
+	}
+	.flex--direction {
+		flex-direction: column;
+		/* #ifndef APP-NVUE */
+		align-items: initial;
+		/* #endif */
+	}
+	.flex--justify {
+		/* #ifndef APP-NVUE */
+		justify-content: initial;
+		/* #endif */
+	}
+	.uni-list--lg {
+		height: $uni-img-size-lg;
+		width: $uni-img-size-lg;
+	}
+	.uni-list--base {
+		height: $uni-img-size-base;
+		width: $uni-img-size-base;
+	}
+	.uni-list--sm {
+		height: $uni-img-size-sm;
+		width: $uni-img-size-sm;
+	}
+	.uni-list-item__extra-text {
+		color: $uni-text-color-grey;
+		font-size: $uni-font-size-sm;
+	}
+	.uni-ellipsis-1 {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		text-overflow:ellipsis;
+		/* #endif */
+	}
+	.uni-ellipsis-2 {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 2;
+		text-overflow:ellipsis;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-list/components/uni-list/uni-list - 副本.vue b/uni_modules/uni-list/components/uni-list/uni-list - 副本.vue
new file mode 100644
index 0000000..1c85003
--- /dev/null
+++ b/uni_modules/uni-list/components/uni-list/uni-list - 副本.vue	
@@ -0,0 +1,106 @@
+<template>
+	<!-- #ifndef APP-NVUE -->
+	<view class="uni-list uni-border-top-bottom">
+		<view v-if="border" class="uni-list--border-top"></view>
+		<slot />
+		<view v-if="border" class="uni-list--border-bottom"></view>
+	</view>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<list class="uni-list" :class="{ 'uni-list--border': border }" :enableBackToTop="enableBackToTop" loadmoreoffset="15"><slot /></list>
+	<!-- #endif -->
+</template>
+
+<script>
+/**
+ * List 列表
+ * @description 列表组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=24
+ * @property {String} 	border = [true|false] 		标题
+ */
+export default {
+	name: 'uniList',
+	'mp-weixin': {
+		options: {
+			multipleSlots: false
+		}
+	},
+	props: {
+		enableBackToTop: {
+			type: [Boolean, String],
+			default: false
+		},
+		scrollY: {
+			type: [Boolean, String],
+			default: false
+		},
+		border: {
+			type: Boolean,
+			default: true
+		}
+	},
+	// provide() {
+	// 	return {
+	// 		list: this
+	// 	};
+	// },
+	created() {
+		this.firstChildAppend = false;
+	},
+	methods: {
+		loadMore(e) {
+			this.$emit('scrolltolower');
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.uni-list {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	background-color: $uni-bg-color;
+	position: relative;
+	flex-direction: column;
+}
+
+.uni-list--border {
+	position: relative;
+	/* #ifdef APP-NVUE */
+	border-top-color: $uni-border-color;
+	border-top-style: solid;
+	border-top-width: 0.5px;
+	border-bottom-color: $uni-border-color;
+	border-bottom-style: solid;
+	border-bottom-width: 0.5px;
+	/* #endif */
+	z-index: -1;
+}
+
+/* #ifndef APP-NVUE */
+
+.uni-list--border-top {
+	position: absolute;
+	top: 0;
+	right: 0;
+	left: 0;
+	height: 1px;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	background-color: $uni-border-color;
+	z-index: 1;
+}
+
+.uni-list--border-bottom {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	left: 0;
+	height: 1px;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	background-color: $uni-border-color;
+}
+
+/* #endif */
+</style>
diff --git a/uni_modules/uni-list/components/uni-list/uni-list.vue b/uni_modules/uni-list/components/uni-list/uni-list.vue
new file mode 100644
index 0000000..ecda676
--- /dev/null
+++ b/uni_modules/uni-list/components/uni-list/uni-list.vue
@@ -0,0 +1,108 @@
+<template>
+	<!-- #ifndef APP-NVUE -->
+	<view class="uni-list uni-border-top-bottom">
+		<view v-if="border" class="uni-list--border-top"></view>
+		<slot />
+		<view v-if="border" class="uni-list--border-bottom"></view>
+	</view>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<list class="uni-list" :class="{ 'uni-list--border': border }" :enableBackToTop="enableBackToTop" loadmoreoffset="15"><slot /></list>
+	<!-- #endif -->
+</template>
+
+<script>
+/**
+ * List 列表
+ * @description 列表组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=24
+ * @property {String} 	border = [true|false] 		标题
+ */
+export default {
+	name: 'uniList',
+	'mp-weixin': {
+		options: {
+			multipleSlots: false
+		}
+	},
+	props: {
+		enableBackToTop: {
+			type: [Boolean, String],
+			default: false
+		},
+		scrollY: {
+			type: [Boolean, String],
+			default: false
+		},
+		border: {
+			type: Boolean,
+			default: true
+		}
+	},
+	// provide() {
+	// 	return {
+	// 		list: this
+	// 	};
+	// },
+	created() {
+		this.firstChildAppend = false;
+	},
+	methods: {
+		loadMore(e) {
+			this.$emit('scrolltolower');
+		}
+	}
+};
+</script>
+<style lang="scss" >
+$uni-bg-color:#ffffff;
+$uni-border-color:#e5e5e5;
+.uni-list {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	background-color: $uni-bg-color;
+	position: relative;
+	flex-direction: column;
+}
+
+.uni-list--border {
+	position: relative;
+	/* #ifdef APP-NVUE */
+	border-top-color: $uni-border-color;
+	border-top-style: solid;
+	border-top-width: 0.5px;
+	border-bottom-color: $uni-border-color;
+	border-bottom-style: solid;
+	border-bottom-width: 0.5px;
+	/* #endif */
+	z-index: -1;
+}
+
+/* #ifndef APP-NVUE */
+
+.uni-list--border-top {
+	position: absolute;
+	top: 0;
+	right: 0;
+	left: 0;
+	height: 1px;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	background-color: $uni-border-color;
+	z-index: 1;
+}
+
+.uni-list--border-bottom {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	left: 0;
+	height: 1px;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	background-color: $uni-border-color;
+}
+
+/* #endif */
+</style>
diff --git a/uni_modules/uni-list/components/uni-list/uni-refresh.vue b/uni_modules/uni-list/components/uni-list/uni-refresh.vue
new file mode 100644
index 0000000..3b4c5a2
--- /dev/null
+++ b/uni_modules/uni-list/components/uni-list/uni-refresh.vue
@@ -0,0 +1,65 @@
+<template>
+    <!-- #ifdef APP-NVUE -->
+    <refresh :display="display" @refresh="onrefresh" @pullingdown="onpullingdown">
+        <slot />
+    </refresh>
+    <!-- #endif -->
+    <!-- #ifndef APP-NVUE -->
+    <view ref="uni-refresh" class="uni-refresh" v-show="isShow">
+        <slot />
+    </view>
+    <!-- #endif -->
+</template>
+
+<script>
+    export default {
+        name: 'UniRefresh',
+        props: {
+            display: {
+                type: [String],
+                default: "hide"
+            }
+        },
+        data() {
+            return {
+                pulling: false
+            }
+        },
+        computed: {
+            isShow() {
+                if (this.display === "show" || this.pulling === true) {
+                    return true;
+                }
+                return false;
+            }
+        },
+        created() {},
+        methods: {
+            onchange(value) {
+                this.pulling = value;
+            },
+            onrefresh(e) {
+                this.$emit("refresh", e);
+            },
+            onpullingdown(e) {
+                // #ifdef APP-NVUE
+                this.$emit("pullingdown", e);
+                // #endif
+                // #ifndef APP-NVUE
+                var detail = {
+                    viewHeight: 90,
+                    pullingDistance: e.height
+                }
+                this.$emit("pullingdown", detail);
+                // #endif
+            }
+        }
+    }
+</script>
+
+<style>
+    .uni-refresh {
+        height: 0;
+        overflow: hidden;
+    }
+</style>
diff --git a/uni_modules/uni-list/components/uni-list/uni-refresh.wxs b/uni_modules/uni-list/components/uni-list/uni-refresh.wxs
new file mode 100644
index 0000000..818a6b7
--- /dev/null
+++ b/uni_modules/uni-list/components/uni-list/uni-refresh.wxs
@@ -0,0 +1,87 @@
+var pullDown = {
+    threshold: 95,
+    maxHeight: 200,
+    callRefresh: 'onrefresh',
+    callPullingDown: 'onpullingdown',
+    refreshSelector: '.uni-refresh'
+};
+
+function ready(newValue, oldValue, ownerInstance, instance) {
+    var state = instance.getState()
+    state.canPullDown = newValue;
+    // console.log(newValue);
+}
+
+function touchStart(e, instance) {
+    var state = instance.getState();
+    state.refreshInstance = instance.selectComponent(pullDown.refreshSelector);
+    state.canPullDown = (state.refreshInstance != null && state.refreshInstance != undefined);
+    if (!state.canPullDown) {
+        return
+    }
+
+    // console.log("touchStart");
+
+    state.height = 0;
+    state.touchStartY = e.touches[0].pageY || e.changedTouches[0].pageY;
+    state.refreshInstance.setStyle({
+        'height': 0
+    });
+    state.refreshInstance.callMethod("onchange", true);
+}
+
+function touchMove(e, ownerInstance) {
+    var instance = e.instance;
+    var state = instance.getState();
+    if (!state.canPullDown) {
+        return
+    }
+
+    var oldHeight = state.height;
+    var endY = e.touches[0].pageY || e.changedTouches[0].pageY;
+    var height = endY - state.touchStartY;
+    if (height > pullDown.maxHeight) {
+        return;
+    }
+
+    var refreshInstance = state.refreshInstance;
+    refreshInstance.setStyle({
+        'height': height + 'px'
+    });
+
+    height = height < pullDown.maxHeight ? height : pullDown.maxHeight;
+    state.height = height;
+    refreshInstance.callMethod(pullDown.callPullingDown, {
+        height: height
+    });
+}
+
+function touchEnd(e, ownerInstance) {
+    var state = e.instance.getState();
+    if (!state.canPullDown) {
+        return
+    }
+
+    state.refreshInstance.callMethod("onchange", false);
+
+    var refreshInstance = state.refreshInstance;
+    if (state.height > pullDown.threshold) {
+        refreshInstance.callMethod(pullDown.callRefresh);
+        return;
+    }
+
+    refreshInstance.setStyle({
+        'height': 0
+    });
+}
+
+function propObserver(newValue, oldValue, instance) {
+    pullDown = newValue;
+}
+
+module.exports = {
+    touchmove: touchMove,
+    touchstart: touchStart,
+    touchend: touchEnd,
+    propObserver: propObserver
+}
diff --git a/uni_modules/uni-list/package.json b/uni_modules/uni-list/package.json
new file mode 100644
index 0000000..66e8bef
--- /dev/null
+++ b/uni_modules/uni-list/package.json
@@ -0,0 +1,91 @@
+{
+  "id": "uni-list",
+  "displayName": "uni-list 列表",
+  "version": "1.2.1",
+  "description": "List 组件 ，帮助使用者快速构建列表。",
+  "keywords": [
+    "",
+    "uni-ui",
+    "uniui",
+    "列表",
+    "",
+    "list"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+      "uni-badge",
+      "uni-icons"
+    ],
+    "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-list/readme.md b/uni_modules/uni-list/readme.md
new file mode 100644
index 0000000..32c2865
--- /dev/null
+++ b/uni_modules/uni-list/readme.md
@@ -0,0 +1,346 @@
+## List 列表
+> **组件名：uni-list**
+> 代码块： `uList`、`uListItem`
+> 关联组件：`uni-list-item`、`uni-badge`、`uni-icons`、`uni-list-chat`、`uni-list-ad`
+
+
+List 列表组件，包含基本列表样式、可扩展插槽机制、长列表性能优化、多端兼容。
+
+在vue页面里，它默认使用页面级滚动。在app-nvue页面里，它默认使用原生list组件滚动。这样的长列表，在滚动出屏幕外后，系统会回收不可见区域的渲染内存资源，不会造成滚动越长手机越卡的问题。
+
+uni-list组件是父容器，里面的核心是uni-list-item子组件，它代表列表中的一个可重复行，子组件可以无限循环。
+
+uni-list-item有很多风格，uni-list-item组件通过内置的属性，满足一些常用的场景。当内置属性不满足需求时，可以通过扩展插槽来自定义列表内容。
+
+内置属性可以覆盖的场景包括：导航列表、设置列表、小图标列表、通信录列表、聊天记录列表。
+
+涉及很多大图或丰富内容的列表，比如类今日头条的新闻列表、类淘宝的电商列表，需要通过扩展插槽实现。
+
+下文均有样例给出。
+
+uni-list不包含下拉刷新和上拉翻页。上拉翻页另见组件：[uni-load-more](https://ext.dcloud.net.cn/plugin?id=29)
+
+
+### 安装方式
+
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
+
+> **注意事项**
+> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
+> - 组件需要依赖 `sass` 插件 ，请自行手动安装
+> - 组件内部依赖 `'uni-icons'` 、`uni-badge` 组件
+> - `uni-list` 和 `uni-list-item` 需要配套使用，暂不支持单独使用 `uni-list-item`
+> - 只有开启点击反馈后，会有点击选中效果
+> - 使用插槽时，可以完全自定义内容
+> - note 、rightText 属性暂时没做限制，不支持文字溢出隐藏，使用时应该控制长度显示或通过默认插槽自行扩展
+> - 支付宝小程序平台需要在支付宝小程序开发者工具里开启 component2 编译模式，开启方式： 详情 --> 项目配置 --> 启用 component2 编译
+> - 如果需要修改 `switch`、`badge` 样式，请使用插槽自定义
+> - 在 `HBuilderX` 低版本中，可能会出现组件显示 `undefined` 的问题，请升级最新的 `HBuilderX` 或者 `cli`
+> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
+ 
+
+### 基本用法 
+
+- 设置 `title` 属性，可以显示列表标题
+- 设置 `disabled` 属性，可以禁用当前项
+
+```html
+<uni-list>
+	<uni-list-item  title="列表文字" ></uni-list-item>
+	<uni-list-item :disabled="true" title="列表禁用状态" ></uni-list-item>
+</uni-list>
+			 
+```
+
+### 多行内容显示
+
+- 设置 `note` 属性 ，可以在第二行显示描述文本信息
+
+```html
+<uni-list>
+	<uni-list-item title="列表文字" note="列表描述信息"></uni-list-item>
+	<uni-list-item :disabled="true" title="列表文字" note="列表禁用状态"></uni-list-item>
+</uni-list>
+
+```
+
+### 右侧显示角标、switch
+
+- 设置 `show-badge` 属性 ，可以显示角标内容
+- 设置 `show-switch` 属性，可以显示 switch 开关
+
+```html
+<uni-list>
+	<uni-list-item  title="列表右侧显示角标" :show-badge="true" badge-text="12" ></uni-list-item>
+	<uni-list-item title="列表右侧显示 switch"  :show-switch="true"  @switchChange="switchChange" ></uni-list-item>
+</uni-list>
+
+```
+
+### 左侧显示略缩图、图标  
+
+- 设置 `thumb` 属性 ，可以在列表左侧显示略缩图
+- 设置 `show-extra-icon` 属性，并指定 `extra-icon` 可以在左侧显示图标
+
+```html
+ <uni-list>
+ 	<uni-list-item title="列表左侧带略缩图" note="列表描述信息" thumb="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png"
+ 	 thumb-size="lg" rightText="右侧文字"></uni-list-item>
+ 	<uni-list-item :show-extra-icon="true" :extra-icon="extraIcon1" title="列表左侧带扩展图标" ></uni-list-item>
+</uni-list>
+```
+
+### 开启点击反馈和右侧箭头
+- 设置 `clickable` 为 `true` ，则表示这是一个可点击的列表，会默认给一个点击效果，并可以监听 `click` 事件
+- 设置 `link` 属性，会自动开启点击反馈，并给列表右侧添加一个箭头
+- 设置 `to` 属性，可以跳转页面，`link` 的值表示跳转方式，如果不指定，默认为 `navigateTo`
+
+```html
+
+<uni-list>
+	<uni-list-item title="开启点击反馈" clickable  @click="onClick" ></uni-list-item>
+	<uni-list-item title="默认 navigateTo 方式跳转页面" link to="/pages/vue/index/index" @click="onClick($event,1)" ></uni-list-item>
+	<uni-list-item title="reLaunch 方式跳转页面" link="reLaunch" to="/pages/vue/index/index" @click="onClick($event,1)" ></uni-list-item>
+</uni-list>
+
+```
+
+
+### 聊天列表示例
+- 设置 `clickable` 为 `true` ，则表示这是一个可点击的列表，会默认给一个点击效果，并可以监听 `click` 事件
+- 设置 `link` 属性，会自动开启点击反馈，`link` 的值表示跳转方式，如果不指定，默认为 `navigateTo`
+- 设置 `to` 属性，可以跳转页面
+- `time` 属性，通常会设置成时间显示，但是这个属性不仅仅可以设置时间，你可以传入任何文本，注意文本长度可能会影响显示
+- `avatar` 和 `avatarList` 属性同时只会有一个生效，同时设置的话，`avatarList` 属性的长度大于1 ，`avatar` 属性将失效
+- 可以通过默认插槽自定义列表右侧内容
+
+```html
+
+<uni-list>
+	<uni-list :border="true">
+		<!-- 显示圆形头像 -->
+		<uni-list-chat :avatar-circle="true" title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" ></uni-list-chat>
+		<!-- 右侧带角标 -->
+		<uni-list-chat title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-text="12" :badge-style="{backgroundColor:'#FF80AB'}"></uni-list-chat>
+		<!-- 头像显示圆点 -->
+		<uni-list-chat title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot"></uni-list-chat>
+		<!-- 头像显示角标 -->
+		<uni-list-chat title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="99"></uni-list-chat>
+		<!-- 显示多头像 -->
+		<uni-list-chat title="uni-app" :avatar-list="avatarList" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot"></uni-list-chat>
+		<!-- 自定义右侧内容 -->
+		<uni-list-chat title="uni-app" :avatar-list="avatarList" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot">
+			<view class="chat-custom-right">
+				<text class="chat-custom-text">刚刚</text>
+				<!-- 需要使用 uni-icons 请自行引入 -->
+				<uni-icons type="star-filled" color="#999" size="18"></uni-icons>
+			</view>
+		</uni-list-chat>
+	</uni-list>
+</uni-list>
+
+```
+
+```javascript
+
+export default {
+	components: {},
+	data() {
+		return {
+			avatarList: [{
+				url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png'
+			}, {
+				url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png'
+			}, {
+				url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png'
+			}]
+		}
+	}
+}
+
+```
+
+
+```css
+
+.chat-custom-right {
+	flex: 1;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: flex-end;
+}
+
+.chat-custom-text {
+	font-size: 12px;
+	color: #999;
+}
+
+```
+
+## API
+
+### List Props
+
+属性名			|类型		|默认值		|	说明																									
+:-:				|:-:		|:-:		|	:-:	
+border			|Boolean	|true		|	是否显示边框
+
+
+### ListItem Props
+
+属性名			|类型		|默认值		|	说明																					
+:-:				|:-:		|:-:		|	:-:	
+title			|String		|-			|	标题
+note			|String		|-			|	描述
+ellipsis		|Number		|0			|	title 是否溢出隐藏，可选值，0:默认;  1:显示一行;	2:显示两行;【nvue 暂不支持】
+thumb			|String		|-			|	左侧缩略图，若thumb有值，则不会显示扩展图标
+thumbSize		|String 	|medium 	|	略缩图尺寸，可选值，lg:大图;  medium:一般;	sm:小图;
+showBadge		|Boolean	|false		|	是否显示数字角标	
+badgeText		|String		|-			|	数字角标内容
+badgeType		|String		|-			|	数字角标类型，参考[uni-icons](https://ext.dcloud.net.cn/plugin?id=21)	
+badgeStyle  |Object   |-      | 数字角标样式，使用uni-badge的custom-style参数
+rightText		|String		|-			|	右侧文字内容
+disabled		|Boolean	|false		|	是否禁用	
+showArrow 		|Boolean	|true		|	是否显示箭头图标			
+link			|String 	|navigateTo	|	新页面跳转方式，可选值见下表
+to				|String		|-			|	新页面跳转地址，如填写此属性，click 会返回页面是否跳转成功			
+clickable		|Boolean	|false		|	是否开启点击反馈
+showSwitch	    |Boolean	|false		|	是否显示Switch																			
+switchChecked	|Boolean	|false		|	Switch是否被选中																			
+showExtraIcon   |Boolean	|false		|	左侧是否显示扩展图标																		
+extraIcon		|Object		|-			|	扩展图标参数，格式为 ``{color: '#4cd964',size: '22',type: 'spinner'}``，参考 [uni-icons](https://ext.dcloud.net.cn/plugin?id=28)	
+direction		| String	|row		|	排版方向，可选值，row:水平排列;  column:垂直排列; 3个插槽是水平排还是垂直排，也受此属性控制
+
+
+#### Link Options
+
+属性名				|	说明
+:-:					|	:-:
+navigateTo 	| 	同 uni.navigateTo()
+redirectTo 	|	同 uni.reLaunch()
+reLaunch		|	同 uni.reLaunch()
+switchTab  	|	同 uni.switchTab()
+
+### ListItem Events
+
+事件称名			|说明									|返回参数			
+:-:				|:-:									|:-:				
+click			|点击 uniListItem 触发事件，需开启点击反馈	|-					
+switchChange	|点击切换 Switch 时触发，需显示 switch		|e={value:checked}	
+
+
+
+### ListItem Slots
+
+名称	 	|	说明					
+:-:		|	:-:						
+header	|	左/上内容插槽，可完全自定义默认显示
+body	|	中间内容插槽，可完全自定义中间内容				
+footer	|	右/下内容插槽，可完全自定义右侧内容		
+
+
+> **通过插槽扩展**
+> 需要注意的是当使用插槽时，内置样式将会失效，只保留排版样式，此时的样式需要开发者自己实现
+> 如果	`uni-list-item` 组件内置属性样式无法满足需求，可以使用插槽来自定义uni-list-item里的内容。
+> uni-list-item提供了3个可扩展的插槽：`header`、`body`、`footer`
+> - 当 `direction` 属性为 `row` 时表示水平排列，此时 `header` 表示列表的左边部分，`body` 表示列表的中间部分，`footer` 表示列表的右边部分
+> - 当 `direction` 属性为 `column` 时表示垂直排列，此时 `header` 表示列表的上边部分，`body` 表示列表的中间部分，`footer` 表示列表的下边部分
+> 开发者可以只用1个插槽，也可以3个一起使用。在插槽中可自主编写view标签，实现自己所需的效果。
+
+	
+**示例**
+
+```html
+<uni-list>
+	<uni-list-item title="自定义右侧插槽" note="列表描述信息" link>
+		<template slot="header">
+			<image class="slot-image" src="/static/logo.png" mode="widthFix"></image>
+		</template>
+	</uni-list-item>
+	<uni-list-item>
+		<!-- 自定义 header -->
+		<view slot="header" class="slot-box"><image class="slot-image" src="/static/logo.png" mode="widthFix"></image></view>
+		<!-- 自定义 body -->
+		<text slot="body" class="slot-box slot-text">自定义插槽</text>
+		<!-- 自定义 footer-->
+		<template slot="footer">
+			<image class="slot-image" src="/static/logo.png" mode="widthFix"></image>
+		</template>
+	</uni-list-item>
+</uni-list>
+```
+
+
+
+
+
+### ListItemChat Props
+
+属性名			|类型		|默认值		|	说明																		
+:-:				|:-:		|:-:		|	:-:	
+title 			|String		|-			|	标题
+note 			|String		|-			|	描述
+clickable		|Boolean	|false		|	是否开启点击反馈
+badgeText		|String		|-			|	数字角标内容，设置为 `dot` 将显示圆点
+badgePositon 	|String		|right		|	角标位置
+link			|String 	|navigateTo	|	是否展示右侧箭头并开启点击反馈，可选值见下表
+clickable		|Boolean	|false		|	是否开启点击反馈
+to				|String		|-			|	跳转页面地址，如填写此属性，click 会返回页面是否跳转成功	
+time			|String 	|-			|	右侧时间显示
+avatarCircle 	|Boolean 	|false		|	是否显示圆形头像
+avatar			|String 	|-			|	头像地址，avatarCircle 不填时生效
+avatarList 		|Array	 	|-			|	头像组，格式为 [{url:''}]
+
+#### Link Options
+
+属性名		|	说明
+:-:			|	:-:
+navigateTo 	| 	同 uni.navigateTo()
+redirectTo 	|	同 uni.reLaunch()
+reLaunch	|	同 uni.reLaunch()
+switchTab  	|	同 uni.switchTab()
+
+### ListItemChat Slots
+
+名称	 	|	说明					
+:-		|	:-						
+default	|	自定义列表右侧内容（包括时间和角标显示）
+
+### ListItemChat Events
+事件称名			|	说明						|	返回参数			
+:-:				|	:-:						|	:-:	
+@click			|	点击 uniListChat 触发事件	|	{data:{}}	，如有 to 属性，会返回页面跳转信息	
+
+
+
+
+
+
+## 基于uni-list扩展的页面模板
+
+通过扩展插槽，可实现多种常见样式的列表
+
+**新闻列表类**
+
+1. 云端一体混合布局：[https://ext.dcloud.net.cn/plugin?id=2546](https://ext.dcloud.net.cn/plugin?id=2546)
+2. 云端一体垂直布局，大图模式：[https://ext.dcloud.net.cn/plugin?id=2583](https://ext.dcloud.net.cn/plugin?id=2583)
+3. 云端一体垂直布局，多行图文混排：[https://ext.dcloud.net.cn/plugin?id=2584](https://ext.dcloud.net.cn/plugin?id=2584)
+4. 云端一体垂直布局，多图模式：[https://ext.dcloud.net.cn/plugin?id=2585](https://ext.dcloud.net.cn/plugin?id=2585)
+5. 云端一体水平布局，左图右文：[https://ext.dcloud.net.cn/plugin?id=2586](https://ext.dcloud.net.cn/plugin?id=2586)
+6. 云端一体水平布局，左文右图：[https://ext.dcloud.net.cn/plugin?id=2587](https://ext.dcloud.net.cn/plugin?id=2587)
+7. 云端一体垂直布局，无图模式，主标题+副标题：[https://ext.dcloud.net.cn/plugin?id=2588](https://ext.dcloud.net.cn/plugin?id=2588)
+
+**商品列表类**
+
+1. 云端一体列表/宫格视图互切：[https://ext.dcloud.net.cn/plugin?id=2651](https://ext.dcloud.net.cn/plugin?id=2651)
+2. 云端一体列表（宫格模式）：[https://ext.dcloud.net.cn/plugin?id=2671](https://ext.dcloud.net.cn/plugin?id=2671)
+3. 云端一体列表（列表模式）：[https://ext.dcloud.net.cn/plugin?id=2672](https://ext.dcloud.net.cn/plugin?id=2672)
+
+## 组件示例
+
+点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/list/list](https://hellouniapp.dcloud.net.cn/pages/extUI/list/list)
\ No newline at end of file
diff --git a/uni_modules/uni-load-more/changelog.md b/uni_modules/uni-load-more/changelog.md
new file mode 100644
index 0000000..8f03f1d
--- /dev/null
+++ b/uni_modules/uni-load-more/changelog.md
@@ -0,0 +1,19 @@
+## 1.3.3（2022-01-20）
+- 新增 showText属性 ，是否显示文本
+## 1.3.2（2022-01-19）
+- 修复 nvue 平台下不显示文本的bug
+## 1.3.1（2022-01-19）
+- 修复 微信小程序平台样式选择器报警告的问题
+## 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-load-more](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+## 1.2.1（2021-08-24）
+- 新增 支持国际化
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.8（2021-05-12）
+- 新增 组件示例地址
+## 1.1.7（2021-03-30）
+- 修复 uni-load-more 在首页使用时，h5 平台报 'uni is not defined' 的 bug
+## 1.1.6（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
new file mode 100644
index 0000000..a4f14a5
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "Pull up to show more",
+	"uni-load-more.contentrefresh": "loading...",
+	"uni-load-more.contentnomore": "No more data"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js b/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/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-load-more/components/uni-load-more/i18n/zh-Hans.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
new file mode 100644
index 0000000..f15d510
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉显示更多",
+	"uni-load-more.contentrefresh": "正在加载...",
+	"uni-load-more.contentnomore": "没有更多数据了"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
new file mode 100644
index 0000000..a255c6d
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉顯示更多",
+	"uni-load-more.contentrefresh": "正在加載...",
+	"uni-load-more.contentnomore": "沒有更多數據了"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
new file mode 100644
index 0000000..e5eff4d
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
@@ -0,0 +1,399 @@
+<template>
+	<view class="uni-load-more" @click="onClick">
+		<!-- #ifdef APP-NVUE -->
+		<loading-indicator v-if="!webviewHide && status === 'loading' && showIcon"
+			:style="{color: color,width:iconSize+'px',height:iconSize+'px'}" :animating="true"
+			class="uni-load-more__img uni-load-more__img--nvue"></loading-indicator>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+		<svg width="24" height="24" viewBox="25 25 50 50"
+			v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}"
+			class="uni-load-more__img uni-load-more__img--android-H5">
+			<circle cx="50" cy="50" r="20" fill="none" :style="{color:color}" :stroke-width="3"></circle>
+		</svg>
+		<!-- #endif -->
+		<!-- #ifndef APP-NVUE || H5 -->
+		<view
+			v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}"
+			class="uni-load-more__img uni-load-more__img--android-MP">
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+		</view>
+		<!-- #endif -->
+		<!-- #ifndef APP-NVUE -->
+		<view v-else-if="!webviewHide && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}" class="uni-load-more__img uni-load-more__img--ios-H5">
+			<image :src="imgBase64" mode="widthFix"></image>
+		</view>
+		<!-- #endif -->
+		<text v-if="showText" class="uni-load-more__text"
+			:style="{color: color}">{{ status === 'more' ? contentdownText : status === 'loading' ? contentrefreshText : contentnomoreText }}</text>
+	</view>
+</template>
+
+<script>
+	let platform
+	setTimeout(() => {
+		platform = uni.getSystemInfoSync().platform
+	}, 16)
+
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+
+	/**
+	 * LoadMore 加载更多
+	 * @description 用于列表中，做滚动加载使用，展示 loading 的各种状态
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=29
+	 * @property {String} status = [more|loading|noMore] loading 的状态
+	 * 	@value more loading前
+	 * 	@value loading loading中
+	 * 	@value noMore 没有更多了
+	 * @property {Number} iconSize 指定图标大小
+	 * @property {Boolean} iconSize = [true|false] 是否显示 loading 图标
+	 * @property {String} iconType = [snow|circle|auto] 指定图标样式
+	 * 	@value snow ios雪花加载样式
+	 * 	@value circle 安卓唤醒加载样式
+	 * 	@value auto 根据平台自动选择加载样式
+	 * @property {String} color 图标和文字颜色
+	 * @property {Object} contentText 各状态文字说明，值为：{contentdown: "上拉显示更多",contentrefresh: "正在加载...",contentnomore: "没有更多数据了"}
+	 * @event {Function} clickLoadMore 点击加载更多时触发
+	 */
+	export default {
+		name: 'UniLoadMore',
+		emits: ['clickLoadMore'],
+		props: {
+			status: {
+				// 上拉的状态：more-loading前；loading-loading中；noMore-没有更多了
+				type: String,
+				default: 'more'
+			},
+			showIcon: {
+				type: Boolean,
+				default: true
+			},
+			iconType: {
+				type: String,
+				default: 'auto'
+			},
+			iconSize: {
+				type: Number,
+				default: 24
+			},
+			color: {
+				type: String,
+				default: '#777777'
+			},
+			contentText: {
+				type: Object,
+				default () {
+					return {
+						contentdown: '',
+						contentrefresh: '',
+						contentnomore: ''
+					}
+				}
+			},
+			showText: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				webviewHide: false,
+				platform: platform,
+				imgBase64: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QzlBMzU3OTlEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QzlBMzU3OUFEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDOUEzNTc5N0Q5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDOUEzNTc5OEQ5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pt+ALSwAAA6CSURBVHja1FsLkFZVHb98LM+F5bHL8khA1iSeiyQBCRM+YGqKUnnJTDLGI0BGZlKDIU2MMglUiDApEZvSsZnQtBRJtKwQNKQMFYeRDR10WOLd8ljYXdh+v8v5fR3Od+797t1dnOnO/Ofce77z+J//+b/P+ZqtXbs2sJ9MJhNUV1cHJ06cCJo3bx7EPc2aNcvpy7pWrVoF+/fvDyoqKoI2bdoE9fX1F7TjN8a+EXBn/fkfvw942Tf+wYMHg9mzZwfjxo0LDhw4EPa1x2MbFw/fOGfPng1qa2tzcCkILsLDydq2bRsunpOTMM7TD/W/tZDZhPdeKD+yGxHhdu3aBV27dg3OnDlzMVANMheLAO3btw8KCwuDmpoaX5OxbgUIMEq7K8IcPnw4KCsrC/r37x8cP378/4cAXAB3vqSkJMuiDhTkw+XcuXNhOWbMmKBly5YhUT8xArhyFvP0BfwRsAuwxJZJsm/nzp2DTp06he/OU+cZ64K6o0ePBkOHDg2GDx8e6gEbJ5Q/NHNuAJQ1hgBeHUDlR7nVTkY8rQAvAi4z34vR/mPs1FoRsaCgIJThI0eOBC1atEiFGGV+5MiRoS45efJkqFjJFXV1dQuA012m2WcwTw98fy6CqBdsaiIO4CScrGPHjvk4odhavPquRtFWXEC25VgkREKOCh/qDSq+vn37htzD/mZTOmOc5U7zKzBPEedygWshcDyWvs30igAbU+6oyMgJBCFhwQE0fccxN60Ay9iebbjoDh06hMowjQxT4fXq1SskArmHZpkArvixp/kWzHdMeArExSJEaiXIjjRjRJ4DaAGWpibLzXN3Fm1vA5teBgh3j1Rv3bp1YgKwPdmf2p9zcyNYYgPKMfY0T5f5nNYdw158nJ8QawW4CLKwiOBSEgO/hok2eBydR+3dYH+PLxA5J8Vv0KBBwenTp0P2JWAx6+yFEBfs8lMY+y0SWMBNI9E4ThKi58VKTg3FQZS1RQF1cz27eC0QHMu+3E0SkUowjhVt5VdaWhp07949ZHv2Qd1EjDXM2cla1M0nl3GxAs3J9yREzyTdFVKVFOaE9qRA8GM0WebRuo9JGZKA7Mv2SeS/Z8+eoQ9BArMfFrLGo6jvxbhHbJZnKX2Rzz1O7QhJJ9Cs2ZMaWIyq/zhdeqPNfIoHd58clIQD+JSXl4dKlyIAuBdVXZwFVWKspSSoxE++h8x4k3uCnEhE4I5KwRiFWGOU0QWKiCYLbdoRMRKAu2kQ9vkfLU6dOhX06NEjlH+yMRZSinnuyWnYosVcji8CEA/6Cg2JF+IIUBqnGKUTCNwtwBN4f89RiK1R96DEgO2o0NDmtEdvVFdVVYV+P3UAPUEs6GFwV3PHmXkD4vh74iDFJysVI/MlaQhwKeBNTLYX5VuA8T4/gZxA4MRGFxDB6R7OmYPfyykGRJbyie+XnGYnQIC/coH9+vULiYrxrkL9ZA9+0ykaHIfEpM7ge8TiJ2CsHYwyMfafAF1yCGBHYIbCVDjDjKt7BeB51D+LgQa6OkG7IDYEEtvQ7lnXLKLtLdLuJBpE4gPUXcW2+PkZwOex+4cGDhwYDBkyRL7/HFcEwUGPo/8uWRUpYnfxGHco8HkewLHLyYmAawAPuIFZxhOpDfJQ8gbUv41yORAptMWBNr6oqMhWird5+u+iHmBb2nhjDV7HWBNQTgK8y11l5NetWzc5ULscAtSj7nbNI0skhWeUZCc0W4nyH/jO4Vz0u1IeYhbk4AiwM6tjxIWByHsoZ9qcIBPJd/y+DwPfBESOmCa/QF3WiZHucLlEDpNxcNhmheEOPgdQNx6/VZFQzFZ5TN08AHXQt2Ii3EdyFuUsPtTcGPhW5iMiCNELvz+Gdn9huG4HUJaW/w3g0wxV0XaG7arG2WeKiUWYM4Y7GO5ezshTARbbWGw/DvXkpp/ivVvE0JVoMxN4rpGzJMhE5Pl+xlATsDIqikP9F9D2z3h9nOksEUFhK+qO4rcPkoalMQ/HqJLIyb3F3JdjrCcw1yZ8joyJLR5gCo54etlag7qIoeNh1N1BRYj3DTFJ0elotxPlVzkGuYAmL0VSJVGAJA41c4Z6A3BzTLfn0HYwYKEI6CUAMzZEWvLsIcQOo1AmmyyM72nHJCfYsogflGV6jEk9vyQZXSuq6w4c16NsGcGZbwOPr+H1RkOk2LEzjNepxQkihHSCQ4ynAYNRx2zMKV92CQMWqj8J0BRE8EShxRFN6YrfCRhC0x3r/Zm4IbQCcmJoV0kMamllccR6FjHqUC5F2R/wS2dcymOlfAKOS4KmzQb5cpNC2MC7JhVn5wjXoJ44rYhLh8n0eXOCorJxa7POjbSlCGVczr34/RsAmrcvo9s+wGp3tzVhntxiXiJ4nvEYb4FJkf0O8HocAePmLvCxnL0AORraVekJk6TYjDabRVXfRE2lCN1h6ZQRN1+InUbsCpKwoBZHh0dODN9JBCUffItXxEavTQkUtnfTVAplCWL3JISz29h4NjotnuSsQKJCk8dF+kJR6RARjrqFVmfPnj3ZbK8cIJ0msd6jgHPGtfVTQ8VLmlvh4mct9sobRmPic0DyDQQnx/NlfYUgyz59+oScsH379pAwXABD32nTpoUHIToESeI5mnbE/UqDdyLcafEBf2MCqgC7NwxIbMREJQ0g4D4sfJwnD+AmRrII05cfMWJE+L1169bQr+fip06dGp4oJ83lmYd5wj/EmMa4TaHivo4EeCguYZBnkB5g2aWA69OIEnUHOaGysjIYMGBAMGnSpODYsWPZwCpFmm4lNq+4gSLQA7jcX8DwtjEyRC8wjabnXEx9kfWnTJkSJkAo90xpJVV+FmcVNeYAF5zWngS4C4O91MBxmAv8blLEpbjI5sz9MTdAhcgkCT1RO8mZkAjfiYpTEvStAS53Uw1vAiUGgZ3GpuQEYvoiBqlIan7kSDHnTwJQFNiPu0+5VxCVYhcZIjNrdXUDdp+Eq5AZ3Gkg8QAyVZRZIk4Tl4QAbF9cXJxNYZMAtAokgs4BrNxEpCtteXg7DDTMDKYNSuQdKsnJBek7HxewvxaosWxLYXtw+cJp18217wql4aKCfBNoEu0O5VU+PhctJ0YeXD4C6JQpyrlpSLTojpGGGN5YwNziChdIZLk4lvLcFJ9jMX3QdiImY9bmGQU+TRUL5CHITTRlgF8D9ouD1MfmLoEPl5xokIumZ2cfgMpHt47IW9N64Hsh7wQYYjyIugWuF5fCqYncXRd5vPMWyizzvhi/32+nvG0dZc9vR6fZOu0md5e+uC408FvKSIOZwXlGvxPv95izA2Vtvg1xKFWARI+vMX66HUhpQQb643uW1bSjuTWyw2SBvDrBvjFic1eGGlz5esq3ko9uSIlBRqPuFcCv8F4WIcN12nVaBd0SaYwI6PDDImR11JkqgHcPmQssjxIn6bUshygDFJUTxPMpHk+jfjPgupgdnYV2R/g7xSjtpah8RJBewhwf0gGK6XI92u4wXFEU40afJ4DN4h5LcAd+40HI3JgJecuT0c062W0i2hQJUTcxan3/CMW1PF2K6bbA+Daz4xRs1D3Br1Cm0OihKCqizW78/nXAF/G5TXrEcVzaNMH6CyMswqsAHqDyDLEyou8lwOXnKF8DjI6KjV3KzMBiXkDH8ij/H214J5A596ekrZ3F0zXlWeL7+P5eUrNo3/QwC15uxthuzidy7DzKRwEDaAViiDgKbTbz7CJnzo0bN7pIfIiid8SuPwn25o3QCmpnyjlZkyxPP8EomCJzrGb7GJMx7tNsq4MT2xMUYaiErZOluTzKsnz3gwCeCZyVRZJfYplNEokEjwrPtxlxjeYAk+F1F74VAzPxQRNYYdtpOUvWs8J1sGhBJMNsb7igN8plJs1eSmLIhLKE4rvaCX27gOhLpLOsIzJ7qn/i+wZzcvSOZ23/du8TZjwV8zHIXoP4R3ifBxiFz1dcVpa3aPntPE+c6TmIWE9EtcMmAcPdWAhYhAXxcLOQi9L1WhD1Sc8p1d2oL7XGiRKp8F4A2i8K/nfI+y/gsTDJ/YC/8+AD5Uh04KHiGl+cIFPnBDDrPMjwRGkLXyxO4VGbfQWnDH2v0bVWE3C9QOXlepbgjEfIJQI6XDG3z5ahD9cw2pS78ipB85wyScNTvsVzlzzhL8/jRrnmVjfFJK/m3m4nj9vbgQTguT8XZTjsm672R5uJKEaQmBI/c58gyus8ZDagLpEVSJBIyHp4jn++xqPV71OgQgJYEWOtZ/haxRtKmWOBu8xdBLftWltsY84zE6WIEy/eIOWL+BaayMx+KHtL7EAkqdNDLiEXmEMUHniedtJqg9HmZtfvt26vNi0BdG3Ft3g8ZOf7PAu59TxtzivLNIekyi+wD1i8CuUiD9FXAa8C+/xS3JPmZnomyc7H+fb4/Se0bk41Fel621r4cgVxbq91V4jVqwB7HTe2M7jgB+QWHavZkDRPmZcASoZEmBx6i75bGjPcMdL4/VKGFAGWZkGzPG0XAbdL9A81G5LOmUnC9hHKJeO7dcUMjblSl12867ElFTtaGl20xvvLGPdVz/8TVuU7y0x1PG7vtNg24oz9Uo/Z412++VFWI7Fcog9tu9Lm6gvRmIPv9x1xmQAu6RDkXtbOtlGEmpgD5Nvnyc0dcv0EE6cfdi1HmhMf9wDF3k3gtRvEedhxjpgfqPb9PU9iEJHnyOUA7bQUXh6kq/D7l2iTjWv7XOD530BDr8jIrus+srXjt4MzumJMHuTsBa63YKE1+RR5lBjEikCCnWKWiHdzOgKO+nRIBAF88za/IFmJ3eMZov4CYxGBabcpGL8EYx+SeMXJeRwHNsV/h+vdxeuhEpN3ZyNY78Gm2fknJxVGhyjixPiQvVkNzT1elD9Py/aTAL64Hb9vcYmC9zfdXdT/C1LeGbg4rnBaAihDFJH12W5ulfNCNe/xTsP3bp8ikzJs5BF+5PNfAQYAPaseTdsEcaYAAAAASUVORK5CYII='
+			}
+		},
+		computed: {
+			iconSnowWidth() {
+				return (Math.floor(this.iconSize / 24) || 1) * 2
+			},
+			contentdownText() {
+				return this.contentText.contentdown || t("uni-load-more.contentdown")
+			},
+			contentrefreshText() {
+				return this.contentText.contentrefresh || t("uni-load-more.contentrefresh")
+			},
+			contentnomoreText() {
+				return this.contentText.contentnomore || t("uni-load-more.contentnomore")
+			}
+		},
+		mounted() {
+			// #ifdef APP-PLUS
+			var pages = getCurrentPages();
+			var page = pages[pages.length - 1];
+			var currentWebview = page.$getAppWebview();
+			currentWebview.addEventListener('hide', () => {
+				this.webviewHide = true
+			})
+			currentWebview.addEventListener('show', () => {
+				this.webviewHide = false
+			})
+			// #endif
+		},
+		methods: {
+			onClick() {
+				this.$emit('clickLoadMore', {
+					detail: {
+						status: this.status,
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-load-more {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		height: 40px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-load-more__text {
+		font-size: 14px;
+		margin-left: 8px;
+	}
+
+	.uni-load-more__img {
+		width: 24px;
+		height: 24px;
+		// margin-right: 8px;
+	}
+
+	.uni-load-more__img--nvue {
+		color: #666666;
+	}
+
+	.uni-load-more__img--android,
+	.uni-load-more__img--ios {
+		width: 24px;
+		height: 24px;
+		transform: rotate(0deg);
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-load-more__img--android {
+		animation: loading-ios 1s 0s linear infinite;
+	}
+
+	@keyframes loading-android {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	.uni-load-more__img--ios-H5 {
+		position: relative;
+		animation: loading-ios-H5 1s 0s step-end infinite;
+	}
+
+	.uni-load-more__img--ios-H5 image {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+	}
+
+	@keyframes loading-ios-H5 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		8% {
+			transform: rotate(30deg);
+		}
+
+		16% {
+			transform: rotate(60deg);
+		}
+
+		24% {
+			transform: rotate(90deg);
+		}
+
+		32% {
+			transform: rotate(120deg);
+		}
+
+		40% {
+			transform: rotate(150deg);
+		}
+
+		48% {
+			transform: rotate(180deg);
+		}
+
+		56% {
+			transform: rotate(210deg);
+		}
+
+		64% {
+			transform: rotate(240deg);
+		}
+
+		73% {
+			transform: rotate(270deg);
+		}
+
+		82% {
+			transform: rotate(300deg);
+		}
+
+		91% {
+			transform: rotate(330deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	/* #endif */
+
+	/* #ifdef H5 */
+	.uni-load-more__img--android-H5 {
+		animation: loading-android-H5-rotate 2s linear infinite;
+		transform-origin: center center;
+	}
+
+	.uni-load-more__img--android-H5 circle {
+		display: inline-block;
+		animation: loading-android-H5-dash 1.5s ease-in-out infinite;
+		stroke: currentColor;
+		stroke-linecap: round;
+	}
+
+	@keyframes loading-android-H5-rotate {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-H5-dash {
+		0% {
+			stroke-dasharray: 1, 200;
+			stroke-dashoffset: 0;
+		}
+
+		50% {
+			stroke-dasharray: 90, 150;
+			stroke-dashoffset: -40;
+		}
+
+		100% {
+			stroke-dasharray: 90, 150;
+			stroke-dashoffset: -120;
+		}
+	}
+
+	/* #endif */
+
+	/* #ifndef APP-NVUE || H5 */
+	.uni-load-more__img--android-MP {
+		position: relative;
+		width: 24px;
+		height: 24px;
+		transform: rotate(0deg);
+		animation: loading-ios 1s 0s ease infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon {
+		position: absolute;
+		box-sizing: border-box;
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+		border: solid 2px transparent;
+		border-top: solid 2px #777777;
+		transform-origin: center;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(1) {
+		animation: loading-android-MP-1 1s 0s linear infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(2) {
+		animation: loading-android-MP-2 1s 0s linear infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(3) {
+		animation: loading-android-MP-3 1s 0s linear infinite;
+	}
+
+	@keyframes loading-android {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-1 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(90deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-2 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(180deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-3 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(270deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-load-more/package.json b/uni_modules/uni-load-more/package.json
new file mode 100644
index 0000000..2fa6f04
--- /dev/null
+++ b/uni_modules/uni-load-more/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-load-more",
+  "displayName": "uni-load-more 加载更多",
+  "version": "1.3.3",
+  "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "加载更多",
+    "load-more"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["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-load-more/readme.md b/uni_modules/uni-load-more/readme.md
new file mode 100644
index 0000000..54dc1fa
--- /dev/null
+++ b/uni_modules/uni-load-more/readme.md
@@ -0,0 +1,14 @@
+
+
+### LoadMore 加载更多
+> **组件名：uni-load-more**
+> 代码块： `uLoadMore`
+
+
+用于列表中，做滚动加载使用，展示 loading 的各种状态。
+
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-nav-bar/changelog.md b/uni_modules/uni-nav-bar/changelog.md
new file mode 100644
index 0000000..f0f6b56
--- /dev/null
+++ b/uni_modules/uni-nav-bar/changelog.md
@@ -0,0 +1,41 @@
+## 1.3.6（2022-06-30）
+- 修复 组件示例中插槽用法无法显示内容的bug
+## 1.3.5（2022-05-24）
+- 新增 stat 属性 ，可开启统计title 上报 ，仅使用了title 属性且项目开启了uni统计生效
+## 1.3.4（2022-01-24）
+- 更新 组件示例
+## 1.3.3（2022-01-24）
+- 新增 left-width/right-width属性 ，可修改左右两侧的宽度
+## 1.3.2（2022-01-18）
+- 修复 在vue下，标题不垂直居中的bug
+## 1.3.1（2022-01-18）
+- 修复 height 属性类型错误
+## 1.3.0（2022-01-18）
+- 新增 height 属性,可修改组件高度
+- 新增 dark 属性可可开启暗黑模式
+- 优化 标题字数过多显示省略号
+- 优化 插槽，插入内容可完全覆盖
+## 1.2.1（2022-01-10）
+- 修复 color 属性不生效的bug
+## 1.2.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-nav-bar](https://uniapp.dcloud.io/component/uniui/uni-nav-bar)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.11（2021-05-12）
+- 新增 组件示例地址
+## 1.0.10（2021-04-30）
+- 修复 在nvue下fixed为true，宽度不能撑满的Bug
+## 1.0.9（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.8（2021-04-14）
+- uni-ui 修复 uni-nav-bar 当 fixed 属性为 true 时铺不满屏幕的 bug
+
+## 1.0.7（2021-02-25）
+- 修复 easycom 下，找不到 uni-status-bar 的bug
+
+## 1.0.6（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
new file mode 100644
index 0000000..cbfc168
--- /dev/null
+++ b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
@@ -0,0 +1,348 @@
+<template>
+	<view class="uni-navbar" :class="{'uni-dark':dark}">
+		<view :class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }"
+			:style="{ 'background-color': themeBgColor }" class="uni-navbar__content">
+			<status-bar v-if="statusBar" />
+			<view :style="{ color: themeColor,backgroundColor: themeBgColor ,height:navbarHeight}"
+				class="uni-navbar__header">
+				<view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left"
+					:style="{width:leftIconWidth}">
+					<slot name="left">
+						<view class="uni-navbar__content_view" v-if="leftIcon.length > 0">
+							<uni-icons :color="themeColor" :type="leftIcon" size="20" />
+						</view>
+						<view :class="{ 'uni-navbar-btn-icon-left': !leftIcon.length > 0 }" class="uni-navbar-btn-text"
+							v-if="leftText.length">
+							<text :style="{ color: themeColor, fontSize: '12px' }">{{ leftText }}</text>
+						</view>
+					</slot>
+				</view>
+				<view class="uni-navbar__header-container " @tap="onClickTitle">
+					<slot>
+						<view class="uni-navbar__header-container-inner" v-if="title.length>0">
+							<text class="uni-nav-bar-text uni-ellipsis-1"
+								:style="{color: themeColor }">{{ title }}</text>
+						</view>
+					</slot>
+				</view>
+				<view @click="onClickRight" class="uni-navbar__header-btns uni-navbar__header-btns-right"
+					:style="{width:rightIconWidth}">
+					<slot name="right">
+						<view v-if="rightIcon.length">
+							<uni-icons :color="themeColor" :type="rightIcon" size="22" />
+						</view>
+						<view class="uni-navbar-btn-text" v-if="rightText.length && !rightIcon.length">
+							<text class="uni-nav-bar-right-text" :style="{ color: themeColor}">{{ rightText }}</text>
+						</view>
+					</slot>
+				</view>
+			</view>
+		</view>
+		<view class="uni-navbar__placeholder" v-if="fixed">
+			<status-bar v-if="statusBar" />
+			<view class="uni-navbar__placeholder-view" :style="{ height:navbarHeight}" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import statusBar from "./uni-status-bar.vue";
+	const getVal = (val) => typeof val === 'number' ? val + 'px' : val;
+
+	/**
+	 * NavBar 自定义导航栏
+	 * @description 导航栏组件，主要用于头部导航
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=52
+	 * @property {Boolean} dark 开启黑暗模式
+	 * @property {String} title 标题文字
+	 * @property {String} leftText 左侧按钮文本
+	 * @property {String} rightText 右侧按钮文本
+	 * @property {String} leftIcon 左侧按钮图标（图标类型参考 [Icon 图标](http://ext.dcloud.net.cn/plugin?id=28) type 属性）
+	 * @property {String} rightIcon 右侧按钮图标（图标类型参考 [Icon 图标](http://ext.dcloud.net.cn/plugin?id=28) type 属性）
+	 * @property {String} color 图标和文字颜色
+	 * @property {String} backgroundColor 导航栏背景颜色
+	 * @property {Boolean} fixed = [true|false] 是否固定顶部
+	 * @property {Boolean} statusBar = [true|false] 是否包含状态栏
+	 * @property {Boolean} shadow = [true|false] 导航栏下是否有阴影
+	 * @property {Boolean} stat 是否开启统计标题上报
+	 * @event {Function} clickLeft 左侧按钮点击时触发
+	 * @event {Function} clickRight 右侧按钮点击时触发
+	 * @event {Function} clickTitle 中间标题点击时触发
+	 */
+	export default {
+		name: "UniNavBar",
+		components: {
+			statusBar
+		},
+		emits: ['clickLeft', 'clickRight', 'clickTitle'],
+		props: {
+			dark: {
+				type: Boolean,
+				default: false
+			},
+			title: {
+				type: String,
+				default: ""
+			},
+			leftText: {
+				type: String,
+				default: ""
+			},
+			rightText: {
+				type: String,
+				default: ""
+			},
+			leftIcon: {
+				type: String,
+				default: ""
+			},
+			rightIcon: {
+				type: String,
+				default: ""
+			},
+			fixed: {
+				type: [Boolean, String],
+				default: false
+			},
+			color: {
+				type: String,
+				default: ""
+			},
+			backgroundColor: {
+				type: String,
+				default: ""
+			},
+			statusBar: {
+				type: [Boolean, String],
+				default: false
+			},
+			shadow: {
+				type: [Boolean, String],
+				default: false
+			},
+			border: {
+				type: [Boolean, String],
+				default: true
+			},
+			height: {
+				type: [Number, String],
+				default: 44
+			},
+			leftWidth: {
+				type: [Number, String],
+				default: 60
+			},
+			rightWidth: {
+				type: [Number, String],
+				default: 60
+			},
+			stat: {
+				type: [Boolean, String],
+				default: ''
+			}
+		},
+		computed: {
+			themeBgColor() {
+				if (this.dark) {
+					// 默认值
+					if (this.backgroundColor) {
+						return this.backgroundColor
+					} else {
+						return this.dark ? '#333' : '#FFF'
+					}
+				}
+				return this.backgroundColor || '#FFF'
+			},
+			themeColor() {
+				if (this.dark) {
+					// 默认值
+					if (this.color) {
+						return this.color
+					} else {
+						return this.dark ? '#fff' : '#333'
+					}
+				}
+				return this.color || '#333'
+			},
+			navbarHeight() {
+				return getVal(this.height)
+			},
+			leftIconWidth() {
+				return getVal(this.leftWidth)
+			},
+			rightIconWidth() {
+				return getVal(this.rightWidth)
+			}
+		},
+		mounted() {
+			if (uni.report && this.stat && this.title !== '') {
+				uni.report('title', this.title)
+			}
+		},
+		methods: {
+			onClickLeft() {
+				this.$emit("clickLeft");
+			},
+			onClickRight() {
+				this.$emit("clickRight");
+			},
+			onClickTitle() {
+				this.$emit("clickTitle");
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	$nav-height: 44px;
+
+	.uni-navbar {
+		// box-sizing: border-box;
+	}
+
+	.uni-nav-bar-text {
+		/* #ifdef APP-PLUS */
+		font-size: 34rpx;
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		font-size: 14px;
+		/* #endif */
+	}
+
+	.uni-nav-bar-right-text {
+		font-size: 12px;
+	}
+
+	.uni-navbar__content {
+		position: relative;
+		// background-color: #fff;
+		// box-sizing: border-box;
+		background-color: transparent;
+	}
+
+	.uni-navbar__content_view {
+		// box-sizing: border-box;
+	}
+
+	.uni-navbar-btn-text {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: flex-start;
+		align-items: center;
+		line-height: 12px;
+	}
+
+	.uni-navbar__header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		padding: 0 10px;
+		flex-direction: row;
+		height: $nav-height;
+		font-size: 12px;
+	}
+
+	.uni-navbar__header-btns {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		display: flex;
+		/* #endif */
+		flex-wrap: nowrap;
+		flex-direction: row;
+		width: 120rpx;
+		// padding: 0 6px;
+		justify-content: center;
+		align-items: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-navbar__header-btns-left {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		width: 120rpx;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.uni-navbar__header-btns-right {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		// width: 150rpx;
+		// padding-right: 30rpx;
+		justify-content: flex-end;
+		align-items: center;
+	}
+
+	.uni-navbar__header-container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		padding: 0 10px;
+		overflow: hidden;
+	}
+
+	.uni-navbar__header-container-inner {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		font-size: 12px;
+		overflow: hidden;
+		// box-sizing: border-box;
+	}
+
+
+	.uni-navbar__placeholder-view {
+		height: $nav-height;
+	}
+
+	.uni-navbar--fixed {
+		position: fixed;
+		z-index: 998;
+		/* #ifdef H5 */
+		left: var(--window-left);
+		right: var(--window-right);
+		/* #endif */
+		/* #ifndef H5 */
+		left: 0;
+		right: 0;
+		/* #endif */
+
+	}
+
+	.uni-navbar--shadow {
+		box-shadow: 0 1px 6px #ccc;
+	}
+
+	.uni-navbar--border {
+		border-bottom-width: 1rpx;
+		border-bottom-style: solid;
+		border-bottom-color: #eee;
+	}
+
+	.uni-ellipsis-1 {
+		overflow: hidden;
+		/* #ifndef APP-NVUE */
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		text-overflow: ellipsis;
+		/* #endif */
+	}
+
+	// 暗主题配置
+	.uni-dark {}
+</style>
diff --git a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue
new file mode 100644
index 0000000..6a68874
--- /dev/null
+++ b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue
@@ -0,0 +1,27 @@
+<template>
+	<view :style="{ height: statusBarHeight }" class="uni-status-bar">
+		<slot />
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'UniStatusBar',
+		data() {
+			return {
+				statusBarHeight: 20
+			}
+		},
+		mounted() {
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-status-bar {
+		// width: 750rpx;
+		height: 20px;
+		// height: var(--status-bar-height);
+	}
+</style>
diff --git a/uni_modules/uni-nav-bar/package.json b/uni_modules/uni-nav-bar/package.json
new file mode 100644
index 0000000..e3fe073
--- /dev/null
+++ b/uni_modules/uni-nav-bar/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "uni-nav-bar",
+  "displayName": "uni-nav-bar 自定义导航栏",
+  "version": "1.3.6",
+  "description": "自定义导航栏组件，主要用于头部导航。",
+  "keywords": [
+    "uni-ui",
+    "导航",
+    "导航栏",
+    "自定义导航栏"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "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-nav-bar/readme.md b/uni_modules/uni-nav-bar/readme.md
new file mode 100644
index 0000000..3934b32
--- /dev/null
+++ b/uni_modules/uni-nav-bar/readme.md
@@ -0,0 +1,15 @@
+
+
+## NavBar 导航栏
+> **组件名：uni-nav-bar**
+> 代码块： `uNavBar`
+
+导航栏组件，主要用于头部导航。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-nav-bar)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
+
diff --git a/uni_modules/uni-notice-bar/changelog.md b/uni_modules/uni-notice-bar/changelog.md
new file mode 100644
index 0000000..9ee75a0
--- /dev/null
+++ b/uni_modules/uni-notice-bar/changelog.md
@@ -0,0 +1,16 @@
+## 1.2.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-notice-bar](https://uniapp.dcloud.io/component/uniui/uni-notice-bar)
+## 1.1.1（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.9（2021-05-12）
+- 新增 组件示例地址
+## 1.0.8（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.7（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.6（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue b/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue
new file mode 100644
index 0000000..424430d
--- /dev/null
+++ b/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue
@@ -0,0 +1,395 @@
+<template>
+	<view v-if="show" class="uni-noticebar" :style="{ backgroundColor: backgroundColor }" @click="onClick">
+		<uni-icons v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon" type="sound"
+			:color="color" size="22" />
+		<view ref="textBox" class="uni-noticebar__content-wrapper"
+			:class="{'uni-noticebar__content-wrapper--scrollable':scrollable, 'uni-noticebar__content-wrapper--single':!scrollable && (single || moreText)}">
+			<view :id="elIdBox" class="uni-noticebar__content"
+				:class="{'uni-noticebar__content--scrollable':scrollable, 'uni-noticebar__content--single':!scrollable && (single || moreText)}">
+				<text :id="elId" ref="animationEle" class="uni-noticebar__content-text"
+					:class="{'uni-noticebar__content-text--scrollable':scrollable,'uni-noticebar__content-text--single':!scrollable && (single || showGetMore)}"
+					:style="{color:color, width:wrapWidth+'px', 'animationDuration': animationDuration, '-webkit-animationDuration': animationDuration ,animationPlayState: webviewHide?'paused':animationPlayState,'-webkit-animationPlayState':webviewHide?'paused':animationPlayState, animationDelay: animationDelay, '-webkit-animationDelay':animationDelay}">{{text}}</text>
+			</view>
+		</view>
+		<view v-if="showGetMore === true || showGetMore === 'true'" class="uni-noticebar__more uni-cursor-point"
+			@click="clickMore">
+			<text v-if="moreText.length > 0" :style="{ color: moreColor }" class="uni-noticebar__more-text">{{ moreText }}</text>
+			<uni-icons v-else type="right" :color="moreColor" size="16" />
+		</view>
+		<view class="uni-noticebar-close uni-cursor-point" v-if="(showClose === true || showClose === 'true') && (showGetMore === false || showGetMore === 'false')">
+			<uni-icons
+				type="closeempty" :color="color" size="16" @click="close" />
+		</view>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = weex.requireModule('dom');
+	const animation = weex.requireModule('animation');
+	// #endif
+
+	/**
+	 * NoticeBar 自定义导航栏
+	 * @description 通告栏组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=30
+	 * @property {Number} speed 文字滚动的速度，默认100px/秒
+	 * @property {String} text 显示文字
+	 * @property {String} backgroundColor 背景颜色
+	 * @property {String} color 文字颜色
+	 * @property {String} moreColor 查看更多文字的颜色
+	 * @property {String} moreText 设置“查看更多”的文本
+	 * @property {Boolean} single = [true|false] 是否单行
+	 * @property {Boolean} scrollable = [true|false] 是否滚动，为true时，NoticeBar为单行
+	 * @property {Boolean} showIcon = [true|false] 是否显示左侧喇叭图标
+	 * @property {Boolean} showClose = [true|false] 是否显示左侧关闭按钮
+	 * @property {Boolean} showGetMore = [true|false] 是否显示右侧查看更多图标，为true时，NoticeBar为单行
+	 * @event {Function} click 点击 NoticeBar 触发事件
+	 * @event {Function} close 关闭 NoticeBar 触发事件
+	 * @event {Function} getmore 点击”查看更多“时触发事件
+	 */
+
+	export default {
+		name: 'UniNoticeBar',
+		emits: ['click', 'getmore', 'close'],
+		props: {
+			text: {
+				type: String,
+				default: ''
+			},
+			moreText: {
+				type: String,
+				default: ''
+			},
+			backgroundColor: {
+				type: String,
+				default: '#FFF9EA'
+			},
+			speed: {
+				// 默认1s滚动100px
+				type: Number,
+				default: 100
+			},
+			color: {
+				type: String,
+				default: '#FF9A43'
+			},
+			moreColor: {
+				type: String,
+				default: '#FF9A43'
+			},
+			single: {
+				// 是否单行
+				type: [Boolean, String],
+				default: false
+			},
+			scrollable: {
+				// 是否滚动，添加后控制单行效果取消
+				type: [Boolean, String],
+				default: false
+			},
+			showIcon: {
+				// 是否显示左侧icon
+				type: [Boolean, String],
+				default: false
+			},
+			showGetMore: {
+				// 是否显示右侧查看更多
+				type: [Boolean, String],
+				default: false
+			},
+			showClose: {
+				// 是否显示左侧关闭按钮
+				type: [Boolean, String],
+				default: false
+			}
+		},
+		data() {
+			const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			const elIdBox = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			return {
+				textWidth: 0,
+				boxWidth: 0,
+				wrapWidth: '',
+				webviewHide: false,
+				// #ifdef APP-NVUE
+				stopAnimation: false,
+				// #endif
+				elId: elId,
+				elIdBox: elIdBox,
+				show: true,
+				animationDuration: 'none',
+				animationPlayState: 'paused',
+				animationDelay: '0s'
+			}
+		},
+		mounted() {
+			// #ifdef APP-PLUS
+			var pages = getCurrentPages();
+			var page = pages[pages.length - 1];
+			var currentWebview = page.$getAppWebview();
+			currentWebview.addEventListener('hide', () => {
+				this.webviewHide = true
+			})
+			currentWebview.addEventListener('show', () => {
+				this.webviewHide = false
+			})
+			// #endif
+			this.$nextTick(() => {
+				this.initSize()
+			})
+		},
+		// #ifdef APP-NVUE
+		beforeDestroy() {
+			this.stopAnimation = true
+		},
+		// #endif
+		methods: {
+			initSize() {
+				if (this.scrollable) {
+					// #ifndef APP-NVUE
+					let query = [],
+						boxWidth = 0,
+						textWidth = 0;
+					let textQuery = new Promise((resolve, reject) => {
+						uni.createSelectorQuery()
+							// #ifndef MP-ALIPAY
+							.in(this)
+							// #endif
+							.select(`#${this.elId}`)
+							.boundingClientRect()
+							.exec(ret => {
+								this.textWidth = ret[0].width
+								resolve()
+							})
+					})
+					let boxQuery = new Promise((resolve, reject) => {
+						uni.createSelectorQuery()
+							// #ifndef MP-ALIPAY
+							.in(this)
+							// #endif
+							.select(`#${this.elIdBox}`)
+							.boundingClientRect()
+							.exec(ret => {
+								this.boxWidth = ret[0].width
+								resolve()
+							})
+					})
+					query.push(textQuery)
+					query.push(boxQuery)
+					Promise.all(query).then(() => {
+						this.animationDuration = `${this.textWidth / this.speed}s`
+						this.animationDelay = `-${this.boxWidth / this.speed}s`
+						setTimeout(() => {
+							this.animationPlayState = 'running'
+						}, 1000)
+					})
+					// #endif
+					// #ifdef APP-NVUE
+					dom.getComponentRect(this.$refs['animationEle'], (res) => {
+						let winWidth = uni.getSystemInfoSync().windowWidth
+						this.textWidth = res.size.width
+						animation.transition(this.$refs['animationEle'], {
+							styles: {
+								transform: `translateX(-${winWidth}px)`
+							},
+							duration: 0,
+							timingFunction: 'linear',
+							delay: 0
+						}, () => {
+							if (!this.stopAnimation) {
+								animation.transition(this.$refs['animationEle'], {
+									styles: {
+										transform: `translateX(-${this.textWidth}px)`
+									},
+									timingFunction: 'linear',
+									duration: (this.textWidth - winWidth) / this.speed * 1000,
+									delay: 1000
+								}, () => {
+									if (!this.stopAnimation) {
+										this.loopAnimation()
+									}
+								});
+							}
+						});
+					})
+					// #endif
+				}
+				// #ifdef APP-NVUE
+				if (!this.scrollable && (this.single || this.moreText)) {
+					dom.getComponentRect(this.$refs['textBox'], (res) => {
+						this.wrapWidth = res.size.width
+					})
+				}
+				// #endif
+			},
+			loopAnimation() {
+				// #ifdef APP-NVUE
+				animation.transition(this.$refs['animationEle'], {
+					styles: {
+						transform: `translateX(0px)`
+					},
+					duration: 0
+				}, () => {
+					if (!this.stopAnimation) {
+						animation.transition(this.$refs['animationEle'], {
+							styles: {
+								transform: `translateX(-${this.textWidth}px)`
+							},
+							duration: this.textWidth / this.speed * 1000,
+							timingFunction: 'linear',
+							delay: 0
+						}, () => {
+							if (!this.stopAnimation) {
+								this.loopAnimation()
+							}
+						});
+					}
+				});
+				// #endif
+			},
+			clickMore() {
+				this.$emit('getmore')
+			},
+			close() {
+				this.show = false;
+				this.$emit('close')
+			},
+			onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-noticebar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		width: 100%;
+		box-sizing: border-box;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 10px 12px;
+		margin-bottom: 10px;
+	}
+
+	.uni-cursor-point {
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-noticebar-close {
+		margin-left: 8px;
+		margin-right: 5px;
+	}
+
+	.uni-noticebar-icon {
+		margin-right: 5px;
+	}
+
+	.uni-noticebar__content-wrapper {
+		flex: 1;
+		flex-direction: column;
+		overflow: hidden;
+	}
+
+	.uni-noticebar__content-wrapper--single {
+		/* #ifndef APP-NVUE */
+		line-height: 18px;
+		/* #endif */
+	}
+
+	.uni-noticebar__content-wrapper--single,
+	.uni-noticebar__content-wrapper--scrollable {
+		flex-direction: row;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-noticebar__content-wrapper--scrollable {
+		position: relative;
+		height: 18px;
+	}
+
+	/* #endif */
+
+	.uni-noticebar__content--scrollable {
+		/* #ifdef APP-NVUE */
+		flex: 0;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		flex: 1;
+		display: block;
+		overflow: hidden;
+		/* #endif */
+	}
+
+	.uni-noticebar__content--single {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex: none;
+		width: 100%;
+		justify-content: center;
+		/* #endif */
+	}
+
+	.uni-noticebar__content-text {
+		font-size: 14px;
+		line-height: 18px;
+		/* #ifndef APP-NVUE */
+		word-break: break-all;
+		/* #endif */
+	}
+
+	.uni-noticebar__content-text--single {
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		display: block;
+		width: 100%;
+		white-space: nowrap;
+		/* #endif */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.uni-noticebar__content-text--scrollable {
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		padding-left: 750rpx;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		position: absolute;
+		display: block;
+		height: 18px;
+		line-height: 18px;
+		white-space: nowrap;
+		padding-left: 100%;
+		animation: notice 10s 0s linear infinite both;
+		animation-play-state: paused;
+		/* #endif */
+	}
+
+	.uni-noticebar__more {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-items: center;
+		padding-left: 5px;
+	}
+
+	.uni-noticebar__more-text {
+		font-size: 14px;
+	}
+
+	@keyframes notice {
+		100% {
+			transform: translate3d(-100%, 0, 0);
+		}
+	}
+</style>
diff --git a/uni_modules/uni-notice-bar/package.json b/uni_modules/uni-notice-bar/package.json
new file mode 100644
index 0000000..97719a0
--- /dev/null
+++ b/uni_modules/uni-notice-bar/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uni-notice-bar",
+  "displayName": "uni-notice-bar 通告栏",
+  "version": "1.2.0",
+  "description": "NoticeBar 通告栏组件，常用于展示公告信息，可设为滚动公告",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "通告栏",
+    "公告",
+    "跑马灯"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "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-notice-bar/readme.md b/uni_modules/uni-notice-bar/readme.md
new file mode 100644
index 0000000..fb2ede2
--- /dev/null
+++ b/uni_modules/uni-notice-bar/readme.md
@@ -0,0 +1,13 @@
+
+
+## NoticeBar 通告栏
+> **组件名：uni-notice-bar**
+> 代码块： `uNoticeBar`
+
+
+通告栏组件 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-notice-bar)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-number-box/changelog.md b/uni_modules/uni-number-box/changelog.md
new file mode 100644
index 0000000..5925c32
--- /dev/null
+++ b/uni_modules/uni-number-box/changelog.md
@@ -0,0 +1,25 @@
+## 1.2.1（2021-11-22）
+- 修复 vue3中某些scss变量无法找到的问题
+## 1.2.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-number-box](https://uniapp.dcloud.io/component/uniui/uni-number-box)
+## 1.1.2（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 1.1.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-05-12）
+- 新增 组件示例地址
+## 1.0.6（2021-04-20）
+- 修复 uni-number-box 浮点数运算不精确的 bug
+- 修复 uni-number-box change 事件触发不正确的 bug
+- 新增 uni-number-box v-model 双向绑定
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范
+
+## 1.0.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 v-model
+- 新增 支持 focus、blur 事件
+- 新增 支持 PC 端
diff --git a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
new file mode 100644
index 0000000..6f8393a
--- /dev/null
+++ b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
@@ -0,0 +1,258 @@
+<template>
+	<view class="uni-numbox">
+		<view @click="_calcValue('minus')" class="uni-numbox__minus uni-numbox-btns" :style="{background}">
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue <= min || disabled }"
+				:style="{color}">-</text>
+		</view>
+		<input :disabled="disabled" @focus="_onFocus" @blur="_onBlur" class="uni-numbox__value" type="number"
+			:focus="focus" v-model="inputValue" :style="{background, color}" @input="checkNum" :maxlength="maxlength" />
+		<view @click="_calcValue('plus')" class="uni-numbox__plus uni-numbox-btns" :style="{background}">
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue >= max || disabled }"
+				:style="{color}">+</text>
+		</view>
+	</view>
+</template>
+<script>
+	/**
+	 * NumberBox 数字输入框
+	 * @description 带加减按钮的数字输入框
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=31
+	 * @property {Number} value 输入框当前值
+	 * @property {Number} min 最小值
+	 * @property {Number} max 最大值
+	 * @property {Number} step 每次点击改变的间隔大小
+	 * @property {String} background 背景色
+	 * @property {String} color 字体颜色（前景色）
+	 * @property {Boolean} disabled = [true|false] 是否为禁用状态
+	 * @event {Function} change 输入框值改变时触发的事件，参数为输入框当前的 value
+	 * @event {Function} focus 输入框聚焦时触发的事件，参数为 event 对象
+	 * @event {Function} blur 输入框失焦时触发的事件，参数为 event 对象
+	 */
+	import {
+		Decimal
+	} from 'decimal.js'; //引入
+	export default {
+		name: "UniNumberBox",
+		emits: ['change', 'input', 'update:modelValue', 'blur', 'focus'],
+		props: {
+			value: {
+				type: [Number, String],
+				default: 1
+			},
+			modelValue: {
+				type: [Number, String],
+				default: 1
+			},
+			min: {
+				type: Number,
+				default: 0
+			},
+			max: {
+				type: Number,
+				default: 100
+			},
+			step: {
+				type: Number,
+				default: 1
+			},
+			background: {
+				type: String,
+				default: '#f5f5f5'
+			},
+			color: {
+				type: String,
+				default: '#333'
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			focus: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				inputValue: 0,
+				maxlength: 10
+			};
+		},
+		watch: {
+			value(val) {
+				this.inputValue = this.add(this.inputValue, val)
+			},
+			modelValue(val) {
+				this.inputValue = this.add(this.inputValue, val)
+			}
+		},
+		created() {
+			if (this.value === 1) {
+				this.inputValue = this.add(this.inputValue, this.modelValue)
+			}
+			if (this.modelValue === 1) {
+				this.inputValue = this.add(this.inputValue, this.value)
+			}
+		},
+		methods: {
+			add(num1, num2) {
+				return new Decimal(num1).add(new Decimal(num2))
+			},
+
+			sub(num1, num2) {
+				return new Decimal(num1).sub(new Decimal(num2))
+			},
+			
+			mul(num1,num2) {
+			    return new Decimal(num1).mul(new Decimal(num2))
+			},
+			div(num1,num2) {
+			    return new Decimal(num1).div(new Decimal(num2))
+			},
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //鍖呭惈灏忔暟鐐
+				let reg = /^[0-9]+$/; //姝ｆ暣鏁
+				if (dot > -1) {
+					this.maxlength = dot + 7; //闀垮害鏄¯灏忔暟鐐瑰悗涓や綅
+					if (value.length > dot + 7) {
+
+					}
+				}
+				if (reg.test(value)) { //濡傛灉鏄¯姝ｆ暣鏁颁笉鍖呭惈灏忔暟鐐
+					this.maxlength = 10;
+				}
+			},
+			_calcValue(type) {
+				if (this.disabled) {
+					return;
+				}
+				const scale = this._getDecimalScale();
+				let value = this.inputValue * scale;
+				let step = this.step * scale;
+				if (type === "minus") {
+					value = this.sub(value - step)
+					if (value < (this.min * scale)) {
+						return;
+					}
+					if (value > (this.max * scale)) {
+						value = this.max * scale
+					}
+				}
+
+				if (type === "plus") {
+					value = this.add(value, step)
+			
+				if (value > (this.max * scale)) {
+					return;
+				}
+				if (value < (this.min * scale)) {
+					value = this.min * scale
+				}
+			}
+
+			this.inputValue = (value / scale).toFixed(String(scale).length - 1);
+			this.$emit("change", +this.inputValue);
+			// TODO vue2 兼容
+			this.$emit("input", +this.inputValue);
+			// TODO vue3 兼容
+			this.$emit("update:modelValue", +this.inputValue);
+		},
+		_getDecimalScale() {
+
+			let scale = 1;
+			// 浮点型
+			if (~~this.step !== this.step) {
+				scale = Math.pow(10, String(this.step).split(".")[1].length);
+			}
+			return scale;
+		},
+		_onBlur(event) {
+			this.$emit('blur', event)
+			let value = event.detail.value;
+			if (!value) {
+				// this.inputValue = 0;
+				return;
+			}
+			value = +value;
+			if (value > this.max) {
+				value = this.max;
+			} else if (value < this.min) {
+				value = this.min;
+			}
+			const scale = this._getDecimalScale();
+			this.inputValue = value.toFixed(String(scale).length - 1);
+			this.$emit("change", +this.inputValue);
+			this.$emit("input", +this.inputValue);
+		},
+		_onFocus(event) {
+			this.$emit('focus', event)
+		}
+	}
+	};
+</script>
+<style lang="scss" scoped>
+	$box-height: 26px;
+	$bg: #f5f5f5;
+	$br: 2px;
+	$color: #333;
+
+	.uni-numbox {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-numbox-btns {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 8px;
+		background-color: $bg;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-numbox__value {
+		margin: 0 2px;
+		background-color: $bg;
+		width: 100rpx;
+		height: $box-height;
+		text-align: center;
+		font-size: 14px;
+		border-left-width: 0;
+		border-right-width: 0;
+		color: $color;
+	}
+
+	.uni-numbox__minus {
+		border-top-left-radius: $br;
+		border-bottom-left-radius: $br;
+	}
+
+	.uni-numbox__plus {
+		border-top-right-radius: $br;
+		border-bottom-right-radius: $br;
+	}
+
+	.uni-numbox--text {
+		// fix nvue
+		line-height: 20px;
+
+		font-size: 20px;
+		font-weight: 300;
+		color: $color;
+	}
+
+	.uni-numbox .uni-numbox--disabled {
+		color: #c0c0c0 !important;
+		/* #ifdef H5 */
+		cursor: not-allowed;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-number-box/package.json b/uni_modules/uni-number-box/package.json
new file mode 100644
index 0000000..ad82336
--- /dev/null
+++ b/uni_modules/uni-number-box/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "uni-number-box",
+  "displayName": "uni-number-box 数字输入框",
+  "version": "1.2.1",
+  "description": "NumberBox 带加减按钮的数字输入框组件，用户可以控制每次点击增加的数值，支持小数。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "数字输入框"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["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-number-box/readme.md b/uni_modules/uni-number-box/readme.md
new file mode 100644
index 0000000..affc56f
--- /dev/null
+++ b/uni_modules/uni-number-box/readme.md
@@ -0,0 +1,13 @@
+
+
+## NumberBox 数字输入框
+> **组件名：uni-number-box**
+> 代码块： `uNumberBox`
+
+
+带加减按钮的数字输入框。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-number-box)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-pagination/changelog.md b/uni_modules/uni-pagination/changelog.md
new file mode 100644
index 0000000..4934027
--- /dev/null
+++ b/uni_modules/uni-pagination/changelog.md
@@ -0,0 +1,22 @@
+## 1.2.2（2022-07-06）
+- 修复 es 语言 i18n 错误
+## 1.2.1（2021-11-22）
+- 修复 vue3中某些scss变量无法找到的问题
+## 1.2.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-pagination](https://uniapp.dcloud.io/component/uniui/uni-pagination)
+## 1.1.2（2021-10-08）
+- 修复 current 、value 属性未监听，导致高亮样式失效的 bug
+## 1.1.1（2021-08-20）
+- 新增 支持国际化
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-05-12）
+- 新增 组件示例地址
+## 1.0.6（2021-04-12）
+- 新增 PC 和 移动端适配不同的 ui 
+## 1.0.5（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-pagination/components/uni-pagination/i18n/en.json b/uni_modules/uni-pagination/components/uni-pagination/i18n/en.json
new file mode 100644
index 0000000..d6e2897
--- /dev/null
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/en.json
@@ -0,0 +1,5 @@
+{
+	"uni-pagination.prevText": "prev",
+	"uni-pagination.nextText": "next",
+	"uni-pagination.piecePerPage": "piece/page"
+}
diff --git a/uni_modules/uni-pagination/components/uni-pagination/i18n/es.json b/uni_modules/uni-pagination/components/uni-pagination/i18n/es.json
new file mode 100644
index 0000000..604a113
--- /dev/null
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/es.json
@@ -0,0 +1,5 @@
+{
+	"uni-pagination.prevText": "anterior",
+	"uni-pagination.nextText": "prxima",
+	"uni-pagination.piecePerPage": "Art��culo/P��gina"
+}
diff --git a/uni_modules/uni-pagination/components/uni-pagination/i18n/fr.json b/uni_modules/uni-pagination/components/uni-pagination/i18n/fr.json
new file mode 100644
index 0000000..a7a0c77
--- /dev/null
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/fr.json
@@ -0,0 +1,5 @@
+{
+	"uni-pagination.prevText": "précédente",
+	"uni-pagination.nextText": "suivante",
+	"uni-pagination.piecePerPage": "Articles/Pages"
+}
diff --git a/uni_modules/uni-pagination/components/uni-pagination/i18n/index.js b/uni_modules/uni-pagination/components/uni-pagination/i18n/index.js
new file mode 100644
index 0000000..2469dd0
--- /dev/null
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/index.js
@@ -0,0 +1,12 @@
+import en from './en.json'
+import es from './es.json'
+import fr from './fr.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	es,
+	fr,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-pagination/components/uni-pagination/i18n/zh-Hans.json b/uni_modules/uni-pagination/components/uni-pagination/i18n/zh-Hans.json
new file mode 100644
index 0000000..782bbe4
--- /dev/null
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/zh-Hans.json
@@ -0,0 +1,5 @@
+{
+	"uni-pagination.prevText": "上一页",
+	"uni-pagination.nextText": "下一页",
+	"uni-pagination.piecePerPage": "条/页"
+}
diff --git a/uni_modules/uni-pagination/components/uni-pagination/i18n/zh-Hant.json b/uni_modules/uni-pagination/components/uni-pagination/i18n/zh-Hant.json
new file mode 100644
index 0000000..180fddb
--- /dev/null
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/zh-Hant.json
@@ -0,0 +1,5 @@
+{
+	"uni-pagination.prevText": "上一頁",
+	"uni-pagination.nextText": "下一頁",
+	"uni-pagination.piecePerPage": "條/頁"
+}
diff --git a/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue b/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue
new file mode 100644
index 0000000..7135034
--- /dev/null
+++ b/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue
@@ -0,0 +1,463 @@
+<template>
+	<view class="uni-pagination">
+		<!-- #ifndef MP -->
+		<picker v-if="showPageSize === true || showPageSize === 'true'" class="select-picker" mode="selector"
+			:value="pageSizeIndex" :range="pageSizeRange" @change="pickerChange" @cancel="pickerClick"
+			@click.native="pickerClick">
+			<button type="default" size="mini" :plain="true">
+				<text>{{pageSizeRange[pageSizeIndex]}} {{piecePerPage}}</text>
+				<uni-icons class="select-picker-icon" type="arrowdown" size="12" color="#999"></uni-icons>
+			</button>
+		</picker>
+		<!-- #endif -->
+		<!-- #ifndef APP-NVUE -->
+		<view class="uni-pagination__total is-phone-hide">共 {{ total }} 条</view>
+		<!-- #endif -->
+		<view class="uni-pagination__btn"
+			:class="currentIndex === 1 ? 'uni-pagination--disabled' : 'uni-pagination--enabled'"
+			:hover-class="currentIndex === 1 ? '' : 'uni-pagination--hover'" :hover-start-time="20"
+			:hover-stay-time="70" @click="clickLeft">
+			<template v-if="showIcon === true || showIcon === 'true'">
+				<uni-icons color="#666" size="16" type="left" />
+			</template>
+			<template v-else>
+				<text class="uni-pagination__child-btn">{{ prevPageText }}</text>
+			</template>
+		</view>
+		<view class="uni-pagination__num uni-pagination__num-flex-none">
+			<view class="uni-pagination__num-current">
+				<text class="uni-pagination__num-current-text is-pc-hide"
+					style="color:#409EFF">{{ currentIndex }}</text>
+				<text class="uni-pagination__num-current-text is-pc-hide">/{{ maxPage || 0 }}</text>
+				<!-- #ifndef APP-NVUE -->
+				<view v-for="(item, index) in paper" :key="index" :class="{ 'page--active': item === currentIndex }"
+					class="uni-pagination__num-tag tag--active is-phone-hide" @click.top="selectPage(item, index)">
+					<text>{{ item }}</text>
+				</view>
+				<!-- #endif -->
+
+			</view>
+		</view>
+		<view class="uni-pagination__btn"
+			:class="currentIndex >= maxPage ? 'uni-pagination--disabled' : 'uni-pagination--enabled'"
+			:hover-class="currentIndex === maxPage ? '' : 'uni-pagination--hover'" :hover-start-time="20"
+			:hover-stay-time="70" @click="clickRight">
+			<template v-if="showIcon === true || showIcon === 'true'">
+				<uni-icons color="#666" size="16" type="right" />
+			</template>
+			<template v-else>
+				<text class="uni-pagination__child-btn">{{ nextPageText }}</text>
+			</template>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Pagination 分页器
+	 * @description 分页器组件，用于展示页码、请求数据等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=32
+	 * @property {String} prevText 左侧按钮文字
+	 * @property {String} nextText 右侧按钮文字
+	 * @property {String} piecePerPageText 条/页文字
+	 * @property {Number} current 当前页
+	 * @property {Number} total 数据总量
+	 * @property {Number} pageSize 每页数据量
+	 * @property {Boolean} showIcon = [true|false] 是否以 icon 形式展示按钮
+	 * @property {Boolean} showPageSize = [true|false] 是否展示每页条数
+	 * @property {Array} pageSizeRange = [20, 50, 100, 500] 每页条数选框
+	 * @event {Function} change 点击页码按钮时触发 ,e={type,current} current为当前页，type值为：next/prev，表示点击的是上一页还是下一个
+	 * * @event {Function} pageSizeChange 当前每页条数改变时触发 ,e={pageSize} pageSize 为当前所选的每页条数
+	 */
+
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+	export default {
+		name: 'UniPagination',
+		emits: ['update:modelValue', 'input', 'change', 'pageSizeChange'],
+		props: {
+			value: {
+				type: [Number, String],
+				default: 1
+			},
+			modelValue: {
+				type: [Number, String],
+				default: 1
+			},
+			prevText: {
+				type: String,
+			},
+			nextText: {
+				type: String,
+			},
+			piecePerPageText: {
+				type: String
+			},
+			current: {
+				type: [Number, String],
+				default: 1
+			},
+			total: {
+				// 数据总量
+				type: [Number, String],
+				default: 0
+			},
+			pageSize: {
+				// 每页数据量
+				type: [Number, String],
+				default: 10
+			},
+			showIcon: {
+				// 是否以 icon 形式展示按钮
+				type: [Boolean, String],
+				default: false
+			},
+			showPageSize: {
+				// 是否以 icon 形式展示按钮
+				type: [Boolean, String],
+				default: false
+			},
+			pagerCount: {
+				type: Number,
+				default: 7
+			},
+			pageSizeRange: {
+				type: Array,
+				default: () => [20, 50, 100, 500]
+			}
+		},
+		data() {
+			return {
+				pageSizeIndex: 0,
+				currentIndex: 1,
+				paperData: [],
+				pickerShow: false
+			}
+		},
+		computed: {
+			piecePerPage() {
+				return this.piecePerPageText || t('uni-pagination.piecePerPage')
+			},
+			prevPageText() {
+				return this.prevText || t('uni-pagination.prevText')
+			},
+			nextPageText() {
+				return this.nextText || t('uni-pagination.nextText')
+			},
+			maxPage() {
+				let maxPage = 1
+				let total = Number(this.total)
+				let pageSize = Number(this.pageSize)
+				if (total && pageSize) {
+					maxPage = Math.ceil(total / pageSize)
+				}
+				return maxPage
+			},
+			paper() {
+				const num = this.currentIndex
+				// TODO 最大页数
+				const pagerCount = this.pagerCount
+				// const total = 181
+				const total = this.total
+				const pageSize = this.pageSize
+				let totalArr = []
+				let showPagerArr = []
+				let pagerNum = Math.ceil(total / pageSize)
+				for (let i = 0; i < pagerNum; i++) {
+					totalArr.push(i + 1)
+				}
+				showPagerArr.push(1)
+				const totalNum = totalArr[totalArr.length - (pagerCount + 1) / 2]
+				totalArr.forEach((item, index) => {
+					if ((pagerCount + 1) / 2 >= num) {
+						if (item < pagerCount + 1 && item > 1) {
+							showPagerArr.push(item)
+						}
+					} else if (num + 2 <= totalNum) {
+						if (item > num - (pagerCount + 1) / 2 && item < num + (pagerCount + 1) / 2) {
+							showPagerArr.push(item)
+						}
+					} else {
+						if ((item > num - (pagerCount + 1) / 2 || pagerNum - pagerCount < item) && item < totalArr[
+								totalArr.length - 1]) {
+							showPagerArr.push(item)
+						}
+					}
+				})
+				if (pagerNum > pagerCount) {
+					if ((pagerCount + 1) / 2 >= num) {
+						showPagerArr[showPagerArr.length - 1] = '...'
+					} else if (num + 2 <= totalNum) {
+						showPagerArr[1] = '...'
+						showPagerArr[showPagerArr.length - 1] = '...'
+					} else {
+						showPagerArr[1] = '...'
+					}
+					showPagerArr.push(totalArr[totalArr.length - 1])
+				} else {
+					if ((pagerCount + 1) / 2 >= num) {} else if (num + 2 <= totalNum) {} else {
+						showPagerArr.shift()
+						showPagerArr.push(totalArr[totalArr.length - 1])
+					}
+				}
+
+				return showPagerArr
+			}
+		},
+		watch: {
+			current: {
+				immediate: true,
+				handler(val, old) {
+					if (val < 1) {
+						this.currentIndex = 1
+					} else {
+						this.currentIndex = val
+					}
+				}
+			},
+			value: {
+				immediate: true,
+				handler(val) {
+					if (Number(this.current) !== 1) return
+					if (val < 1) {
+						this.currentIndex = 1
+					} else {
+						this.currentIndex = val
+					}
+				}
+			},
+			pageSizeIndex(val) {
+				this.$emit('pageSizeChange', this.pageSizeRange[val])
+			}
+		},
+		methods: {
+			pickerChange(e) {
+				this.pageSizeIndex = e.detail.value
+				this.pickerClick()
+			},
+			pickerClick() {
+				// #ifdef H5
+				const body = document.querySelector('body')
+				if (!body) return
+
+				const className = 'uni-pagination-picker-show'
+				this.pickerShow = !this.pickerShow
+
+				if (this.pickerShow) {
+					body.classList.add(className)
+				} else {
+					setTimeout(() => body.classList.remove(className), 300)
+				}
+				// #endif
+			},
+			// 选择标签
+			selectPage(e, index) {
+				if (parseInt(e)) {
+					this.currentIndex = e
+					this.change('current')
+				} else {
+					let pagerNum = Math.ceil(this.total / this.pageSize)
+					// let pagerNum = Math.ceil(181 / this.pageSize)
+					// 上一页
+					if (index <= 1) {
+						if (this.currentIndex - 5 > 1) {
+							this.currentIndex -= 5
+						} else {
+							this.currentIndex = 1
+						}
+						return
+					}
+					// 下一页
+					if (index >= 6) {
+						if (this.currentIndex + 5 > pagerNum) {
+							this.currentIndex = pagerNum
+						} else {
+							this.currentIndex += 5
+						}
+						return
+					}
+				}
+			},
+			clickLeft() {
+				if (Number(this.currentIndex) === 1) {
+					return
+				}
+				this.currentIndex -= 1
+				this.change('prev')
+			},
+			clickRight() {
+				if (Number(this.currentIndex) >= this.maxPage) {
+					return
+				}
+				this.currentIndex += 1
+				this.change('next')
+			},
+			change(e) {
+				this.$emit('input', this.currentIndex)
+				this.$emit('update:modelValue', this.currentIndex)
+				this.$emit('change', {
+					type: e,
+					current: this.currentIndex
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$uni-primary: #2979ff;
+
+	.uni-pagination {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		position: relative;
+		overflow: hidden;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-pagination__total {
+		font-size: 14px;
+		color: #999;
+		margin-right: 15px;
+	}
+
+	.uni-pagination__btn {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		padding: 0 8px;
+		line-height: 30px;
+		font-size: 12px;
+		position: relative;
+		background-color: #F0F0F0;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		text-align: center;
+		border-radius: 5px;
+		// border-width: 1px;
+		// border-style: solid;
+		// border-color: $uni-border-color;
+	}
+
+	.uni-pagination__child-btn {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		font-size: 12px;
+		position: relative;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		text-align: center;
+		color: #666;
+		font-size: 12px;
+	}
+
+	.uni-pagination__num {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 30px;
+		line-height: 30px;
+		font-size: 12px;
+		color: #666;
+		margin: 0 5px;
+	}
+
+	.uni-pagination__num-tag {
+		/* #ifdef H5 */
+		cursor: pointer;
+		min-width: 30px;
+		/* #endif */
+		margin: 0 5px;
+		height: 30px;
+		text-align: center;
+		line-height: 30px;
+		// border: 1px red solid;
+		color: #999;
+		border-radius: 4px;
+		// border-width: 1px;
+		// border-style: solid;
+		// border-color: $uni-border-color;
+	}
+
+	.uni-pagination__num-current {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-pagination__num-current-text {
+		font-size: 15px;
+	}
+
+	.uni-pagination--enabled {
+		color: #333333;
+		opacity: 1;
+	}
+
+	.uni-pagination--disabled {
+		opacity: 0.5;
+		/* #ifdef H5 */
+		cursor: default;
+		/* #endif */
+	}
+
+	.uni-pagination--hover {
+		color: rgba(0, 0, 0, 0.6);
+		background-color: #eee;
+	}
+
+	.tag--active:hover {
+		color: $uni-primary;
+	}
+
+	.page--active {
+		color: #fff;
+		background-color: $uni-primary;
+	}
+
+	.page--active:hover {
+		color: #fff;
+	}
+
+	/* #ifndef APP-NVUE */
+	.is-pc-hide {
+		display: block;
+	}
+
+	.is-phone-hide {
+		display: none;
+	}
+
+	@media screen and (min-width: 450px) {
+		.is-pc-hide {
+			display: none;
+		}
+
+		.is-phone-hide {
+			display: block;
+		}
+
+		.uni-pagination__num-flex-none {
+			flex: none;
+		}
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-pagination/package.json b/uni_modules/uni-pagination/package.json
new file mode 100644
index 0000000..644859b
--- /dev/null
+++ b/uni_modules/uni-pagination/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-pagination",
+  "displayName": "uni-pagination 分页器",
+  "version": "1.2.2",
+  "description": "Pagination 分页器组件，用于展示页码、请求数据等。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "分页器",
+    "页码"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss","uni-icons"],
+    "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-pagination/readme.md b/uni_modules/uni-pagination/readme.md
new file mode 100644
index 0000000..97ea1d6
--- /dev/null
+++ b/uni_modules/uni-pagination/readme.md
@@ -0,0 +1,11 @@
+
+
+## Pagination 分页器
+> **组件名：uni-pagination**
+> 代码块： `uPagination`
+
+
+分页器组件，用于展示页码、请求数据等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-pagination)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
new file mode 100644
index 0000000..a9e2d66
--- /dev/null
+++ b/uni_modules/uni-popup/changelog.md
@@ -0,0 +1,60 @@
+## 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..a5d0f2a
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -0,0 +1,271 @@
+<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" v-model="val" type="text" :placeholder="placeholderText" :focus="focus" >
+			</slot>
+		</view>
+		<view class="uni-dialog-button-group">
+			<view class="uni-dialog-button" @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 {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} mode = [base|input] 模式、
+	 * 	@value base 基础对话框
+	 * 	@value input 可输入对话框
+	 * @property {String} content 对话框内容
+	 * @property {Boolean} beforeClose 是否拦截取消事件
+	 * @event {Function} confirm 点击确认按钮触发
+	 * @event {Function} close 点击取消按钮触发
+	 */
+
+	export default {
+		name: "uniPopupDialog",
+		mixins: [popup],
+		emits:['confirm','close'],
+		props: {
+			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: ''
+			}
+		},
+		data() {
+			return {
+				dialogType: 'error',
+				focus: false,
+				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) {
+				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
+			}
+		},
+		mounted() {
+			this.focus = true
+		},
+		methods: {
+			/**
+			 * 点击确认按钮
+			 */
+			onOk() {
+				if (this.mode === 'input'){
+					this.$emit('confirm', this.val)
+				}else{
+					this.$emit('confirm')
+				}
+				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..5be7624
--- /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: 'wx'
+					},
+					{
+						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.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
new file mode 100644
index 0000000..db90c59
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -0,0 +1,474 @@
+<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: this.isDesktop ? 'fixforpc-top' : '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) {
+					clearTimeout(this.timer)
+					this.showPopup = false
+				}
+				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'
+				this.ani = ['zoom-out', 'fade']
+				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..069e9ce
--- /dev/null
+++ b/uni_modules/uni-popup/package.json
@@ -0,0 +1,90 @@
+{
+	"id": "uni-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.7.9",
+	"description": " Popup 组件，提供常用的弹层",
+	"keywords": [
+        "uni-ui",
+        "弹出层",
+        "弹窗",
+        "popup",
+        "弹框"
+    ],
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"directories": {
+		"example": "../../temps/example_temps"
+	},
+	"dcloudext": {
+		"category": [
+			"前端组件",
+			"通用组件"
+		],
+		"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": [
+			"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-rate/changelog.md b/uni_modules/uni-rate/changelog.md
new file mode 100644
index 0000000..8a98a61
--- /dev/null
+++ b/uni_modules/uni-rate/changelog.md
@@ -0,0 +1,25 @@
+## 1.3.1（2022-02-25）
+- 修复 条件判断 `NaN` 错误的 bug
+## 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-rate](https://uniapp.dcloud.io/component/uniui/uni-rate)
+## 1.2.2（2021-09-10）
+- 优化 默认值修改为 0 颗星
+## 1.2.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.2（2021-05-12）
+- 新增 组件示例地址
+## 1.1.1（2021-04-21）
+- 修复 布局变化后 uni-rate  星星计算不准确的 bug
+- 优化 添加依赖 uni-icons, 导入 uni-rate 自动下载依赖
+## 1.1.0（2021-04-16）
+- 修复 uni-rate 属性 margin 值为 string 组件失效的 bug
+
+## 1.0.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.8（2021-02-05）
+- 调整为uni_modules目录规范
+- 支持 pc 端
diff --git a/uni_modules/uni-rate/components/uni-rate/uni-rate.vue b/uni_modules/uni-rate/components/uni-rate/uni-rate.vue
new file mode 100644
index 0000000..857f5f9
--- /dev/null
+++ b/uni_modules/uni-rate/components/uni-rate/uni-rate.vue
@@ -0,0 +1,361 @@
+<template>
+	<view>
+		<view ref="uni-rate" class="uni-rate">
+			<view class="uni-rate__icon" :class="{'uni-cursor-not-allowed': disabled}"
+				:style="{ 'margin-right': marginNumber + 'px' }" v-for="(star, index) in stars" :key="index"
+				@touchstart.stop="touchstart" @touchmove.stop="touchmove" @mousedown.stop="mousedown"
+				@mousemove.stop="mousemove" @mouseleave="mouseleave">
+				<uni-icons :color="color" :size="size" :type="isFill ? 'star-filled' : 'star'" />
+				<!-- #ifdef APP-NVUE -->
+				<view :style="{ width: star.activeWitch.replace('%','')*size/100+'px'}" class="uni-rate__icon-on">
+					<uni-icons style="text-align: left;" :color="disabled?'#ccc':activeColor" :size="size"
+						type="star-filled" />
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef APP-NVUE -->
+				<view :style="{ width: star.activeWitch}" class="uni-rate__icon-on">
+					<uni-icons :color="disabled?disabledColor:activeColor" :size="size" type="star-filled" />
+				</view>
+				<!-- #endif -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = uni.requireNativePlugin('dom');
+	// #endif
+	/**
+	 * Rate 评分
+	 * @description 评分组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=33
+	 * @property {Boolean} 	isFill = [true|false] 		星星的类型，是否为实心类型, 默认为实心
+	 * @property {String} 	color 						未选中状态的星星颜色，默认为 "#ececec"
+	 * @property {String} 	activeColor 				选中状态的星星颜色，默认为 "#ffca3e"
+	 * @property {String} 	disabledColor 				禁用状态的星星颜色，默认为 "#c0c0c0"
+	 * @property {Number} 	size 						星星的大小
+	 * @property {Number} 	value/v-model 				当前评分
+	 * @property {Number} 	max 						最大评分评分数量，目前一分一颗星
+	 * @property {Number} 	margin 						星星的间距，单位 px
+	 * @property {Boolean} 	disabled = [true|false] 	是否为禁用状态，默认为 false
+	 * @property {Boolean} 	readonly = [true|false] 	是否为只读状态，默认为 false
+	 * @property {Boolean} 	allowHalf = [true|false] 	是否实现半星，默认为 false
+	 * @property {Boolean} 	touchable = [true|false] 	是否支持滑动手势，默认为 true
+	 * @event {Function} change 						uniRate 的 value 改变时触发事件，e={value:Number}
+	 */
+
+	export default {
+		name: "UniRate",
+		props: {
+			isFill: {
+				// 星星的类型，是否镂空
+				type: [Boolean, String],
+				default: true
+			},
+			color: {
+				// 星星未选中的颜色
+				type: String,
+				default: "#ececec"
+			},
+			activeColor: {
+				// 星星选中状态颜色
+				type: String,
+				default: "#ffca3e"
+			},
+			disabledColor: {
+				// 星星禁用状态颜色
+				type: String,
+				default: "#c0c0c0"
+			},
+			size: {
+				// 星星的大小
+				type: [Number, String],
+				default: 24
+			},
+			value: {
+				// 当前评分
+				type: [Number, String],
+				default: 0
+			},
+			modelValue: {
+				// 当前评分
+				type: [Number, String],
+				default: 0
+			},
+			max: {
+				// 最大评分
+				type: [Number, String],
+				default: 5
+			},
+			margin: {
+				// 星星的间距
+				type: [Number, String],
+				default: 0
+			},
+			disabled: {
+				// 是否可点击
+				type: [Boolean, String],
+				default: false
+			},
+			readonly: {
+				// 是否只读
+				type: [Boolean, String],
+				default: false
+			},
+			allowHalf: {
+				// 是否显示半星
+				type: [Boolean, String],
+				default: false
+			},
+			touchable: {
+				// 是否支持滑动手势
+				type: [Boolean, String],
+				default: true
+			}
+		},
+		data() {
+			return {
+				valueSync: "",
+				userMouseFristMove: true,
+				userRated: false,
+				userLastRate: 1
+			};
+		},
+		watch: {
+			value(newVal) {
+				this.valueSync = Number(newVal);
+			},
+			modelValue(newVal) {
+				this.valueSync = Number(newVal);
+			},
+		},
+		computed: {
+			stars() {
+				const value = this.valueSync ? this.valueSync : 0;
+				const starList = [];
+				const floorValue = Math.floor(value);
+				const ceilValue = Math.ceil(value);
+				for (let i = 0; i < this.max; i++) {
+					if (floorValue > i) {
+						starList.push({
+							activeWitch: "100%"
+						});
+					} else if (ceilValue - 1 === i) {
+						starList.push({
+							activeWitch: (value - floorValue) * 100 + "%"
+						});
+					} else {
+						starList.push({
+							activeWitch: "0"
+						});
+					}
+				}
+				return starList;
+			},
+
+			marginNumber() {
+				return Number(this.margin)
+			}
+		},
+		created() {
+			this.valueSync = Number(this.value || this.modelValue);
+			this._rateBoxLeft = 0
+			this._oldValue = null
+		},
+		mounted() {
+			setTimeout(() => {
+				this._getSize()
+			}, 100)
+			// #ifdef H5
+			this.PC = this.IsPC()
+			// #endif
+		},
+		methods: {
+			touchstart(e) {
+				// #ifdef H5
+				if (this.IsPC()) return
+				// #endif
+				if (this.readonly || this.disabled) return
+				const {
+					clientX,
+					screenX
+				} = e.changedTouches[0]
+				// TODO 做一下兼容，只有 Nvue 下才有 screenX，其他平台式 clientX
+				this._getRateCount(clientX || screenX)
+			},
+			touchmove(e) {
+				// #ifdef H5
+				if (this.IsPC()) return
+				// #endif
+				if (this.readonly || this.disabled || !this.touchable) return
+				const {
+					clientX,
+					screenX
+				} = e.changedTouches[0]
+				this._getRateCount(clientX || screenX)
+			},
+
+			/**
+			 * 兼容 PC @tian
+			 */
+
+			mousedown(e) {
+				// #ifdef H5
+				if (!this.IsPC()) return
+				if (this.readonly || this.disabled) return
+				const {
+					clientX,
+				} = e
+				this.userLastRate = this.valueSync
+				this._getRateCount(clientX)
+				this.userRated = true
+				// #endif
+			},
+			mousemove(e) {
+				// #ifdef H5
+				if (!this.IsPC()) return
+				if (this.userRated) return
+				if (this.userMouseFristMove) {
+					console.log('---mousemove----', this.valueSync);
+					this.userLastRate = this.valueSync
+					this.userMouseFristMove = false
+				}
+				if (this.readonly || this.disabled || !this.touchable) return
+				const {
+					clientX,
+				} = e
+				this._getRateCount(clientX)
+				// #endif
+			},
+			mouseleave(e) {
+				// #ifdef H5
+				if (!this.IsPC()) return
+				if (this.readonly || this.disabled || !this.touchable) return
+				if (this.userRated) {
+					this.userRated = false
+					return
+				}
+				this.valueSync = this.userLastRate
+				// #endif
+			},
+			// #ifdef H5
+			IsPC() {
+				var userAgentInfo = navigator.userAgent;
+				var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+				var flag = true;
+				for (let v = 0; v < Agents.length - 1; v++) {
+					if (userAgentInfo.indexOf(Agents[v]) > 0) {
+						flag = false;
+						break;
+					}
+				}
+				return flag;
+			},
+			// #endif
+
+			/**
+			 * 获取星星个数
+			 */
+			_getRateCount(clientX) {
+				this._getSize()
+				const size = Number(this.size)
+				if (isNaN(size)) {
+					return new Error('size 属性只能设置为数字')
+				}
+				const rateMoveRange = clientX - this._rateBoxLeft
+				let index = parseInt(rateMoveRange / (size + this.marginNumber))
+				index = index < 0 ? 0 : index;
+				index = index > this.max ? this.max : index;
+				const range = parseInt(rateMoveRange - (size + this.marginNumber) * index);
+				let value = 0;
+				if (this._oldValue === index && !this.PC) return;
+				this._oldValue = index;
+				if (this.allowHalf) {
+					if (range > (size / 2)) {
+						value = index + 1
+					} else {
+						value = index + 0.5
+					}
+				} else {
+					value = index + 1
+				}
+
+				value = Math.max(0.5, Math.min(value, this.max))
+				this.valueSync = value
+				this._onChange()
+			},
+
+			/**
+			 * 触发动态修改
+			 */
+			_onChange() {
+
+				this.$emit("input", this.valueSync);
+				this.$emit("update:modelValue", this.valueSync);
+				this.$emit("change", {
+					value: this.valueSync
+				});
+			},
+			/**
+			 * 获取星星距离屏幕左侧距离
+			 */
+			_getSize() {
+				// #ifndef APP-NVUE
+				uni.createSelectorQuery()
+					.in(this)
+					.select('.uni-rate')
+					.boundingClientRect()
+					.exec(ret => {
+						if (ret) {
+							this._rateBoxLeft = ret[0].left
+						}
+					})
+				// #endif
+				// #ifdef APP-NVUE
+				dom.getComponentRect(this.$refs['uni-rate'], (ret) => {
+					const size = ret.size
+					if (size) {
+						this._rateBoxLeft = size.left
+					}
+				})
+				// #endif
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.uni-rate {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		line-height: 1;
+		font-size: 0;
+		flex-direction: row;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-rate__icon {
+		position: relative;
+		line-height: 1;
+		font-size: 0;
+	}
+
+	.uni-rate__icon-on {
+		overflow: hidden;
+		position: absolute;
+		top: 0;
+		left: 0;
+		line-height: 1;
+		text-align: left;
+	}
+
+	.uni-cursor-not-allowed {
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-rate/package.json b/uni_modules/uni-rate/package.json
new file mode 100644
index 0000000..64e8e33
--- /dev/null
+++ b/uni_modules/uni-rate/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-rate",
+  "displayName": "uni-rate 评分",
+  "version": "1.3.1",
+  "description": "Rate 评分组件，可自定义评分星星图标的大小、间隔、评分数。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "评分"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "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-rate/readme.md b/uni_modules/uni-rate/readme.md
new file mode 100644
index 0000000..eae7b5c
--- /dev/null
+++ b/uni_modules/uni-rate/readme.md
@@ -0,0 +1,12 @@
+
+
+## Rate 评分
+> **组件名：uni-rate**
+> 代码块： `uRate`
+> 关联组件：`uni-icons`
+
+
+评分组件，多用于购买商品后，对商品进行评价等场景
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-rate)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-row/changelog.md b/uni_modules/uni-row/changelog.md
new file mode 100644
index 0000000..5b465bc
--- /dev/null
+++ b/uni_modules/uni-row/changelog.md
@@ -0,0 +1,10 @@
+## 1.0.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-row](https://uniapp.dcloud.io/component/uniui/uni-row)
+## 0.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.0.4（2021-05-12）
+- 新增 组件示例地址
+## 0.0.3（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增uni-row组件
diff --git a/uni_modules/uni-row/components/uni-col/uni-col.vue b/uni_modules/uni-row/components/uni-col/uni-col.vue
new file mode 100644
index 0000000..84e2deb
--- /dev/null
+++ b/uni_modules/uni-row/components/uni-col/uni-col.vue
@@ -0,0 +1,317 @@
+<template>
+	<!-- #ifndef APP-NVUE -->
+	<view :class="['uni-col', sizeClass, pointClassList]" :style="{
+		paddingLeft:`${Number(gutter)}rpx`,
+		paddingRight:`${Number(gutter)}rpx`,
+	}">
+		<slot></slot>
+	</view>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<!-- 在nvue上，类名样式不生效，换为style -->
+	<!-- 设置right正值失效，设置 left 负值 -->
+	<view :class="['uni-col']" :style="{
+		paddingLeft:`${Number(gutter)}rpx`,
+		paddingRight:`${Number(gutter)}rpx`,
+		width:`${nvueWidth}rpx`,
+		position:'relative',
+		marginLeft:`${marginLeft}rpx`,
+		left:`${right === 0 ? left : -right}rpx`
+	}">
+		<slot></slot>
+	</view>
+	<!-- #endif -->
+</template>
+
+<script>
+	/**
+	 * Col	布局-列
+	 * @description	搭配uni-row使用，构建布局。
+	 * @tutorial	https://ext.dcloud.net.cn/plugin?id=3958
+	 *
+	 * @property	{span} type = Number 栅格占据的列数
+	 * 						默认 24
+	 * @property	{offset} type = Number 栅格左侧的间隔格数
+	 * @property	{push} type = Number 栅格向右移动格数
+	 * @property	{pull} type = Number 栅格向左移动格数
+	 * @property	{xs} type = [Number, Object] <768px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 * @property	{sm} type = [Number, Object] ≥768px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 * @property	{md} type = [Number, Object] ≥992px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 * @property	{lg} type = [Number, Object] ≥1200px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 * @property	{xl} type = [Number, Object] ≥1920px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 */
+	const ComponentClass = 'uni-col';
+
+	// -1 默认值，因为在微信小程序端只给Number会有默认值0
+	export default {
+		name: 'uniCol',
+		// #ifdef MP-WEIXIN
+		options: {
+			virtualHost: true // 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现
+		},
+		// #endif
+		props: {
+			span: {
+				type: Number,
+				default: 24
+			},
+			offset: {
+				type: Number,
+				default: -1
+			},
+			pull: {
+				type: Number,
+				default: -1
+			},
+			push: {
+				type: Number,
+				default: -1
+			},
+			xs: [Number, Object],
+			sm: [Number, Object],
+			md: [Number, Object],
+			lg: [Number, Object],
+			xl: [Number, Object]
+		},
+		data() {
+			return {
+				gutter: 0,
+				sizeClass: '',
+				parentWidth: 0,
+				nvueWidth: 0,
+				marginLeft: 0,
+				right: 0,
+				left: 0
+			}
+		},
+		created() {
+			// 字节小程序中，在computed中读取$parent为undefined
+			let parent = this.$parent;
+
+			while (parent && parent.$options.componentName !== 'uniRow') {
+				parent = parent.$parent;
+			}
+
+			this.updateGutter(parent.gutter)
+			parent.$watch('gutter', (gutter) => {
+				this.updateGutter(gutter)
+			})
+
+			// #ifdef APP-NVUE
+			this.updateNvueWidth(parent.width)
+			parent.$watch('width', (width) => {
+				this.updateNvueWidth(width)
+			})
+			// #endif
+		},
+		computed: {
+			sizeList() {
+				let {
+					span,
+					offset,
+					pull,
+					push
+				} = this;
+
+				return {
+					span,
+					offset,
+					pull,
+					push
+				}
+			},
+			// #ifndef APP-NVUE
+			pointClassList() {
+				let classList = [];
+
+				['xs', 'sm', 'md', 'lg', 'xl'].forEach(point => {
+					const props = this[point];
+					if (typeof props === 'number') {
+						classList.push(`${ComponentClass}-${point}-${props}`)
+					} else if (typeof props === 'object' && props) {
+						Object.keys(props).forEach(pointProp => {
+							classList.push(
+								pointProp === 'span' ?
+								`${ComponentClass}-${point}-${props[pointProp]}` :
+								`${ComponentClass}-${point}-${pointProp}-${props[pointProp]}`
+							)
+						})
+					}
+				});
+
+				// 支付宝小程序使用 :class=[ ['a','b'] ]，渲染错误
+				return classList.join(' ');
+			}
+			// #endif
+		},
+		methods: {
+			updateGutter(parentGutter) {
+				parentGutter = Number(parentGutter);
+				if (!isNaN(parentGutter)) {
+					this.gutter = parentGutter / 2
+				}
+			},
+			// #ifdef APP-NVUE
+			updateNvueWidth(width) {
+				// 用于在nvue端，span，offset，pull，push的计算
+				this.parentWidth = width;
+				['span', 'offset', 'pull', 'push'].forEach(size => {
+					const curSize = this[size];
+					if ((curSize || curSize === 0) && curSize !== -1) {
+						let RPX = 1 / 24 * curSize * width
+						RPX = Number(RPX);
+						switch (size) {
+							case 'span':
+								this.nvueWidth = RPX
+								break;
+							case 'offset':
+								this.marginLeft = RPX
+								break;
+							case 'pull':
+								this.right = RPX
+								break;
+							case 'push':
+								this.left = RPX
+								break;
+						}
+					}
+				});
+			}
+			// #endif
+		},
+		watch: {
+			sizeList: {
+				immediate: true,
+				handler(newVal) {
+					// #ifndef APP-NVUE
+					let classList = [];
+					for (let size in newVal) {
+						const curSize = newVal[size];
+						if ((curSize || curSize === 0) && curSize !== -1) {
+							classList.push(
+								size === 'span' ?
+								`${ComponentClass}-${curSize}` :
+								`${ComponentClass}-${size}-${curSize}`
+							)
+						}
+					}
+					// 支付宝小程序使用 :class=[ ['a','b'] ]，渲染错误
+					this.sizeClass = classList.join(' ');
+					// #endif
+					// #ifdef APP-NVUE
+					this.updateNvueWidth(this.parentWidth);
+					// #endif
+				}
+			}
+		}
+	}
+</script>
+
+<style lang='scss' scoped>
+	/* breakpoints */
+	$--sm: 768px !default;
+	$--md: 992px !default;
+	$--lg: 1200px !default;
+	$--xl: 1920px !default;
+
+	$breakpoints: ('xs' : (max-width: $--sm - 1),
+	'sm' : (min-width: $--sm),
+	'md' : (min-width: $--md),
+	'lg' : (min-width: $--lg),
+	'xl' : (min-width: $--xl));
+
+	$layout-namespace: ".uni-";
+	$col: $layout-namespace+"col";
+
+	@function getSize($size) {
+		/* TODO 1/24 * $size * 100 * 1%; 使用计算后的值，为了解决 vue3 控制台报错 */
+		@return 0.04166666666 * $size * 100 * 1%;
+	}
+
+	@mixin res($key, $map:$breakpoints) {
+		@if map-has-key($map, $key) {
+			@media screen and #{inspect(map-get($map,$key))} {
+				@content;
+			}
+		}
+
+		@else {
+			@warn "Undeinfed point: `#{$key}`";
+		}
+	}
+
+	/* #ifndef APP-NVUE */
+	#{$col} {
+		float: left;
+		box-sizing: border-box;
+	}
+
+	#{$col}-0 {
+		/* #ifdef APP-NVUE */
+		width: 0;
+		height: 0;
+		margin-top: 0;
+		margin-right: 0;
+		margin-bottom: 0;
+		margin-left: 0;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		display: none;
+		/* #endif */
+	}
+
+	@for $i from 0 through 24 {
+		#{$col}-#{$i} {
+			width: getSize($i);
+		}
+
+		#{$col}-offset-#{$i} {
+			margin-left: getSize($i);
+		}
+
+		#{$col}-pull-#{$i} {
+			position: relative;
+			right: getSize($i);
+		}
+
+		#{$col}-push-#{$i} {
+			position: relative;
+			left: getSize($i);
+		}
+	}
+
+	@each $point in map-keys($breakpoints) {
+		@include res($point) {
+			#{$col}-#{$point}-0 {
+				display: none;
+			}
+
+			@for $i from 0 through 24 {
+				#{$col}-#{$point}-#{$i} {
+					width: getSize($i);
+				}
+
+				#{$col}-#{$point}-offset-#{$i} {
+					margin-left: getSize($i);
+				}
+
+				#{$col}-#{$point}-pull-#{$i} {
+					position: relative;
+					right: getSize($i);
+				}
+
+				#{$col}-#{$point}-push-#{$i} {
+					position: relative;
+					left: getSize($i);
+				}
+			}
+		}
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-row/components/uni-row/uni-row.vue b/uni_modules/uni-row/components/uni-row/uni-row.vue
new file mode 100644
index 0000000..f8e8542
--- /dev/null
+++ b/uni_modules/uni-row/components/uni-row/uni-row.vue
@@ -0,0 +1,190 @@
+<template>
+	<view :class="[ 'uni-row', typeClass , justifyClass, alignClass, ]" :style="{
+		marginLeft:`${Number(marginValue)}rpx`,
+		marginRight:`${Number(marginValue)}rpx`,
+	}">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	const ComponentClass = 'uni-row';
+	const modifierSeparator = '--';
+	/**
+	 * Row	布局-行
+	 * @description	流式栅格系统，随着屏幕或视口分为 24 份，可以迅速简便地创建布局。
+	 * @tutorial	https://ext.dcloud.net.cn/plugin?id=3958
+	 *
+	 * @property	{gutter} type = Number 栅格间隔
+	 * @property	{justify} type = String flex 布局下的水平排列方式
+	 * 						可选	start/end/center/space-around/space-between	start
+	 * 						默认值	start
+	 * @property	{align} type = String flex 布局下的垂直排列方式
+	 * 						可选	top/middle/bottom
+	 * 						默认值	top
+	 * @property	{width} type = String|Number nvue下需要自行配置宽度用于计算
+	 * 						默认值 750
+	 */
+
+
+	export default {
+		name: 'uniRow',
+		componentName: 'uniRow',
+		// #ifdef MP-WEIXIN
+		options: {
+			virtualHost: true // 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现，可使用flex布局
+		},
+		// #endif
+		props: {
+			type: String,
+			gutter: Number,
+			justify: {
+				type: String,
+				default: 'start'
+			},
+			align: {
+				type: String,
+				default: 'top'
+			},
+			// nvue如果使用span等属性，需要配置宽度
+			width: {
+				type: [String, Number],
+				default: 750
+			}
+		},
+		created() {
+			// #ifdef APP-NVUE
+			this.type = 'flex';
+			// #endif
+		},
+		computed: {
+			marginValue() {
+				// #ifndef APP-NVUE
+				if (this.gutter) {
+					return -(this.gutter / 2);
+				}
+				// #endif
+				return 0;
+			},
+			typeClass() {
+				return this.type === 'flex' ? `${ComponentClass + modifierSeparator}flex` : '';
+			},
+			justifyClass() {
+				return this.justify !== 'start' ? `${ComponentClass + modifierSeparator}flex-justify-${this.justify}` : ''
+			},
+			alignClass() {
+				return this.align !== 'top' ? `${ComponentClass + modifierSeparator}flex-align-${this.align}` : ''
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	$layout-namespace: ".uni-";
+	$row:$layout-namespace+"row";
+	$modifier-separator: "--";
+
+	@mixin utils-clearfix {
+		$selector: &;
+
+		@at-root {
+
+			/* #ifndef APP-NVUE */
+			#{$selector}::before,
+			#{$selector}::after {
+				display: table;
+				content: "";
+			}
+
+			#{$selector}::after {
+				clear: both;
+			}
+
+			/* #endif */
+		}
+
+	}
+
+	@mixin utils-flex ($direction: row) {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: $direction;
+	}
+
+	@mixin set-flex($state) {
+		@at-root &-#{$state} {
+			@content
+		}
+	}
+
+	#{$row} {
+		position: relative;
+		flex-direction: row;
+
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+
+		// 非nvue使用float布局
+		@include utils-clearfix;
+
+		// 在QQ、字节、百度小程序平台，编译后使用shadow dom，不可使用flex布局，使用float
+		@at-root {
+
+			/* #ifndef MP-QQ || MP-TOUTIAO || MP-BAIDU */
+			&#{$modifier-separator}flex {
+				@include utils-flex;
+				flex-wrap: wrap;
+				flex: 1;
+
+				&:before,
+				&:after {
+					/* #ifndef APP-NVUE */
+					display: none;
+					/* #endif */
+				}
+
+				@include set-flex(justify-center) {
+					justify-content: center;
+				}
+
+				@include set-flex(justify-end) {
+					justify-content: flex-end;
+				}
+
+				@include set-flex(justify-space-between) {
+					justify-content: space-between;
+				}
+
+				@include set-flex(justify-space-around) {
+					justify-content: space-around;
+				}
+
+				@include set-flex(align-middle) {
+					align-items: center;
+				}
+
+				@include set-flex(align-bottom) {
+					align-items: flex-end;
+				}
+			}
+
+			/* #endif */
+		}
+
+	}
+
+	// 字节、QQ配置后不生效
+	// 此处用法无法使用scoped
+	/* #ifdef MP-WEIXIN || MP-TOUTIAO || MP-QQ */
+	:host {
+		display: block;
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-row/package.json b/uni_modules/uni-row/package.json
new file mode 100644
index 0000000..3f52fa6
--- /dev/null
+++ b/uni_modules/uni-row/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-row",
+  "displayName": "uni-row 布局-行",
+  "version": "1.0.0",
+  "description": "流式栅格系统，随着屏幕或视口分为 24 份，可以迅速简便地创建布局。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "栅格",
+    "布局",
+    "layout"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["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": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-row/readme.md b/uni_modules/uni-row/readme.md
new file mode 100644
index 0000000..3c9c8b9
--- /dev/null
+++ b/uni_modules/uni-row/readme.md
@@ -0,0 +1,10 @@
+## Layout 布局
+
+> **组件名 uni-row、uni-col**
+> 代码块： `uRow`、`uCol`
+
+
+流式栅格系统，随着屏幕或视口分为 24 份，可以迅速简便地创建布局。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-row)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
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-search-bar/changelog.md b/uni_modules/uni-search-bar/changelog.md
new file mode 100644
index 0000000..b41fdd3
--- /dev/null
+++ b/uni_modules/uni-search-bar/changelog.md
@@ -0,0 +1,33 @@
+## 1.2.3（2022-05-24）
+- 新增 readonly 属性，组件只读
+## 1.2.2（2022-05-06）
+- 修复  vue3 input 事件不生效的bug
+## 1.2.1（2022-05-06）
+- 修复 多余代码导致的bug
+## 1.2.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-search-bar](https://uniapp.dcloud.io/component/uniui/uni-search-bar)
+## 1.1.2（2021-08-30）
+- 修复 value 属性与 modelValue 属性不兼容的Bug
+## 1.1.1（2021-08-24）
+- 新增 支持国际化
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.9（2021-05-12）
+- 新增 项目示例地址
+## 1.0.8（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.7（2021-04-15）
+- uni-ui 新增 uni-search-bar 的 focus 事件
+
+## 1.0.6（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持双向绑定
+- 更改 input 事件的返回值，e={value:Number} --> e=value
+- 新增 支持图标插槽
+- 新增 支持 clear、blur 事件
+- 新增 支持 focus 属性
+- 去掉组件背景色
diff --git a/uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json
new file mode 100644
index 0000000..dd083a5
--- /dev/null
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json
@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "cancel",
+	"uni-search-bar.placeholder": "Search enter content"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/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-search-bar/components/uni-search-bar/i18n/zh-Hans.json b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json
new file mode 100644
index 0000000..d4e5c12
--- /dev/null
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json
@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "cancel",
+	"uni-search-bar.placeholder": "请输入搜索内容"
+}
diff --git a/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json
new file mode 100644
index 0000000..318b6ef
--- /dev/null
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json
@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "cancel",
+	"uni-search-bar.placeholder": "請輸入搜索內容"
+}
diff --git a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
new file mode 100644
index 0000000..5a518a8
--- /dev/null
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
@@ -0,0 +1,298 @@
+<template>
+	<view class="uni-searchbar">
+		<view :style="{borderRadius:radius+'px',backgroundColor: bgColor}" class="uni-searchbar__box"
+			@click="searchClick">
+			<view class="uni-searchbar__box-icon-search">
+				<slot name="searchIcon">
+					<uni-icons color="#c0c4cc" size="18" type="search" />
+				</slot>
+			</view>
+			<input v-if="show || searchVal" :focus="showSync" :disabled="readonly" :placeholder="placeholderText" :maxlength="maxlength"
+				class="uni-searchbar__box-search-input" confirm-type="search" type="text" v-model="searchVal"
+				@confirm="confirm" @blur="blur" @focus="emitFocus" />
+			<text v-else class="uni-searchbar__text-placeholder">{{ placeholder }}</text>
+			<view v-if="show && (clearButton==='always'||clearButton==='auto'&&searchVal!=='') &&!readonly"
+				class="uni-searchbar__box-icon-clear" @click="clear">
+				<slot name="clearIcon">
+					<uni-icons color="#c0c4cc" size="20" type="clear" />
+				</slot>
+			</view>
+		</view>
+		<text @click="cancel" class="uni-searchbar__cancel"
+			v-if="cancelButton ==='always' || show && cancelButton ==='auto'">{{cancelTextI18n}}</text>
+	</view>
+</template>
+
+<script>
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+
+	/**
+	 * SearchBar 搜索栏
+	 * @description 搜索栏组件，通常用于搜索商品、文章等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=866
+	 * @property {Number} radius 搜索栏圆角
+	 * @property {Number} maxlength 输入最大长度
+	 * @property {String} placeholder 搜索栏Placeholder
+	 * @property {String} clearButton = [always|auto|none] 是否显示清除按钮
+	 * 	@value always 一直显示
+	 * 	@value auto 输入框不为空时显示
+	 * 	@value none 一直不显示
+	 * @property {String} cancelButton = [always|auto|none] 是否显示取消按钮
+	 * 	@value always 一直显示
+	 * 	@value auto 输入框不为空时显示
+	 * 	@value none 一直不显示
+	 * @property {String} cancelText 取消按钮的文字
+	 * @property {String} bgColor 输入框背景颜色
+	 * @property {Boolean} focus 是否自动聚焦
+	 * @property {Boolean} readonly 组件只读，不能有任何操作，只做展示
+	 * @event {Function} confirm uniSearchBar 的输入框 confirm 事件，返回参数为uniSearchBar的value，e={value:Number}
+	 * @event {Function} input uniSearchBar 的 value 改变时触发事件，返回参数为uniSearchBar的value，e=value
+	 * @event {Function} cancel 点击取消按钮时触发事件，返回参数为uniSearchBar的value，e={value:Number}
+	 * @event {Function} clear 点击清除按钮时触发事件，返回参数为uniSearchBar的value，e={value:Number}
+	 * @event {Function} blur input失去焦点时触发事件，返回参数为uniSearchBar的value，e={value:Number}
+	 */
+
+	export default {
+		name: "UniSearchBar",
+		emits: ['input', 'update:modelValue', 'clear', 'cancel', 'confirm', 'blur', 'focus'],
+		props: {
+			placeholder: {
+				type: String,
+				default: ""
+			},
+			radius: {
+				type: [Number, String],
+				default: 5
+			},
+			clearButton: {
+				type: String,
+				default: "auto"
+			},
+			cancelButton: {
+				type: String,
+				default: "auto"
+			},
+			cancelText: {
+				type: String,
+				default: '取消'
+			},
+			bgColor: {
+				type: String,
+				default: "#F8F8F8"
+			},
+			maxlength: {
+				type: [Number, String],
+				default: 100
+			},
+			value: {
+				type: [Number, String],
+				default: ""
+			},
+			modelValue: {
+				type: [Number, String],
+				default: ""
+			},
+			focus: {
+				type: Boolean,
+				default: false
+			},
+			readonly: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				show: false,
+				showSync: false,
+				searchVal: ''
+			}
+		},
+		computed: {
+			cancelTextI18n() {
+				return this.cancelText || t("uni-search-bar.cancel")
+			},
+			placeholderText() {
+				return this.placeholder || t("uni-search-bar.placeholder")
+			}
+		},
+		watch: {
+			// #ifndef VUE3
+			value: {
+				immediate: true,
+				handler(newVal) {
+					this.searchVal = newVal
+					if (newVal) {
+						this.show = true
+					}
+				}
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				immediate: true,
+				handler(newVal) {
+					this.searchVal = newVal
+					if (newVal) {
+						this.show = true
+					}
+				}
+			},
+			// #endif
+			focus: {
+				immediate: true,
+				handler(newVal) {
+					if (newVal) {
+						if(this.readonly) return
+						this.show = true;
+						this.$nextTick(() => {
+							this.showSync = true
+						})
+					}
+				}
+			},
+			searchVal(newVal, oldVal) {
+				this.$emit("input", newVal)
+				// #ifdef VUE3
+				this.$emit("update:modelValue", newVal)
+				// #endif
+			}
+		},
+		methods: {
+			searchClick() {
+				if(this.readonly) return
+				if (this.show) {
+					return
+				}
+				this.show = true;
+				this.$nextTick(() => {
+					this.showSync = true
+				})
+			},
+			clear() {
+				this.$emit("clear", {
+					value: this.searchVal
+				})
+				this.searchVal = ""
+			},
+			cancel() {
+				if(this.readonly) return
+				this.$emit("cancel", {
+					value: this.searchVal
+				});
+				this.searchVal = ""
+				this.show = false
+				this.showSync = false
+				// #ifndef APP-PLUS
+				uni.hideKeyboard()
+				// #endif
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord()
+				// #endif
+			},
+			confirm() {
+				// #ifndef APP-PLUS
+				uni.hideKeyboard();
+				// #endif
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord()
+				// #endif
+				this.$emit("confirm", {
+					value: this.searchVal
+				})
+			},
+			blur() {
+				// #ifndef APP-PLUS
+				uni.hideKeyboard();
+				// #endif
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord()
+				// #endif
+				this.$emit("blur", {
+					value: this.searchVal
+				})
+			},
+			emitFocus(e) {
+				this.$emit("focus", e.detail)
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	$uni-searchbar-height: 36px;
+
+	.uni-searchbar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		position: relative;
+		padding: 10px;
+		// background-color: #fff;
+	}
+
+	.uni-searchbar__box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		overflow: hidden;
+		position: relative;
+		flex: 1;
+		justify-content: center;
+		flex-direction: row;
+		align-items: center;
+		height: $uni-searchbar-height;
+		padding: 5px 8px 5px 0px;
+	}
+
+	.uni-searchbar__box-icon-search {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		// width: 32px;
+		padding: 0 8px;
+		justify-content: center;
+		align-items: center;
+		color: #B3B3B3;
+	}
+
+	.uni-searchbar__box-search-input {
+		flex: 1;
+		font-size: 14px;
+		color: #333;
+	}
+
+	.uni-searchbar__box-icon-clear {
+		align-items: center;
+		line-height: 24px;
+		padding-left: 8px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-searchbar__text-placeholder {
+		font-size: 14px;
+		color: #B3B3B3;
+		margin-left: 5px;
+	}
+
+	.uni-searchbar__cancel {
+		padding-left: 10px;
+		line-height: $uni-searchbar-height;
+		font-size: 14px;
+		color: #333333;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-search-bar/package.json b/uni_modules/uni-search-bar/package.json
new file mode 100644
index 0000000..9352c57
--- /dev/null
+++ b/uni_modules/uni-search-bar/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "uni-search-bar",
+  "displayName": "uni-search-bar 搜索栏",
+  "version": "1.2.3",
+  "description": "搜索栏组件，通常用于搜索商品、文章等",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "搜索框",
+    "搜索栏"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "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-search-bar/readme.md b/uni_modules/uni-search-bar/readme.md
new file mode 100644
index 0000000..253092f
--- /dev/null
+++ b/uni_modules/uni-search-bar/readme.md
@@ -0,0 +1,14 @@
+
+
+## SearchBar 搜索栏
+
+> **组件名：uni-search-bar**
+> 代码块： `uSearchBar`
+
+
+搜索栏组件
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-search-bar)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-section/changelog.md b/uni_modules/uni-section/changelog.md
new file mode 100644
index 0000000..738f2b3
--- /dev/null
+++ b/uni_modules/uni-section/changelog.md
@@ -0,0 +1,2 @@
+## 0.0.1（2022-07-22）
+- 初始化
diff --git a/uni_modules/uni-section/components/uni-section/uni-section.vue b/uni_modules/uni-section/components/uni-section/uni-section.vue
new file mode 100644
index 0000000..9a52e0b
--- /dev/null
+++ b/uni_modules/uni-section/components/uni-section/uni-section.vue
@@ -0,0 +1,167 @@
+<template>
+	<view class="uni-section">
+		<view class="uni-section-header" @click="onClick">
+				<view class="uni-section-header__decoration" v-if="type" :class="type" />
+        <slot v-else name="decoration"></slot>
+
+        <view class="uni-section-header__content">
+          <text :style="{'font-size':titleFontSize,'color':titleColor}" class="uni-section__content-title" :class="{'distraction':!subTitle}">{{ title }}</text>
+          <text v-if="subTitle" :style="{'font-size':subTitleFontSize,'color':subTitleColor}" class="uni-section-header__content-sub">{{ subTitle }}</text>
+        </view>
+
+        <view class="uni-section-header__slot-right">
+          <slot name="right"></slot>
+        </view>
+		</view>
+
+		<view class="uni-section-content" :style="{padding: _padding}">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+
+	/**
+	 * Section 标题栏
+	 * @description 标题栏
+	 * @property {String} type = [line|circle|square] 标题装饰类型
+	 * 	@value line 竖线
+	 * 	@value circle 圆形
+	 * 	@value square 正方形
+	 * @property {String} title 主标题
+	 * @property {String} titleFontSize 主标题字体大小
+	 * @property {String} titleColor 主标题字体颜色
+	 * @property {String} subTitle 副标题
+	 * @property {String} subTitleFontSize 副标题字体大小
+	 * @property {String} subTitleColor 副标题字体颜色
+	 * @property {String} padding 默认插槽 padding
+	 */
+
+	export default {
+		name: 'UniSection',
+    emits:['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			title: {
+				type: String,
+				required: true,
+				default: ''
+			},
+      titleFontSize: {
+        type: String,
+        default: '14px'
+      },
+			titleColor:{
+				type: String,
+				default: '#333'
+			},
+			subTitle: {
+				type: String,
+				default: ''
+			},
+      subTitleFontSize: {
+        type: String,
+        default: '12px'
+      },
+      subTitleColor: {
+        type: String,
+        default: '#999'
+      },
+			padding: {
+				type: [Boolean, String],
+				default: false
+			}
+		},
+    computed:{
+      _padding(){
+        if(typeof this.padding === 'string'){
+          return this.padding
+        }
+
+        return this.padding?'10px':''
+      }
+    },
+		watch: {
+			title(newVal) {
+				if (uni.report && newVal !== '') {
+					uni.report('title', newVal)
+				}
+			}
+		},
+    methods: {
+			onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	$uni-primary: #2979ff !default;
+
+	.uni-section {
+		background-color: #fff;
+    .uni-section-header {
+      position: relative;
+      /* #ifndef APP-NVUE */
+      display: flex;
+      /* #endif */
+      flex-direction: row;
+      align-items: center;
+      padding: 12px 10px;
+      font-weight: normal;
+
+      &__decoration{
+        margin-right: 6px;
+        background-color: $uni-primary;
+        &.line {
+          width: 4px;
+          height: 12px;
+          border-radius: 10px;
+        }
+
+        &.circle {
+          width: 8px;
+          height: 8px;
+          border-top-right-radius: 50px;
+          border-top-left-radius: 50px;
+          border-bottom-left-radius: 50px;
+          border-bottom-right-radius: 50px;
+        }
+
+        &.square {
+          width: 8px;
+          height: 8px;
+        }
+      }
+
+      &__content {
+        /* #ifndef APP-NVUE */
+        display: flex;
+        /* #endif */
+        flex-direction: column;
+        flex: 1;
+        color: #333;
+
+        .distraction {
+          flex-direction: row;
+          align-items: center;
+        }
+        &-sub {
+          margin-top: 2px;
+        }
+      }
+
+      &__slot-right{
+        font-size: 14px;
+      }
+    }
+
+    .uni-section-content{
+      font-size: 14px;
+    }
+	}
+</style>
diff --git a/uni_modules/uni-section/package.json b/uni_modules/uni-section/package.json
new file mode 100644
index 0000000..0a31fb5
--- /dev/null
+++ b/uni_modules/uni-section/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-section",
+  "displayName": "uni-section 标题栏",
+  "version": "0.0.1",
+  "description": "标题栏组件",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "标题栏"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+      "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-section/readme.md b/uni_modules/uni-section/readme.md
new file mode 100644
index 0000000..d47faab
--- /dev/null
+++ b/uni_modules/uni-section/readme.md
@@ -0,0 +1,8 @@
+## Section 标题栏
+> **组件名：uni-section**
+> 代码块： `uSection`
+
+uni-section 组件主要用于文章、列表详情等标题展示
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-section)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
diff --git a/uni_modules/uni-segmented-control/changelog.md b/uni_modules/uni-segmented-control/changelog.md
new file mode 100644
index 0000000..a44385d
--- /dev/null
+++ b/uni_modules/uni-segmented-control/changelog.md
@@ -0,0 +1,9 @@
+## 1.2.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-segmented-control](https://uniapp.dcloud.io/component/uniui/uni-segmented-control)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.5（2021-05-12）
+- 新增 项目示例地址
+## 1.0.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue b/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue
new file mode 100644
index 0000000..044a495
--- /dev/null
+++ b/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue
@@ -0,0 +1,145 @@
+<template>
+	<view :class="[styleType === 'text'?'segmented-control--text' : 'segmented-control--button' ]"
+		:style="{ borderColor: styleType === 'text' ? '' : activeColor }" class="segmented-control">
+		<view v-for="(item, index) in values" :class="[ styleType === 'text' ? '': 'segmented-control__item--button',
+		index === currentIndex&&styleType === 'button' ? 'segmented-control__item--button--active': '',
+		index === 0&&styleType === 'button' ? 'segmented-control__item--button--first': '',
+			index === values.length - 1&&styleType === 'button' ? 'segmented-control__item--button--last': '' ]" :key="index"
+			:style="{ backgroundColor: index === currentIndex && styleType === 'button' ? activeColor : '',borderColor: index === currentIndex&&styleType === 'text'||styleType === 'button'?activeColor:'transparent' }"
+			class="segmented-control__item" @click="_onClick(index)">
+			<view>
+				<text :style="{color:
+				    index === currentIndex
+				      ? styleType === 'text'
+				        ? activeColor
+				        : '#fff'
+				      : styleType === 'text'
+				        ? '#000'
+				        : activeColor}" class="segmented-control__text" :class="styleType === 'text' && index === currentIndex ? 'segmented-control__item--text': ''">{{ item }}</text>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * SegmentedControl 分段器
+	 * @description 用作不同视图的显示
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=54
+	 * @property {Number} current 当前选中的tab索引值，从0计数
+	 * @property {String} styleType = [button|text] 分段器样式类型
+	 * 	@value button 按钮类型
+	 * 	@value text 文字类型
+	 * @property {String} activeColor 选中的标签背景色与边框颜色
+	 * @property {Array} values 选项数组
+	 * @event {Function} clickItem 组件触发点击事件时触发，e={currentIndex}
+	 */
+
+	export default {
+		name: 'UniSegmentedControl',
+		emits: ['clickItem'],
+		props: {
+			current: {
+				type: Number,
+				default: 0
+			},
+			values: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			activeColor: {
+				type: String,
+				default: '#2979FF'
+			},
+			styleType: {
+				type: String,
+				default: 'button'
+			}
+		},
+		data() {
+			return {
+				currentIndex: 0
+			}
+		},
+		watch: {
+			current(val) {
+				if (val !== this.currentIndex) {
+					this.currentIndex = val
+				}
+			}
+		},
+		created() {
+			this.currentIndex = this.current
+		},
+		methods: {
+			_onClick(index) {
+				if (this.currentIndex !== index) {
+					this.currentIndex = index
+					this.$emit('clickItem', {
+						currentIndex: index
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.segmented-control {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		flex-direction: row;
+		height: 36px;
+		overflow: hidden;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.segmented-control__item {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		box-sizing: border-box;
+		/* #endif */
+		position: relative;
+		flex: 1;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.segmented-control__item--button {
+		border-style: solid;
+		border-top-width: 1px;
+		border-bottom-width: 1px;
+		border-right-width: 1px;
+		border-left-width: 0;
+	}
+
+	.segmented-control__item--button--first {
+		border-left-width: 1px;
+		border-top-left-radius: 5px;
+		border-bottom-left-radius: 5px;
+	}
+
+	.segmented-control__item--button--last {
+		border-top-right-radius: 5px;
+		border-bottom-right-radius: 5px;
+	}
+
+	.segmented-control__item--text {
+		border-bottom-style: solid;
+		border-bottom-width: 2px;
+		padding: 6px 0;
+	}
+
+	.segmented-control__text {
+		font-size: 14px;
+		line-height: 20px;
+		text-align: center;
+	}
+</style>
diff --git a/uni_modules/uni-segmented-control/package.json b/uni_modules/uni-segmented-control/package.json
new file mode 100644
index 0000000..6cae41d
--- /dev/null
+++ b/uni_modules/uni-segmented-control/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-segmented-control",
+  "displayName": "uni-segmented-control 分段器",
+  "version": "1.2.0",
+  "description": "分段器由至少 2 个分段控件组成，用作不同视图的显示",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "分段器",
+    "segement",
+    "顶部选择"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["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-segmented-control/readme.md b/uni_modules/uni-segmented-control/readme.md
new file mode 100644
index 0000000..3527b03
--- /dev/null
+++ b/uni_modules/uni-segmented-control/readme.md
@@ -0,0 +1,13 @@
+
+
+## SegmentedControl 分段器
+> **组件名：uni-segmented-control**
+> 代码块： `uSegmentedControl`
+
+
+用作不同视图的显示
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-segmented-control)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-steps/changelog.md b/uni_modules/uni-steps/changelog.md
new file mode 100644
index 0000000..cb9d367
--- /dev/null
+++ b/uni_modules/uni-steps/changelog.md
@@ -0,0 +1,16 @@
+## 1.1.1（2021-11-22）
+- 修复 vue3中某些scss变量无法找到的问题
+## 1.1.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-steps](https://uniapp.dcloud.io/component/uniui/uni-steps)
+## 1.0.8（2021-05-12）
+- 新增 项目示例地址
+## 1.0.7（2021-05-06）
+- 修复 uni-steps 横向布局时，多行文字高度不合理的 bug
+## 1.0.6（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.5（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-steps/components/uni-steps/uni-steps.vue b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
new file mode 100644
index 0000000..a6c8f28
--- /dev/null
+++ b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
@@ -0,0 +1,269 @@
+<template>
+	<view class="uni-steps">
+		<view :class="[direction==='column'?'uni-steps__column':'uni-steps__row']">
+			<view :class="[direction==='column'?'uni-steps__column-text-container':'uni-steps__row-text-container']">
+				<view v-for="(item,index) in options" :key="index"
+					:class="[direction==='column'?'uni-steps__column-text':'uni-steps__row-text']">
+					<text :style="{color:index === active?activeColor:deactiveColor}"
+						:class="[direction==='column'?'uni-steps__column-title':'uni-steps__row-title']">{{item.title}}</text>
+					<text :style="{color: deactiveColor}"
+						:class="[direction==='column'?'uni-steps__column-desc':'uni-steps__row-desc']">{{item.desc}}</text>
+				</view>
+			</view>
+			<view :class="[direction==='column'?'uni-steps__column-container':'uni-steps__row-container']">
+				<view :class="[direction==='column'?'uni-steps__column-line-item':'uni-steps__row-line-item']"
+					v-for="(item,index) in options" :key="index">
+					<view
+						:class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--before':'uni-steps__row-line--before']"
+						:style="{backgroundColor:index<=active&&index!==0?activeColor:index===0?'transparent':deactiveColor}">
+					</view>
+					<view :class="[direction==='column'?'uni-steps__column-check':'uni-steps__row-check']"
+						v-if="index === active">
+						<uni-icons :color="activeColor" :type="activeIcon" size="14"></uni-icons>
+					</view>
+					<view v-else :class="[direction==='column'?'uni-steps__column-circle':'uni-steps__row-circle']"
+						:style="{backgroundColor:index<active?activeColor:deactiveColor}"></view>
+					<view
+						:class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--after':'uni-steps__row-line--after']"
+						:style="{backgroundColor:index<active&&index!==options.length-1?activeColor:index===options.length-1?'transparent':deactiveColor}">
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Steps 步骤条
+	 * @description 评分组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=34
+	 * @property {Number} active 当前步骤
+	 * @property {String} direction = [row|column] 当前步骤
+	 * 	@value row 横向
+	 * 	@value column 纵向
+	 * @property {String} activeColor 选中状态的颜色
+	 * @property {Array} options 数据源，格式为：[{title:'xxx',desc:'xxx'},{title:'xxx',desc:'xxx'}]
+	 */
+
+	export default {
+		name: 'UniSteps',
+		props: {
+			direction: {
+				// 排列方向 row column
+				type: String,
+				default: 'row'
+			},
+			activeColor: {
+				// 激活状态颜色
+				type: String,
+				default: '#2979FF'
+			},
+			deactiveColor: {
+				// 未激活状态颜色
+				type: String,
+				default: '#B7BDC6'
+			},
+			active: {
+				// 当前步骤
+				type: Number,
+				default: 0
+			},
+			activeIcon: {
+				// 当前步骤
+				type: String,
+				default: 'checkbox-filled'
+			},
+			options: {
+				type: Array,
+				default () {
+					return []
+				}
+			} // 数据
+		},
+		data() {
+			return {}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #2979ff !default;
+	$uni-border-color:#EDEDED;
+	.uni-steps {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		width: 100%;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-steps__row {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-steps__column {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row-reverse;
+	}
+
+	.uni-steps__row-text-container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: flex-end;
+		margin-bottom: 8px;
+	}
+
+	.uni-steps__column-text-container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		flex: 1;
+	}
+
+	.uni-steps__row-text {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: column;
+	}
+
+	.uni-steps__column-text {
+		padding: 6px 0px;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+		border-bottom-color: $uni-border-color;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-steps__row-title {
+		font-size: 14px;
+		line-height: 16px;
+		text-align: center;
+	}
+
+	.uni-steps__column-title {
+		font-size: 14px;
+		text-align: left;
+		line-height: 18px;
+	}
+
+	.uni-steps__row-desc {
+		font-size: 12px;
+		line-height: 14px;
+		text-align: center;
+	}
+
+	.uni-steps__column-desc {
+		font-size: 12px;
+		text-align: left;
+		line-height: 18px;
+	}
+
+	.uni-steps__row-container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-steps__column-container {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		width: 30px;
+		flex-direction: column;
+	}
+
+	.uni-steps__row-line-item {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+		height: 14px;
+		line-height: 14px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-steps__column-line-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		flex: 1;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-steps__row-line {
+		flex: 1;
+		height: 1px;
+		background-color: #B7BDC6;
+	}
+
+	.uni-steps__column-line {
+		width: 1px;
+		background-color: #B7BDC6;
+	}
+
+	.uni-steps__row-line--after {
+		transform: translateX(1px);
+	}
+
+	.uni-steps__column-line--after {
+		flex: 1;
+		transform: translate(0px, 1px);
+	}
+
+	.uni-steps__row-line--before {
+		transform: translateX(-1px);
+	}
+
+	.uni-steps__column-line--before {
+		height: 6px;
+		transform: translate(0px, -13px);
+	}
+
+	.uni-steps__row-circle {
+		width: 5px;
+		height: 5px;
+		border-radius: 50%;
+		background-color: #B7BDC6;
+		margin: 0px 3px;
+	}
+
+	.uni-steps__column-circle {
+		width: 5px;
+		height: 5px;
+		border-radius: 50%;
+		background-color: #B7BDC6;
+		margin: 4px 0px 5px 0px;
+	}
+
+	.uni-steps__row-check {
+		margin: 0px 6px;
+	}
+
+	.uni-steps__column-check {
+		height: 14px;
+		line-height: 14px;
+		margin: 2px 0px;
+	}
+</style>
diff --git a/uni_modules/uni-steps/package.json b/uni_modules/uni-steps/package.json
new file mode 100644
index 0000000..c687b40
--- /dev/null
+++ b/uni_modules/uni-steps/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "uni-steps",
+  "displayName": "uni-steps 步骤条",
+  "version": "1.1.1",
+  "description": "步骤条组件，提供横向和纵向两种布局格式。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "步骤条",
+    "时间轴"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "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-steps/readme.md b/uni_modules/uni-steps/readme.md
new file mode 100644
index 0000000..da7a4bf
--- /dev/null
+++ b/uni_modules/uni-steps/readme.md
@@ -0,0 +1,13 @@
+
+
+## Steps 步骤条
+> **组件名：uni-steps**
+> 代码块： `uSteps`
+
+
+步骤条，常用于显示进度
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-steps)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-swipe-action/changelog.md b/uni_modules/uni-swipe-action/changelog.md
new file mode 100644
index 0000000..c007cb5
--- /dev/null
+++ b/uni_modules/uni-swipe-action/changelog.md
@@ -0,0 +1,41 @@
+## 1.3.7（2022-06-06）
+- 修复 vue3 下使用组件不能正常运行的Bug
+## 1.3.6（2022-05-31）
+- 修复 h5端点击click触发两次的Bug
+## 1.3.5（2022-05-23）
+- 修复 isPC 找不到的Bug
+## 1.3.4（2022-05-19）
+-  修复 在 nvue 下 disabled 失效的bug
+## 1.3.3（2022-03-31）
+- 修复 按钮字体大小不能设置的bug
+## 1.3.2（2022-03-16）
+- 修复 h5和app端下报el错误的bug
+## 1.3.1（2022-03-07）
+- 修复 HBuilderX 1.4.X 版本中，h5和app端下报错的bug
+## 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-swipe-action](https://uniapp.dcloud.io/component/uniui/uni-swipe-action)
+## 1.2.4（2021-08-20）
+- 优化 close-all 方法
+## 1.2.3（2021-08-20）
+- 新增 close-all 方法，关闭所有已打开的组件
+## 1.2.2（2021-08-17）
+- 新增 resize() 方法，在非微信小程序、h5、app-vue端出现不能滑动的问题的时候，重置组件
+- 修复 app 端偶尔出现类似 Page[x][-x,xx;-x,xx,x,x-x] 的问题 
+- 优化 微信小程序、h5、app-vue 滑动逻辑，避免出现动态新增组件后不能滑动的问题
+## 1.2.1（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+- 修复 跨页面修改组件数据 ，导致不能滑动的问题
+## 1.1.10（2021-06-17）
+- 修复 按钮点击执行两次的bug
+## 1.1.9（2021-05-12）
+- 新增 项目示例地址
+## 1.1.8（2021-03-26）
+- 修复 微信小程序 nv_navigator is not defined 报错的bug
+## 1.1.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 左侧滑动
+- 新增 插槽使用方式
+- 新增 threshold 属性，可以控制滑动缺省值
+- 优化 长列表滚动性能
+- 修复 滚动页面时触发组件滑动的Bug
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js
new file mode 100644
index 0000000..755c97c
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js
@@ -0,0 +1,302 @@
+let bindIngXMixins = {}
+
+// #ifdef APP-NVUE
+const BindingX = uni.requireNativePlugin('bindingx');
+const dom = uni.requireNativePlugin('dom');
+const animation = uni.requireNativePlugin('animation');
+
+bindIngXMixins = {
+	data() {
+		return {}
+	},
+
+	watch: {
+		show(newVal) {
+			if (this.autoClose) return
+			if (this.stop) return
+			this.stop = true
+			if (newVal) {
+				this.open(newVal)
+			} else {
+				this.close()
+			}
+		},
+		leftOptions() {
+			this.getSelectorQuery()
+			this.init()
+		},
+		rightOptions(newVal) {
+			this.init()
+		}
+	},
+	created() {
+		this.swipeaction = this.getSwipeAction()
+		if (this.swipeaction.children !== undefined) {
+			this.swipeaction.children.push(this)
+		}
+	},
+	mounted() {
+		this.box = this.getEl(this.$refs['selector-box--hock'])
+		this.selector = this.getEl(this.$refs['selector-content--hock']);
+		this.leftButton = this.getEl(this.$refs['selector-left-button--hock']);
+		this.rightButton = this.getEl(this.$refs['selector-right-button--hock']);
+		this.init()
+	},
+	// beforeDestroy() {
+	// 	this.swipeaction.children.forEach((item, index) => {
+	// 		if (item === this) {
+	// 			this.swipeaction.children.splice(index, 1)
+	// 		}
+	// 	})
+	// },
+	methods: {
+		init() {
+			this.$nextTick(() => {
+				this.x = 0
+				this.button = {
+					show: false
+				}
+				setTimeout(() => {
+					this.getSelectorQuery()
+				}, 200)
+			})
+		},
+		onClick(index, item, position) {
+			this.$emit('click', {
+				content: item,
+				index,
+				position
+			})
+		},
+		touchstart(e) {
+			// fix by mehaotian 禁止滑动
+			if (this.disabled) return
+			// 每次只触发一次，避免多次监听造成闪烁
+			if (this.stop) return
+			this.stop = true
+			if (this.autoClose) {
+				this.swipeaction.closeOther(this)
+			}
+
+			const leftWidth = this.button.left.width
+			const rightWidth = this.button.right.width
+			let expression = this.range(this.x, -rightWidth, leftWidth)
+			let leftExpression = this.range(this.x - leftWidth, -leftWidth, 0)
+			let rightExpression = this.range(this.x + rightWidth, 0, rightWidth)
+
+			this.eventpan = BindingX.bind({
+				anchor: this.box,
+				eventType: 'pan',
+				props: [{
+					element: this.selector,
+					property: 'transform.translateX',
+					expression
+				}, {
+					element: this.leftButton,
+					property: 'transform.translateX',
+					expression: leftExpression
+				}, {
+					element: this.rightButton,
+					property: 'transform.translateX',
+					expression: rightExpression
+				}, ]
+			}, (e) => {
+				// nope
+				if (e.state === 'end') {
+					this.x = e.deltaX + this.x;
+					this.isclick = true
+					this.bindTiming(e.deltaX)
+				}
+			});
+		},
+		touchend(e) {
+			if (this.isopen !== 'none' && !this.isclick) {
+				this.open('none')
+			}
+		},
+		bindTiming(x) {
+			const left = this.x
+			const leftWidth = this.button.left.width
+			const rightWidth = this.button.right.width
+			const threshold = this.threshold
+			if (!this.isopen || this.isopen === 'none') {
+				if (left > threshold) {
+					this.open('left')
+				} else if (left < -threshold) {
+					this.open('right')
+				} else {
+					this.open('none')
+				}
+			} else {
+				if ((x > -leftWidth && x < 0) || x > rightWidth) {
+					if ((x > -threshold && x < 0) || (x - rightWidth > threshold)) {
+						this.open('left')
+					} else {
+						this.open('none')
+					}
+				} else {
+					if ((x < threshold && x > 0) || (x + leftWidth < -threshold)) {
+						this.open('right')
+					} else {
+						this.open('none')
+					}
+				}
+			}
+		},
+
+		/**
+		 * 移动范围
+		 * @param {Object} num
+		 * @param {Object} mix
+		 * @param {Object} max
+		 */
+		range(num, mix, max) {
+			return `min(max(x+${num}, ${mix}), ${max})`
+		},
+
+		/**
+		 * 开启swipe
+		 */
+		open(type) {
+			this.animation(type)
+		},
+
+		/**
+		 * 关闭swipe
+		 */
+		close() {
+			this.animation('none')
+		},
+
+		/**
+		 * 开启关闭动画
+		 * @param {Object} type
+		 */
+		animation(type) {
+			const time = 300
+			const leftWidth = this.button.left.width
+			const rightWidth = this.button.right.width
+			if (this.eventpan && this.eventpan.token) {
+				BindingX.unbind({
+					token: this.eventpan.token,
+					eventType: 'pan'
+				})
+			}
+
+			switch (type) {
+				case 'left':
+					Promise.all([
+						this.move(this.selector, leftWidth),
+						this.move(this.leftButton, 0),
+						this.move(this.rightButton, rightWidth * 2)
+					]).then(() => {
+						this.setEmit(leftWidth, type)
+					})
+					break
+				case 'right':
+					Promise.all([
+						this.move(this.selector, -rightWidth),
+						this.move(this.leftButton, -leftWidth * 2),
+						this.move(this.rightButton, 0)
+					]).then(() => {
+						this.setEmit(-rightWidth, type)
+					})
+					break
+				default:
+					Promise.all([
+						this.move(this.selector, 0),
+						this.move(this.leftButton, -leftWidth),
+						this.move(this.rightButton, rightWidth)
+					]).then(() => {
+						this.setEmit(0, type)
+					})
+
+			}
+		},
+		setEmit(x, type) {
+			const leftWidth = this.button.left.width
+			const rightWidth = this.button.right.width
+			this.isopen = this.isopen || 'none'
+			this.stop = false
+			this.isclick = false
+			// 只有状态不一致才会返回结果
+			if (this.isopen !== type && this.x !== x) {
+				if (type === 'left' && leftWidth > 0) {
+					this.$emit('change', 'left')
+				}
+				if (type === 'right' && rightWidth > 0) {
+					this.$emit('change', 'right')
+				}
+				if (type === 'none') {
+					this.$emit('change', 'none')
+				}
+			}
+			this.x = x
+			this.isopen = type
+		},
+		move(ref, value) {
+			return new Promise((resolve, reject) => {
+				animation.transition(ref, {
+					styles: {
+						transform: `translateX(${value})`,
+					},
+					duration: 150, //ms
+					timingFunction: 'linear',
+					needLayout: false,
+					delay: 0 //ms
+				}, function(res) {
+					resolve(res)
+				})
+			})
+
+		},
+
+		/**
+		 * 获取ref
+		 * @param {Object} el
+		 */
+		getEl(el) {
+			return el.ref
+		},
+		/**
+		 * 获取节点信息
+		 */
+		getSelectorQuery() {
+			Promise.all([
+				this.getDom('left'),
+				this.getDom('right'),
+			]).then((data) => {
+				let show = 'none'
+				if (this.autoClose) {
+					show = 'none'
+				} else {
+					show = this.show
+				}
+
+				if (show === 'none') {
+					// this.close()
+				} else {
+					this.open(show)
+				}
+
+			})
+
+		},
+		getDom(str) {
+			return new Promise((resolve, reject) => {
+				dom.getComponentRect(this.$refs[`selector-${str}-button--hock`], (data) => {
+					if (data) {
+						this.button[str] = data.size
+						resolve(data)
+					} else {
+						reject()
+					}
+				})
+			})
+		}
+	}
+}
+
+// #endif
+
+export default bindIngXMixins
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/index.wxs b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/index.wxs
new file mode 100644
index 0000000..10ddb56
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/index.wxs
@@ -0,0 +1,323 @@
+var MIN_DISTANCE = 10;
+
+/**
+ * 判断当前是否为H5、app-vue
+ */
+var IS_HTML5 = false
+if (typeof window === 'object') IS_HTML5 = true
+
+/**
+ * 监听页面内值的变化,主要用于动态开关swipe-action
+ * @param {Object} newValue
+ * @param {Object} oldValue
+ * @param {Object} ownerInstance
+ * @param {Object} instance
+ */
+function sizeReady(newValue, oldValue, ownerInstance, instance) {
+	var state = instance.getState()
+	var buttonPositions = JSON.parse(newValue)
+	if (!buttonPositions || !buttonPositions.data || buttonPositions.data.length === 0) return
+	state.leftWidth = buttonPositions.data[0].width
+	state.rightWidth = buttonPositions.data[1].width
+	state.threshold = instance.getDataset().threshold
+
+	if (buttonPositions.show && buttonPositions.show !== 'none') {
+		openState(buttonPositions.show, instance, ownerInstance)
+		return
+	}
+
+	if (state.left) {
+		openState('none', instance, ownerInstance)
+	}
+	resetTouchStatus(instance)
+}
+
+/**
+ * 开始触摸操作
+ * @param {Object} e
+ * @param {Object} ins
+ */
+function touchstart(e, ins) {
+	var instance = e.instance;
+	var disabled = instance.getDataset().disabled
+	var state = instance.getState();
+	// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+	disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false;
+	if (disabled) return
+	// 开始触摸时移除动画类
+	instance.requestAnimationFrame(function() {
+		instance.removeClass('ani');
+		ins.callMethod('closeSwipe');
+	})
+
+	// 记录上次的位置
+	state.x = state.left || 0
+	// 计算滑动开始位置
+	stopTouchStart(e, ins)
+}
+
+/**
+ * 开始滑动操作
+ * @param {Object} e
+ * @param {Object} ownerInstance
+ */
+function touchmove(e, ownerInstance) {
+	var instance = e.instance;
+	var disabled = instance.getDataset().disabled
+	var state = instance.getState()
+	// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+	disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false;
+	if (disabled) return
+	// 是否可以滑动页面
+	stopTouchMove(e);
+	if (state.direction !== 'horizontal') {
+		return;
+	}
+
+	if (e.preventDefault) {
+		// 阻止页面滚动
+		e.preventDefault()
+	}
+
+	move(state.x + state.deltaX, instance, ownerInstance)
+}
+
+/**
+ * 结束触摸操作
+ * @param {Object} e
+ * @param {Object} ownerInstance
+ */
+function touchend(e, ownerInstance) {
+	var instance = e.instance;
+	var disabled = instance.getDataset().disabled
+	var state = instance.getState()
+	// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+	disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false;
+
+	if (disabled) return
+	// 滑动过程中触摸结束,通过阙值判断是开启还是关闭
+	// fixed by mehaotian 定时器解决点击按钮，touchend 触发比 click 事件时机早的问题 ，主要是 ios13
+	moveDirection(state.left, instance, ownerInstance)
+
+}
+
+/**
+ * 设置移动距离
+ * @param {Object} value
+ * @param {Object} instance
+ * @param {Object} ownerInstance
+ */
+function move(value, instance, ownerInstance) {
+	value = value || 0
+	var state = instance.getState()
+	var leftWidth = state.leftWidth
+	var rightWidth = state.rightWidth
+	// 获取可滑动范围
+	state.left = range(value, -rightWidth, leftWidth);
+	instance.requestAnimationFrame(function() {
+		instance.setStyle({
+			transform: 'translateX(' + state.left + 'px)',
+			'-webkit-transform': 'translateX(' + state.left + 'px)'
+		})
+	})
+
+}
+
+/**
+ * 获取范围
+ * @param {Object} num
+ * @param {Object} min
+ * @param {Object} max
+ */
+function range(num, min, max) {
+	return Math.min(Math.max(num, min), max);
+}
+
+
+/**
+ * 移动方向判断
+ * @param {Object} left
+ * @param {Object} value
+ * @param {Object} ownerInstance
+ * @param {Object} ins
+ */
+function moveDirection(left, ins, ownerInstance) {
+	var state = ins.getState()
+	var threshold = state.threshold
+	var position = state.position
+	var isopen = state.isopen || 'none'
+	var leftWidth = state.leftWidth
+	var rightWidth = state.rightWidth
+	if (state.deltaX === 0) {
+		openState('none', ins, ownerInstance)
+		return
+	}
+	if ((isopen === 'none' && rightWidth > 0 && -left > threshold) || (isopen !== 'none' && rightWidth > 0 &&
+			rightWidth +
+			left < threshold)) {
+		// right
+		openState('right', ins, ownerInstance)
+	} else if ((isopen === 'none' && leftWidth > 0 && left > threshold) || (isopen !== 'none' && leftWidth > 0 &&
+			leftWidth - left < threshold)) {
+		// left
+		openState('left', ins, ownerInstance)
+	} else {
+		// default
+		openState('none', ins, ownerInstance)
+	}
+}
+
+
+/**
+ * 开启状态
+ * @param {Boolean} type
+ * @param {Object} ins
+ * @param {Object} ownerInstance
+ */
+function openState(type, ins, ownerInstance) {
+	var state = ins.getState()
+	var position = state.position
+	var leftWidth = state.leftWidth
+	var rightWidth = state.rightWidth
+	var left = ''
+	state.isopen = state.isopen ? state.isopen : 'none'
+	switch (type) {
+		case "left":
+			left = leftWidth
+			break
+		case "right":
+			left = -rightWidth
+			break
+		default:
+			left = 0
+	}
+
+	// && !state.throttle
+
+	if (state.isopen !== type) {
+		state.throttle = true
+		ownerInstance.callMethod('change', {
+			open: type
+		})
+
+	}
+
+	state.isopen = type
+	// 添加动画类
+	ins.requestAnimationFrame(function() {
+		ins.addClass('ani');
+		move(left, ins, ownerInstance)
+	})
+	// 设置最终移动位置,理论上只要进入到这个函数，肯定是要打开的
+}
+
+
+function getDirection(x, y) {
+	if (x > y && x > MIN_DISTANCE) {
+		return 'horizontal';
+	}
+	if (y > x && y > MIN_DISTANCE) {
+		return 'vertical';
+	}
+	return '';
+}
+
+/**
+ * 重置滑动状态
+ * @param {Object} event
+ */
+function resetTouchStatus(instance) {
+	var state = instance.getState();
+	state.direction = '';
+	state.deltaX = 0;
+	state.deltaY = 0;
+	state.offsetX = 0;
+	state.offsetY = 0;
+}
+
+/**
+ * 设置滑动开始位置
+ * @param {Object} event
+ */
+function stopTouchStart(event) {
+	var instance = event.instance;
+	var state = instance.getState();
+	resetTouchStatus(instance);
+	var touch = event.touches[0];
+	if (IS_HTML5 && isPC()) {
+		touch = event;
+	}
+	state.startX = touch.clientX;
+	state.startY = touch.clientY;
+}
+
+/**
+ * 滑动中，是否禁止打开
+ * @param {Object} event
+ */
+function stopTouchMove(event) {
+	var instance = event.instance;
+	var state = instance.getState();
+	var touch = event.touches[0];
+	if (IS_HTML5 && isPC()) {
+		touch = event;
+	}
+	state.deltaX = touch.clientX - state.startX;
+	state.deltaY = touch.clientY - state.startY;
+	state.offsetY = Math.abs(state.deltaY);
+	state.offsetX = Math.abs(state.deltaX);
+	state.direction = state.direction || getDirection(state.offsetX, state.offsetY);
+}
+
+function isPC() {
+	var userAgentInfo = navigator.userAgent;
+	var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+	var flag = true;
+	for (var v = 0; v < Agents.length - 1; v++) {
+		if (userAgentInfo.indexOf(Agents[v]) > 0) {
+			flag = false;
+			break;
+		}
+	}
+	return flag;
+}
+
+var movable = false
+
+function mousedown(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	touchstart(e, ins)
+	movable = true
+}
+
+function mousemove(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	if (!movable) return
+	touchmove(e, ins)
+}
+
+function mouseup(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	touchend(e, ins)
+	movable = false
+}
+
+function mouseleave(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	movable = false
+}
+
+module.exports = {
+	sizeReady: sizeReady,
+	touchstart: touchstart,
+	touchmove: touchmove,
+	touchend: touchend,
+	mousedown: mousedown,
+	mousemove: mousemove,
+	mouseup: mouseup,
+	mouseleave: mouseleave
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/isPC.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/isPC.js
new file mode 100644
index 0000000..917cb48
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/isPC.js
@@ -0,0 +1,12 @@
+export function isPC() {
+	var userAgentInfo = navigator.userAgent;
+	var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+	var flag = true;
+	for (let v = 0; v < Agents.length - 1; v++) {
+		if (userAgentInfo.indexOf(Agents[v]) > 0) {
+			flag = false;
+			break;
+		}
+	}
+	return flag;
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js
new file mode 100644
index 0000000..43cd56b
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js
@@ -0,0 +1,193 @@
+export default {
+	data() {
+		return {
+			x: 0,
+			transition: false,
+			width: 0,
+			viewWidth: 0,
+			swipeShow: 0
+		}
+	},
+	watch: {
+		show(newVal) {
+			if (this.autoClose) return
+			if (newVal && newVal !== 'none') {
+				this.transition = true
+				this.open(newVal)
+			} else {
+				this.close()
+			}
+		}
+	},
+	created() {
+		this.swipeaction = this.getSwipeAction()
+		if (this.swipeaction.children !== undefined) {
+			this.swipeaction.children.push(this)
+		}
+	},
+	mounted() {
+		this.isopen = false
+		setTimeout(() => {
+			this.getQuerySelect()
+		}, 50)
+	},
+	methods: {
+		appTouchStart(e) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			this.clientX = clientX
+			this.timestamp = new Date().getTime()
+		},
+		appTouchEnd(e, index, item, position) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			// fixed by xxxx 模拟点击事件，解决 ios 13 点击区域错位的问题
+			let diff = Math.abs(this.clientX - clientX)
+			let time = (new Date().getTime()) - this.timestamp
+			if (diff < 40 && time < 300) {
+				this.$emit('click', {
+					content: item,
+					index,
+					position
+				})
+			}
+		},
+		/**
+		 * 移动触发
+		 * @param {Object} e
+		 */
+		onChange(e) {
+			this.moveX = e.detail.x
+			this.isclose = false
+		},
+		touchstart(e) {
+			this.transition = false
+			this.isclose = true
+			this.autoClose && this.swipeaction.closeOther(this)
+		},
+		touchmove(e) {},
+		touchend(e) {
+			// 0的位置什么都不执行
+			if (this.isclose && this.isopen === 'none') return
+			if (this.isclose && this.isopen !== 'none') {
+				this.transition = true
+				this.close()
+			} else {
+				this.move(this.moveX + this.leftWidth)
+			}
+		},
+
+		/**
+		 * 移动
+		 * @param {Object} moveX
+		 */
+		move(moveX) {
+			// 打开关闭的处理逻辑不太一样
+			this.transition = true
+			// 未打开状态
+			if (!this.isopen || this.isopen === 'none') {
+				if (moveX > this.threshold) {
+					this.open('left')
+				} else if (moveX < -this.threshold) {
+					this.open('right')
+				} else {
+					this.close()
+				}
+			} else {
+				if (moveX < 0 && moveX < this.rightWidth) {
+					const rightX = this.rightWidth + moveX
+					if (rightX < this.threshold) {
+						this.open('right')
+					} else {
+						this.close()
+					}
+				} else if (moveX > 0 && moveX < this.leftWidth) {
+					const leftX = this.leftWidth - moveX
+					if (leftX < this.threshold) {
+						this.open('left')
+					} else {
+						this.close()
+					}
+				}
+
+			}
+
+		},
+
+		/**
+		 * 打开
+		 */
+		open(type) {
+			this.x = this.moveX
+			this.animation(type)
+		},
+
+		/**
+		 * 关闭
+		 */
+		close() {
+			this.x = this.moveX
+			// TODO 解决 x 值不更新的问题，所以会多触发一次 nextTick ，待优化
+			this.$nextTick(() => {
+				this.x = -this.leftWidth
+				if (this.isopen !== 'none') {
+					this.$emit('change', 'none')
+				}
+				this.isopen = 'none'
+			})
+		},
+
+		/**
+		 * 执行结束动画
+		 * @param {Object} type
+		 */
+		animation(type) {
+			this.$nextTick(() => {
+				if (type === 'left') {
+					this.x = 0
+				} else {
+					this.x = -this.rightWidth - this.leftWidth
+				}
+
+				if (this.isopen !== type) {
+					this.$emit('change', type)
+				}
+				this.isopen = type
+			})
+
+		},
+		getSlide(x) {},
+		getQuerySelect() {
+			const query = uni.createSelectorQuery().in(this);
+			query.selectAll('.movable-view--hock').boundingClientRect(data => {
+				this.leftWidth = data[1].width
+				this.rightWidth = data[2].width
+				this.width = data[0].width
+				this.viewWidth = this.width + this.rightWidth + this.leftWidth
+				if (this.leftWidth === 0) {
+					// TODO 疑似bug ,初始化的时候如果x 是0，会导致移动位置错误，所以让元素超出一点
+					this.x = -0.1
+				} else {
+					this.x = -this.leftWidth
+				}
+				this.moveX = this.x
+				this.$nextTick(() => {
+					this.swipeShow = 1
+				})
+
+				if (!this.buttonWidth) {
+					this.disabledView = true
+				}
+
+				if (this.autoClose) return
+				if (this.show !== 'none') {
+					this.transition = true
+					this.open(this.shows)
+				}
+			}).exec();
+
+		}
+	}
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js
new file mode 100644
index 0000000..9a8bcbb
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js
@@ -0,0 +1,259 @@
+let otherMixins = {}
+
+// #ifndef APP-PLUS|| MP-WEIXIN  ||  H5
+const MIN_DISTANCE = 10;
+otherMixins = {
+	data() {
+		// TODO 随机生生元素ID，解决百度小程序获取同一个元素位置信息的bug
+		const elClass = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+		return {
+			uniShow: false,
+			left: 0,
+			buttonShow: 'none',
+			ani: false,
+			moveLeft: '',
+			elClass
+		}
+	},
+	watch: {
+		show(newVal) {
+			if (this.autoClose) return
+			this.openState(newVal)
+		},
+		left() {
+			this.moveLeft = `translateX(${this.left}px)`
+		},
+		buttonShow(newVal) {
+			if (this.autoClose) return
+			this.openState(newVal)
+		},
+		leftOptions() {
+			this.init()
+		},
+		rightOptions() {
+			this.init()
+		}
+	},
+	mounted() {
+		this.swipeaction = this.getSwipeAction()
+		if (this.swipeaction.children !== undefined) {
+			this.swipeaction.children.push(this)
+		}
+		this.init()
+	},
+	methods: {
+		init() {
+			clearTimeout(this.timer)
+			this.timer = setTimeout(() => {
+				this.getSelectorQuery()
+			}, 100)
+			// 移动距离
+			this.left = 0
+			this.x = 0
+		},
+
+		closeSwipe(e) {
+			if (!this.autoClose) return
+			this.swipeaction.closeOther(this)
+		},
+		appTouchStart(e) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			this.clientX = clientX
+			this.timestamp = new Date().getTime()
+		},
+		appTouchEnd(e, index, item, position) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			// fixed by xxxx 模拟点击事件，解决 ios 13 点击区域错位的问题
+			let diff = Math.abs(this.clientX - clientX)
+			let time = (new Date().getTime()) - this.timestamp
+			if (diff < 40 && time < 300) {
+				this.$emit('click', {
+					content: item,
+					index,
+					position
+				})
+			}
+		},
+		touchstart(e) {
+			if (this.disabled) return
+			this.ani = false
+			this.x = this.left || 0
+			this.stopTouchStart(e)
+			this.autoClose && this.closeSwipe()
+		},
+		touchmove(e) {
+			if (this.disabled) return
+			// 是否可以滑动页面
+			this.stopTouchMove(e);
+			if (this.direction !== 'horizontal') {
+				return;
+			}
+			this.move(this.x + this.deltaX)
+			return false
+		},
+		touchend() {
+			if (this.disabled) return
+			this.moveDirection(this.left)
+		},
+		/**
+		 * 设置移动距离
+		 * @param {Object} value
+		 */
+		move(value) {
+			value = value || 0
+			const leftWidth = this.leftWidth
+			const rightWidth = this.rightWidth
+			// 获取可滑动范围
+			this.left = this.range(value, -rightWidth, leftWidth);
+		},
+
+		/**
+		 * 获取范围
+		 * @param {Object} num
+		 * @param {Object} min
+		 * @param {Object} max
+		 */
+		range(num, min, max) {
+			return Math.min(Math.max(num, min), max);
+		},
+		/**
+		 * 移动方向判断
+		 * @param {Object} left
+		 * @param {Object} value
+		 */
+		moveDirection(left) {
+			const threshold = this.threshold
+			const isopen = this.isopen || 'none'
+			const leftWidth = this.leftWidth
+			const rightWidth = this.rightWidth
+			if (this.deltaX === 0) {
+				this.openState('none')
+				return
+			}
+			if ((isopen === 'none' && rightWidth > 0 && -left > threshold) || (isopen !== 'none' && rightWidth >
+					0 && rightWidth +
+					left < threshold)) {
+				// right
+				this.openState('right')
+			} else if ((isopen === 'none' && leftWidth > 0 && left > threshold) || (isopen !== 'none' && leftWidth >
+					0 &&
+					leftWidth - left < threshold)) {
+				// left
+				this.openState('left')
+			} else {
+				// default
+				this.openState('none')
+			}
+		},
+
+		/**
+		 * 开启状态
+		 * @param {Boolean} type
+		 */
+		openState(type) {
+			const leftWidth = this.leftWidth
+			const rightWidth = this.rightWidth
+			let left = ''
+			this.isopen = this.isopen ? this.isopen : 'none'
+			switch (type) {
+				case "left":
+					left = leftWidth
+					break
+				case "right":
+					left = -rightWidth
+					break
+				default:
+					left = 0
+			}
+
+
+			if (this.isopen !== type) {
+				this.throttle = true
+				this.$emit('change', type)
+			}
+
+			this.isopen = type
+			// 添加动画类
+			this.ani = true
+			this.$nextTick(() => {
+				this.move(left)
+			})
+			// 设置最终移动位置,理论上只要进入到这个函数，肯定是要打开的
+		},
+		close() {
+			this.openState('none')
+		},
+		getDirection(x, y) {
+			if (x > y && x > MIN_DISTANCE) {
+				return 'horizontal';
+			}
+			if (y > x && y > MIN_DISTANCE) {
+				return 'vertical';
+			}
+			return '';
+		},
+
+		/**
+		 * 重置滑动状态
+		 * @param {Object} event
+		 */
+		resetTouchStatus() {
+			this.direction = '';
+			this.deltaX = 0;
+			this.deltaY = 0;
+			this.offsetX = 0;
+			this.offsetY = 0;
+		},
+
+		/**
+		 * 设置滑动开始位置
+		 * @param {Object} event
+		 */
+		stopTouchStart(event) {
+			this.resetTouchStatus();
+			const touch = event.touches[0];
+			this.startX = touch.clientX;
+			this.startY = touch.clientY;
+		},
+
+		/**
+		 * 滑动中，是否禁止打开
+		 * @param {Object} event
+		 */
+		stopTouchMove(event) {
+			const touch = event.touches[0];
+			this.deltaX = touch.clientX - this.startX;
+			this.deltaY = touch.clientY - this.startY;
+			this.offsetX = Math.abs(this.deltaX);
+			this.offsetY = Math.abs(this.deltaY);
+			this.direction = this.direction || this.getDirection(this.offsetX, this.offsetY);
+		},
+
+		getSelectorQuery() {
+			const views = uni.createSelectorQuery().in(this)
+			views
+				.selectAll('.' + this.elClass)
+				.boundingClientRect(data => {
+					if (data.length === 0) return
+					let show = 'none'
+					if (this.autoClose) {
+						show = 'none'
+					} else {
+						show = this.show
+					}
+					this.leftWidth = data[0].width || 0
+					this.rightWidth = data[1].width || 0
+					this.buttonShow = show
+				})
+				.exec()
+		}
+	}
+}
+
+// #endif
+
+export default otherMixins
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js
new file mode 100644
index 0000000..435e0fb
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js
@@ -0,0 +1,83 @@
+let mpMixins = {}
+let is_pc = null
+// #ifdef H5
+import {
+	isPC
+} from "./isPC"
+is_pc = isPC()
+// #endif
+// #ifdef APP-VUE|| MP-WEIXIN || H5
+
+mpMixins = {
+	data() {
+		return {
+			is_show: 'none'
+		}
+	},
+	watch: {
+		show(newVal) {
+			this.is_show = this.show
+		}
+	},
+	created() {
+		this.swipeaction = this.getSwipeAction()
+		if (this.swipeaction.children !== undefined) {
+			this.swipeaction.children.push(this)
+		}
+	},
+	mounted() {
+		this.is_show = this.show
+	},
+	methods: {
+		// wxs 中调用
+		closeSwipe(e) {
+			if (!this.autoClose) return
+			this.swipeaction.closeOther(this)
+		},
+
+		change(e) {
+			this.$emit('change', e.open)
+			if (this.is_show !== e.open) {
+				this.is_show = e.open
+			}
+		},
+
+		appTouchStart(e) {
+			if (is_pc) return
+			const {
+				clientX
+			} = e.changedTouches[0]
+			this.clientX = clientX
+			this.timestamp = new Date().getTime()
+		},
+		appTouchEnd(e, index, item, position) {
+			if (is_pc) return
+			const {
+				clientX
+			} = e.changedTouches[0]
+			// fixed by xxxx 模拟点击事件，解决 ios 13 点击区域错位的问题
+			let diff = Math.abs(this.clientX - clientX)
+			let time = (new Date().getTime()) - this.timestamp
+			if (diff < 40 && time < 300) {
+				this.$emit('click', {
+					content: item,
+					index,
+					position
+				})
+			}
+		},
+		onClickForPC(index, item, position) {
+			if (!is_pc) return
+			// #ifdef H5
+			this.$emit('click', {
+				content: item,
+				index,
+				position
+			})
+			// #endif
+		}
+	}
+}
+
+// #endif
+export default mpMixins
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/render.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/render.js
new file mode 100644
index 0000000..78f0ec6
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/render.js
@@ -0,0 +1,270 @@
+const MIN_DISTANCE = 10;
+export default {
+	showWatch(newVal, oldVal, ownerInstance, instance, self) {
+		var state = self.state
+		var $el = ownerInstance.$el || ownerInstance.$vm && ownerInstance.$vm.$el
+		if (!$el) return
+		this.getDom(instance, ownerInstance, self)
+		if (newVal && newVal !== 'none') {
+			this.openState(newVal, instance, ownerInstance, self)
+			return
+		}
+
+		if (state.left) {
+			this.openState('none', instance, ownerInstance, self)
+		}
+		this.resetTouchStatus(instance, self)
+	},
+
+	/**
+	 * 开始触摸操作
+	 * @param {Object} e
+	 * @param {Object} ins
+	 */
+	touchstart(e, ownerInstance, self) {
+		let instance = e.instance;
+		let disabled = instance.getDataset().disabled
+		let state = self.state;
+		this.getDom(instance, ownerInstance, self)
+		// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+		disabled = this.getDisabledType(disabled)
+		if (disabled) return
+		// 开始触摸时移除动画类
+		instance.requestAnimationFrame(function() {
+			instance.removeClass('ani');
+			ownerInstance.callMethod('closeSwipe');
+		})
+
+		// 记录上次的位置
+		state.x = state.left || 0
+		// 计算滑动开始位置
+		this.stopTouchStart(e, ownerInstance, self)
+	},
+
+	/**
+	 * 开始滑动操作
+	 * @param {Object} e
+	 * @param {Object} ownerInstance
+	 */
+	touchmove(e, ownerInstance, self) {
+		let instance = e.instance;
+		// 删除之后已经那不到实例了
+		if (!instance) return;
+		let disabled = instance.getDataset().disabled
+		let state = self.state
+		// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+		disabled = this.getDisabledType(disabled)
+		if (disabled) return
+		// 是否可以滑动页面
+		this.stopTouchMove(e, self);
+		if (state.direction !== 'horizontal') {
+			return;
+		}
+		if (e.preventDefault) {
+			// 阻止页面滚动
+			e.preventDefault()
+		}
+		let x = state.x + state.deltaX
+		this.move(x, instance, ownerInstance, self)
+	},
+
+	/**
+	 * 结束触摸操作
+	 * @param {Object} e
+	 * @param {Object} ownerInstance
+	 */
+	touchend(e, ownerInstance, self) {
+		let instance = e.instance;
+		let disabled = instance.getDataset().disabled
+		let state = self.state
+		// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+		disabled = this.getDisabledType(disabled)
+
+		if (disabled) return
+		// 滑动过程中触摸结束,通过阙值判断是开启还是关闭
+		// fixed by mehaotian 定时器解决点击按钮，touchend 触发比 click 事件时机早的问题 ，主要是 ios13
+		this.moveDirection(state.left, instance, ownerInstance, self)
+
+	},
+
+	/**
+	 * 设置移动距离
+	 * @param {Object} value
+	 * @param {Object} instance
+	 * @param {Object} ownerInstance
+	 */
+	move(value, instance, ownerInstance, self) {
+		value = value || 0
+		let state = self.state
+		let leftWidth = state.leftWidth
+		let rightWidth = state.rightWidth
+		// 获取可滑动范围
+		state.left = this.range(value, -rightWidth, leftWidth);
+		instance.requestAnimationFrame(function() {
+			instance.setStyle({
+				transform: 'translateX(' + state.left + 'px)',
+				'-webkit-transform': 'translateX(' + state.left + 'px)'
+			})
+		})
+
+	},
+
+	/**
+	 * 获取元素信息
+	 * @param {Object} instance
+	 * @param {Object} ownerInstance
+	 */
+	getDom(instance, ownerInstance, self) {
+		var state = self.state
+		var $el = ownerInstance.$el || ownerInstance.$vm && ownerInstance.$vm.$el
+		var leftDom = $el.querySelector('.button-group--left')
+		var rightDom = $el.querySelector('.button-group--right')
+
+		state.leftWidth = leftDom.offsetWidth || 0
+		state.rightWidth = rightDom.offsetWidth || 0
+		state.threshold = instance.getDataset().threshold
+	},
+
+	getDisabledType(value) {
+		return (typeof(value) === 'string' ? JSON.parse(value) : value) || false;
+	},
+
+	/**
+	 * 获取范围
+	 * @param {Object} num
+	 * @param {Object} min
+	 * @param {Object} max
+	 */
+	range(num, min, max) {
+		return Math.min(Math.max(num, min), max);
+	},
+
+
+	/**
+	 * 移动方向判断
+	 * @param {Object} left
+	 * @param {Object} value
+	 * @param {Object} ownerInstance
+	 * @param {Object} ins
+	 */
+	moveDirection(left, ins, ownerInstance, self) {
+		var state = self.state
+		var threshold = state.threshold
+		var position = state.position
+		var isopen = state.isopen || 'none'
+		var leftWidth = state.leftWidth
+		var rightWidth = state.rightWidth
+		if (state.deltaX === 0) {
+			this.openState('none', ins, ownerInstance, self)
+			return
+		}
+		if ((isopen === 'none' && rightWidth > 0 && -left > threshold) || (isopen !== 'none' && rightWidth > 0 &&
+				rightWidth +
+				left < threshold)) {
+			// right
+			this.openState('right', ins, ownerInstance, self)
+		} else if ((isopen === 'none' && leftWidth > 0 && left > threshold) || (isopen !== 'none' && leftWidth > 0 &&
+				leftWidth - left < threshold)) {
+			// left
+			this.openState('left', ins, ownerInstance, self)
+		} else {
+			// default
+			this.openState('none', ins, ownerInstance, self)
+		}
+	},
+
+
+	/**
+	 * 开启状态
+	 * @param {Boolean} type
+	 * @param {Object} ins
+	 * @param {Object} ownerInstance
+	 */
+	openState(type, ins, ownerInstance, self) {
+		let state = self.state
+		let leftWidth = state.leftWidth
+		let rightWidth = state.rightWidth
+		let left = ''
+		state.isopen = state.isopen ? state.isopen : 'none'
+		switch (type) {
+			case "left":
+				left = leftWidth
+				break
+			case "right":
+				left = -rightWidth
+				break
+			default:
+				left = 0
+		}
+
+		// && !state.throttle
+
+		if (state.isopen !== type) {
+			state.throttle = true
+			ownerInstance.callMethod('change', {
+				open: type
+			})
+
+		}
+
+		state.isopen = type
+		// 添加动画类
+		ins.requestAnimationFrame(() => {
+			ins.addClass('ani');
+			this.move(left, ins, ownerInstance, self)
+		})
+	},
+
+
+	getDirection(x, y) {
+		if (x > y && x > MIN_DISTANCE) {
+			return 'horizontal';
+		}
+		if (y > x && y > MIN_DISTANCE) {
+			return 'vertical';
+		}
+		return '';
+	},
+
+	/**
+	 * 重置滑动状态
+	 * @param {Object} event
+	 */
+	resetTouchStatus(instance, self) {
+		let state = self.state;
+		state.direction = '';
+		state.deltaX = 0;
+		state.deltaY = 0;
+		state.offsetX = 0;
+		state.offsetY = 0;
+	},
+
+	/**
+	 * 设置滑动开始位置
+	 * @param {Object} event
+	 */
+	stopTouchStart(event, ownerInstance, self) {
+		let instance = event.instance;
+		let state = self.state
+		this.resetTouchStatus(instance, self);
+		var touch = event.touches[0];
+		state.startX = touch.clientX;
+		state.startY = touch.clientY;
+	},
+
+	/**
+	 * 滑动中，是否禁止打开
+	 * @param {Object} event
+	 */
+	stopTouchMove(event, self) {
+		let instance = event.instance;
+		let state = self.state;
+		let touch = event.touches[0];
+
+		state.deltaX = touch.clientX - state.startX;
+		state.deltaY = touch.clientY - state.startY;
+		state.offsetY = Math.abs(state.deltaY);
+		state.offsetX = Math.abs(state.deltaX);
+		state.direction = state.direction || this.getDirection(state.offsetX, state.offsetY);
+	}
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue
new file mode 100644
index 0000000..d79c297
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue
@@ -0,0 +1,347 @@
+<template>
+	<!-- 在微信小程序 app vue端 h5 使用wxs 实现-->
+	<!-- #ifdef APP-VUE || MP-WEIXIN || H5 -->
+	<view class="uni-swipe">
+		<!--  #ifdef MP-WEIXIN || VUE3 -->
+		<view class="uni-swipe_box" :change:prop="wxsswipe.showWatch" :prop="is_show" :data-threshold="threshold"
+			:data-disabled="disabled" @touchstart="wxsswipe.touchstart" @touchmove="wxsswipe.touchmove"
+			@touchend="wxsswipe.touchend">
+			<!-- #endif -->
+			<!--  #ifndef MP-WEIXIN || VUE3 -->
+			<view class="uni-swipe_box" :change:prop="renderswipe.showWatch" :prop="is_show" :data-threshold="threshold"
+				:data-disabled="disabled+''" @touchstart="renderswipe.touchstart" @touchmove="renderswipe.touchmove"
+				@touchend="renderswipe.touchend">
+				<!-- #endif -->
+				<!-- 在微信小程序 app vue端 h5 使用wxs 实现-->
+				<view class="uni-swipe_button-group button-group--left">
+					<slot name="left">
+						<view v-for="(item,index) in leftOptions" :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+							@touchend="appTouchEnd($event,index,item,'left')"
+							@click.stop="onClickForPC(index,item,'left')">
+							<text class="uni-swipe_button-text"
+								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+						</view>
+					</slot>
+				</view>
+				<view class="uni-swipe_text--center">
+					<slot></slot>
+				</view>
+				<view class="uni-swipe_button-group button-group--right">
+					<slot name="right">
+						<view v-for="(item,index) in rightOptions" :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+							@touchend="appTouchEnd($event,index,item,'right')"
+							@click.stop="onClickForPC(index,item,'right')"><text class="uni-swipe_button-text"
+								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+						</view>
+					</slot>
+				</view>
+			</view>
+		</view>
+		<!-- #endif -->
+		<!-- app nvue端 使用 bindingx -->
+		<!-- #ifdef APP-NVUE -->
+		<view ref="selector-box--hock" class="uni-swipe" @horizontalpan="touchstart" @touchend="touchend">
+			<view ref='selector-left-button--hock' class="uni-swipe_button-group button-group--left">
+				<slot name="left">
+					<view v-for="(item,index) in leftOptions" :key="index" :style="{
+				  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+				}" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'left')"><text
+							class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF', fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+					</view>
+				</slot>
+			</view>
+			<view ref='selector-right-button--hock' class="uni-swipe_button-group button-group--right">
+				<slot name="right">
+					<view v-for="(item,index) in rightOptions" :key="index" :style="{
+				  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+				}" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'right')"><text
+							class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+					</view>
+				</slot>
+			</view>
+			<view ref='selector-content--hock' class="uni-swipe_box">
+				<slot></slot>
+			</view>
+		</view>
+		<!-- #endif -->
+		<!-- 其他平台使用 js ，长列表性能可能会有影响-->
+		<!-- #ifdef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || MP-QQ -->
+		<view class="uni-swipe">
+			<view class="uni-swipe_box" @touchstart="touchstart" @touchmove="touchmove" @touchend="touchend"
+				:style="{transform:moveLeft}" :class="{ani:ani}">
+				<view class="uni-swipe_button-group button-group--left" :class="[elClass]">
+					<slot name="left">
+						<view v-for="(item,index) in leftOptions" :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
+					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+							@touchend="appTouchEnd($event,index,item,'left')"><text class="uni-swipe_button-text"
+								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+						</view>
+					</slot>
+				</view>
+				<slot></slot>
+				<view class="uni-swipe_button-group button-group--right" :class="[elClass]">
+					<slot name="right">
+						<view v-for="(item,index) in rightOptions" :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
+					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
+					}" @touchstart="appTouchStart" @touchend="appTouchEnd($event,index,item,'right')"
+							class="uni-swipe_button button-hock"><text class="uni-swipe_button-text"
+								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+						</view>
+					</slot>
+				</view>
+			</view>
+		</view>
+		<!-- #endif -->
+
+</template>
+<script src="./wx.wxs" module="wxsswipe" lang="wxs"></script>
+
+<script module="renderswipe" lang="renderjs">
+	import render from './render.js'
+	export default {
+		mounted(e, ins, owner) {
+			this.state = {}
+		},
+		methods: {
+			showWatch(newVal, oldVal, ownerInstance, instance) {
+				render.showWatch(newVal, oldVal, ownerInstance, instance, this)
+			},
+			touchstart(e, ownerInstance) {
+				render.touchstart(e, ownerInstance, this)
+			},
+			touchmove(e, ownerInstance) {
+				render.touchmove(e, ownerInstance, this)
+			},
+			touchend(e, ownerInstance) {
+				render.touchend(e, ownerInstance, this)
+			}
+		}
+	}
+</script>
+<script>
+	import mpwxs from './mpwxs'
+	import bindingx from './bindingx.js'
+	import mpother from './mpother'
+
+	/**
+	 * SwipeActionItem 滑动操作子组件
+	 * @description 通过滑动触发选项的容器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=181
+	 * @property {Boolean} show = [left|right｜none] 	开启关闭组件，auto-close = false 时生效
+	 * @property {Boolean} disabled = [true|false] 		是否禁止滑动
+	 * @property {Boolean} autoClose = [true|false] 	滑动打开当前组件，是否关闭其他组件
+	 * @property {Number}  threshold 					滑动缺省值
+	 * @property {Array} leftOptions 					左侧选项内容及样式
+	 * @property {Array} rgihtOptions 					右侧选项内容及样式
+	 * @event {Function} click 							点击选项按钮时触发事件，e = {content,index} ，content（点击内容）、index（下标)
+	 * @event {Function} change 						组件打开或关闭时触发，left\right\none
+	 */
+
+	export default {
+		mixins: [mpwxs, bindingx, mpother],
+		emits: ['click', 'change'],
+		props: {
+			// 控制开关
+			show: {
+				type: String,
+				default: 'none'
+			},
+
+			// 禁用
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+
+			// 是否自动关闭
+			autoClose: {
+				type: Boolean,
+				default: true
+			},
+
+			// 滑动缺省距离
+			threshold: {
+				type: Number,
+				default: 20
+			},
+
+			// 左侧按钮内容
+			leftOptions: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+
+			// 右侧按钮内容
+			rightOptions: {
+				type: Array,
+				default () {
+					return []
+				}
+			}
+
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			if (this.__isUnmounted) return
+			this.uninstall()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.__isUnmounted = true
+			this.uninstall()
+		},
+		// #endif
+
+		methods: {
+			uninstall() {
+				if (this.swipeaction) {
+					this.swipeaction.children.forEach((item, index) => {
+						if (item === this) {
+							this.swipeaction.children.splice(index, 1)
+						}
+					})
+				}
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getSwipeAction(name = 'uniSwipeAction') {
+				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;
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-swipe {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		/* #endif */
+	}
+
+	.uni-swipe_box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-shrink: 0;
+		// touch-action: none;
+		/* #endif */
+		position: relative;
+	}
+
+	.uni-swipe_content {
+		// border: 1px red solid;
+	}
+
+	.uni-swipe_text--center {
+		width: 100%;
+		/* #ifndef APP-NVUE */
+		cursor: grab;
+		/* #endif */
+	}
+
+	.uni-swipe_button-group {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.button-group--left {
+		left: 0;
+		transform: translateX(-100%)
+	}
+
+	.button-group--right {
+		right: 0;
+		transform: translateX(100%)
+	}
+
+	.uni-swipe_button {
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 0 20px;
+	}
+
+	.uni-swipe_button-text {
+		/* #ifndef APP-NVUE */
+		flex-shrink: 0;
+		/* #endif */
+		font-size: 14px;
+	}
+
+	.ani {
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transition-timing-function: cubic-bezier(0.165, 0.84, 0.44, 1);
+	}
+
+	/* #ifdef MP-ALIPAY */
+	.movable-area {
+		/* width: 100%; */
+		height: 45px;
+	}
+
+	.movable-view {
+		display: flex;
+		/* justify-content: center; */
+		position: relative;
+		flex: 1;
+		height: 45px;
+		z-index: 2;
+	}
+
+	.movable-view-button {
+		display: flex;
+		flex-shrink: 0;
+		flex-direction: row;
+		height: 100%;
+		background: #C0C0C0;
+	}
+
+	/* .transition {
+		transition: all 0.3s;
+	} */
+
+	.movable-view-box {
+		flex-shrink: 0;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/wx.wxs b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/wx.wxs
new file mode 100644
index 0000000..b394244
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/wx.wxs
@@ -0,0 +1,341 @@
+var MIN_DISTANCE = 10;
+
+/**
+ * 判断当前是否为H5、app-vue
+ */
+var IS_HTML5 = false
+if (typeof window === 'object') IS_HTML5 = true
+
+/**
+ * 监听页面内值的变化,主要用于动态开关swipe-action
+ * @param {Object} newValue
+ * @param {Object} oldValue
+ * @param {Object} ownerInstance
+ * @param {Object} instance
+ */
+function showWatch(newVal, oldVal, ownerInstance, instance) {
+	var state = instance.getState()
+	getDom(instance, ownerInstance)
+	if (newVal && newVal !== 'none') {
+		openState(newVal, instance, ownerInstance)
+		return
+	}
+
+	if (state.left) {
+		openState('none', instance, ownerInstance)
+	}
+	resetTouchStatus(instance)
+}
+
+/**
+ * 开始触摸操作
+ * @param {Object} e
+ * @param {Object} ins
+ */
+function touchstart(e, ownerInstance) {
+	var instance = e.instance;
+	var disabled = instance.getDataset().disabled
+	var state = instance.getState();
+	getDom(instance, ownerInstance)
+	// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+	disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false;
+	if (disabled) return
+	// 开始触摸时移除动画类
+	instance.requestAnimationFrame(function() {
+		instance.removeClass('ani');
+		ownerInstance.callMethod('closeSwipe');
+	})
+
+	// 记录上次的位置
+	state.x = state.left || 0
+	// 计算滑动开始位置
+	stopTouchStart(e, ownerInstance)
+}
+
+/**
+ * 开始滑动操作
+ * @param {Object} e
+ * @param {Object} ownerInstance
+ */
+function touchmove(e, ownerInstance) {
+	var instance = e.instance;
+	var disabled = instance.getDataset().disabled
+	var state = instance.getState()
+	// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+	disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false;
+	if (disabled) return
+	// 是否可以滑动页面
+	stopTouchMove(e);
+	if (state.direction !== 'horizontal') {
+		return;
+	}
+
+	if (e.preventDefault) {
+		// 阻止页面滚动
+		e.preventDefault()
+	}
+
+	move(state.x + state.deltaX, instance, ownerInstance)
+}
+
+/**
+ * 结束触摸操作
+ * @param {Object} e
+ * @param {Object} ownerInstance
+ */
+function touchend(e, ownerInstance) {
+	var instance = e.instance;
+	var disabled = instance.getDataset().disabled
+	var state = instance.getState()
+	// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+	disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false;
+
+	if (disabled) return
+	// 滑动过程中触摸结束,通过阙值判断是开启还是关闭
+	// fixed by mehaotian 定时器解决点击按钮，touchend 触发比 click 事件时机早的问题 ，主要是 ios13
+	moveDirection(state.left, instance, ownerInstance)
+
+}
+
+/**
+ * 设置移动距离
+ * @param {Object} value
+ * @param {Object} instance
+ * @param {Object} ownerInstance
+ */
+function move(value, instance, ownerInstance) {
+	value = value || 0
+	var state = instance.getState()
+	var leftWidth = state.leftWidth
+	var rightWidth = state.rightWidth
+	// 获取可滑动范围
+	state.left = range(value, -rightWidth, leftWidth);
+	instance.requestAnimationFrame(function() {
+		instance.setStyle({
+			transform: 'translateX(' + state.left + 'px)',
+			'-webkit-transform': 'translateX(' + state.left + 'px)'
+		})
+	})
+
+}
+
+/**
+ * 获取元素信息
+ * @param {Object} instance
+ * @param {Object} ownerInstance
+ */
+function getDom(instance, ownerInstance) {
+	var state = instance.getState()
+	var leftDom = ownerInstance.selectComponent('.button-group--left')
+	var rightDom = ownerInstance.selectComponent('.button-group--right')
+	var leftStyles = {
+		width: 0
+	}
+	var rightStyles = {
+		width: 0
+	}
+	leftStyles = leftDom.getBoundingClientRect()
+	rightStyles = rightDom.getBoundingClientRect()
+
+	state.leftWidth = leftStyles.width || 0
+	state.rightWidth = rightStyles.width || 0
+	state.threshold = instance.getDataset().threshold
+}
+
+/**
+ * 获取范围
+ * @param {Object} num
+ * @param {Object} min
+ * @param {Object} max
+ */
+function range(num, min, max) {
+	return Math.min(Math.max(num, min), max);
+}
+
+
+/**
+ * 移动方向判断
+ * @param {Object} left
+ * @param {Object} value
+ * @param {Object} ownerInstance
+ * @param {Object} ins
+ */
+function moveDirection(left, ins, ownerInstance) {
+	var state = ins.getState()
+	var threshold = state.threshold
+	var position = state.position
+	var isopen = state.isopen || 'none'
+	var leftWidth = state.leftWidth
+	var rightWidth = state.rightWidth
+	if (state.deltaX === 0) {
+		openState('none', ins, ownerInstance)
+		return
+	}
+	if ((isopen === 'none' && rightWidth > 0 && -left > threshold) || (isopen !== 'none' && rightWidth > 0 &&
+			rightWidth +
+			left < threshold)) {
+		// right
+		openState('right', ins, ownerInstance)
+	} else if ((isopen === 'none' && leftWidth > 0 && left > threshold) || (isopen !== 'none' && leftWidth > 0 &&
+			leftWidth - left < threshold)) {
+		// left
+		openState('left', ins, ownerInstance)
+	} else {
+		// default
+		openState('none', ins, ownerInstance)
+	}
+}
+
+
+/**
+ * 开启状态
+ * @param {Boolean} type
+ * @param {Object} ins
+ * @param {Object} ownerInstance
+ */
+function openState(type, ins, ownerInstance) {
+	var state = ins.getState()
+	var leftWidth = state.leftWidth
+	var rightWidth = state.rightWidth
+	var left = ''
+	state.isopen = state.isopen ? state.isopen : 'none'
+	switch (type) {
+		case "left":
+			left = leftWidth
+			break
+		case "right":
+			left = -rightWidth
+			break
+		default:
+			left = 0
+	}
+
+	// && !state.throttle
+
+	if (state.isopen !== type) {
+		state.throttle = true
+		ownerInstance.callMethod('change', {
+			open: type
+		})
+
+	}
+
+	state.isopen = type
+	// 添加动画类
+	ins.requestAnimationFrame(function() {
+		ins.addClass('ani');
+		move(left, ins, ownerInstance)
+	})
+	// 设置最终移动位置,理论上只要进入到这个函数，肯定是要打开的
+}
+
+
+function getDirection(x, y) {
+	if (x > y && x > MIN_DISTANCE) {
+		return 'horizontal';
+	}
+	if (y > x && y > MIN_DISTANCE) {
+		return 'vertical';
+	}
+	return '';
+}
+
+/**
+ * 重置滑动状态
+ * @param {Object} event
+ */
+function resetTouchStatus(instance) {
+	var state = instance.getState();
+	state.direction = '';
+	state.deltaX = 0;
+	state.deltaY = 0;
+	state.offsetX = 0;
+	state.offsetY = 0;
+}
+
+/**
+ * 设置滑动开始位置
+ * @param {Object} event
+ */
+function stopTouchStart(event) {
+	var instance = event.instance;
+	var state = instance.getState();
+	resetTouchStatus(instance);
+	var touch = event.touches[0];
+	if (IS_HTML5 && isPC()) {
+		touch = event;
+	}
+	state.startX = touch.clientX;
+	state.startY = touch.clientY;
+}
+
+/**
+ * 滑动中，是否禁止打开
+ * @param {Object} event
+ */
+function stopTouchMove(event) {
+	var instance = event.instance;
+	var state = instance.getState();
+	var touch = event.touches[0];
+	if (IS_HTML5 && isPC()) {
+		touch = event;
+	}
+	state.deltaX = touch.clientX - state.startX;
+	state.deltaY = touch.clientY - state.startY;
+	state.offsetY = Math.abs(state.deltaY);
+	state.offsetX = Math.abs(state.deltaX);
+	state.direction = state.direction || getDirection(state.offsetX, state.offsetY);
+}
+
+function isPC() {
+	var userAgentInfo = navigator.userAgent;
+	var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+	var flag = true;
+	for (var v = 0; v < Agents.length - 1; v++) {
+		if (userAgentInfo.indexOf(Agents[v]) > 0) {
+			flag = false;
+			break;
+		}
+	}
+	return flag;
+}
+
+var movable = false
+
+function mousedown(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	touchstart(e, ins)
+	movable = true
+}
+
+function mousemove(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	if (!movable) return
+	touchmove(e, ins)
+}
+
+function mouseup(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	touchend(e, ins)
+	movable = false
+}
+
+function mouseleave(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	movable = false
+}
+
+module.exports = {
+	showWatch: showWatch,
+	touchstart: touchstart,
+	touchmove: touchmove,
+	touchend: touchend,
+	mousedown: mousedown,
+	mousemove: mousemove,
+	mouseup: mouseup,
+	mouseleave: mouseleave
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue b/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue
new file mode 100644
index 0000000..4971782
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue
@@ -0,0 +1,60 @@
+<template>
+	<view>
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	/**
+	 * SwipeAction 滑动操作
+	 * @description 通过滑动触发选项的容器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=181
+	 */
+	export default {
+		name:"uniSwipeAction",
+		data() {
+			return {};
+		},
+		created() {
+			this.children = [];
+		},
+		methods: {
+			// 公开给用户使用，重制组件样式
+			resize(){
+				// wxs 会自己计算组件大小，所以无需执行下面代码
+				// #ifndef APP-VUE || H5 || MP-WEIXIN
+				this.children.forEach(vm=>{
+					vm.init()
+				})
+				// #endif
+			},
+			// 公开给用户使用，关闭全部 已经打开的组件
+			closeAll(){
+				this.children.forEach(vm=>{
+					// #ifdef APP-VUE || H5 || MP-WEIXIN
+					vm.is_show = 'none'
+					// #endif
+
+					// #ifndef APP-VUE || H5 || MP-WEIXIN
+					vm.close()
+					// #endif
+				})
+			},
+			closeOther(vm) {
+				if (this.openItem && this.openItem !== vm) {
+					// #ifdef APP-VUE || H5 || MP-WEIXIN
+					this.openItem.is_show = 'none'
+					// #endif
+
+					// #ifndef APP-VUE || H5 || MP-WEIXIN
+					this.openItem.close()
+					// #endif
+				}
+				// 记录上一个打开的 swipe-action-item ,用于 auto-close
+				this.openItem = vm
+			}
+		}
+	};
+</script>
+
+<style></style>
diff --git a/uni_modules/uni-swipe-action/package.json b/uni_modules/uni-swipe-action/package.json
new file mode 100644
index 0000000..c8998d9
--- /dev/null
+++ b/uni_modules/uni-swipe-action/package.json
@@ -0,0 +1,87 @@
+{
+	"id": "uni-swipe-action",
+	"displayName": "uni-swipe-action 滑动操作",
+	"version": "1.3.7",
+	"description": "SwipeAction 滑动操作操作组件",
+	"keywords": [
+        "",
+        "uni-ui",
+        "uniui",
+        "滑动删除",
+        "侧滑删除"
+    ],
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"directories": {
+		"example": "../../temps/example_temps"
+	},
+	"dcloudext": {
+		"category": [
+			"前端组件",
+			"通用组件"
+		],
+		"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": ["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"
+				},
+				"快应用": {
+					"华为": "y",
+					"联盟": "u"
+				},
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				}
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-swipe-action/readme.md b/uni_modules/uni-swipe-action/readme.md
new file mode 100644
index 0000000..93a5cac
--- /dev/null
+++ b/uni_modules/uni-swipe-action/readme.md
@@ -0,0 +1,11 @@
+
+
+## SwipeAction 滑动操作
+> **组件名：uni-swipe-action**
+> 代码块： `uSwipeAction`、`uSwipeActionItem`
+
+
+通过滑动触发选项的容器
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-swipe-action)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-swiper-dot/changelog.md b/uni_modules/uni-swiper-dot/changelog.md
new file mode 100644
index 0000000..85cf54d
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/changelog.md
@@ -0,0 +1,12 @@
+## 1.2.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-swiper-dot](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.6（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的Bug
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 clickItem 事件，支持指示点控制轮播
+- 新增 支持 pc 可用
diff --git a/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue b/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue
new file mode 100644
index 0000000..e66b6c7
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue
@@ -0,0 +1,218 @@
+<template>
+	<view class="uni-swiper__warp">
+		<slot />
+		<view v-if="mode === 'default'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='default'>
+			<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
+        'width': (index === current? dots.width*2:dots.width ) + 'px','height':dots.width/2 +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border-radius':'0px'}"
+			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-bar" />
+		</view>
+		<view v-if="mode === 'dot'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='dot'>
+			<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
+        'width': dots.width + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
+			 :key="index" class="uni-swiper__dots-item" />
+		</view>
+		<view v-if="mode === 'round'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='round'>
+			<view v-for="(item,index) in info" @click="clickItem(index)" :class="[index === current&&'uni-swiper__dots-long']" :style="{
+		    'width':(index === current? dots.width*3:dots.width ) + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
+			 :key="index" class="uni-swiper__dots-item " />
+		</view>
+		<view v-if="mode === 'nav'" key='nav' :style="{'background-color':dotsStyles.backgroundColor,'bottom':'0'}" class="uni-swiper__dots-box uni-swiper__dots-nav">
+			<text :style="{'color':dotsStyles.color}" class="uni-swiper__dots-nav-item">{{ (current+1)+"/"+info.length +' ' +info[current][field] }}</text>
+		</view>
+		<view v-if="mode === 'indexes'" key='indexes' :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box">
+			<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
+        'width':dots.width + 'px','height':dots.height +'px' ,'color':index === current?dots.selectedColor:dots.color,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
+			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-indexes"><text class="uni-swiper__dots-indexes-text">{{ index+1 }}</text></view>
+		</view>
+	</view>
+</template>
+
+<script>
+
+	/**
+	 * SwiperDod 轮播图指示点
+	 * @description 自定义轮播图指示点
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=284
+	 * @property {Number} current 当前指示点索引，必须是通过 `swiper` 的 `change` 事件获取到的 `e.detail.current`
+	 * @property {String} mode = [default|round|nav|indexes] 指示点的类型
+	 * 	@value defualt 默认指示点
+	 * 	@value round 圆形指示点
+	 * 	@value nav 条形指示点
+	 * 	@value indexes 索引指示点
+	 * @property {String} field mode 为 nav 时，显示的内容字段（mode = nav 时必填）
+	 * @property {String} info 轮播图的数据，通过数组长度决定指示点个数
+	 * @property {Object} dotsStyles 指示点样式
+	 * @event {Function} clickItem 组件触发点击事件时触发，e={currentIndex}
+	 */
+
+	export default {
+		name: 'UniSwiperDot',
+		emits:['clickItem'],
+		props: {
+			info: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			current: {
+				type: Number,
+				default: 0
+			},
+			dotsStyles: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 类型 ：default(默认) indexes long nav
+			mode: {
+				type: String,
+				default: 'default'
+			},
+			// 只在 nav 模式下生效，变量名称
+			field: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				dots: {
+					width: 6,
+					height: 6,
+					bottom: 10,
+					color: '#fff',
+					backgroundColor: 'rgba(0, 0, 0, .3)',
+					border: '1px rgba(0, 0, 0, .3) solid',
+					selectedBackgroundColor: '#333',
+					selectedBorder: '1px rgba(0, 0, 0, .9) solid'
+				}
+			}
+		},
+		watch: {
+			dotsStyles(newVal) {
+				this.dots = Object.assign(this.dots, this.dotsStyles)
+			},
+			mode(newVal) {
+				if (newVal === 'indexes') {
+					this.dots.width = 14
+					this.dots.height = 14
+				} else {
+					this.dots.width = 6
+					this.dots.height = 6
+				}
+			}
+
+		},
+		created() {
+			if (this.mode === 'indexes') {
+				this.dots.width = 12
+				this.dots.height = 12
+			}
+			this.dots = Object.assign(this.dots, this.dotsStyles)
+		},
+		methods: {
+			clickItem(index) {
+				this.$emit('clickItem', index)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-swiper__warp {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: column;
+		position: relative;
+		overflow: hidden;
+	}
+
+	.uni-swiper__dots-box {
+		position: absolute;
+		bottom: 10px;
+		left: 0;
+		right: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-swiper__dots-item {
+		width: 8px;
+		border-radius: 100px;
+		margin-left: 6px;
+		background-color: rgba(0, 0, 0, 0.4);
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+		/* #ifdef H5 */
+		// border-width: 5px 0;
+		// border-style: solid;
+		// border-color: transparent;
+		// background-clip: padding-box;
+		/* #endif */
+		// transition: width 0.2s linear;  不要取消注释，不然会不能变色
+	}
+
+	.uni-swiper__dots-item:first-child {
+		margin: 0;
+	}
+
+	.uni-swiper__dots-default {
+		border-radius: 100px;
+	}
+
+	.uni-swiper__dots-long {
+		border-radius: 50px;
+	}
+
+	.uni-swiper__dots-bar {
+		border-radius: 50px;
+	}
+
+	.uni-swiper__dots-nav {
+		bottom: 0px;
+		// height: 26px;
+		padding: 8px 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		justify-content: flex-start;
+		align-items: center;
+		background-color: rgba(0, 0, 0, 0.2);
+	}
+
+	.uni-swiper__dots-nav-item {
+		/* overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap; */
+		font-size: 14px;
+		color: #fff;
+		margin: 0 15px;
+	}
+
+	.uni-swiper__dots-indexes {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		// flex: 1;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-swiper__dots-indexes-text {
+		color: #fff;
+		font-size: 12px;
+		line-height: 14px;
+	}
+</style>
diff --git a/uni_modules/uni-swiper-dot/package.json b/uni_modules/uni-swiper-dot/package.json
new file mode 100644
index 0000000..f2dd8d2
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-swiper-dot",
+  "displayName": "uni-swiper-dot 轮播图指示点",
+  "version": "1.2.0",
+  "description": "自定义轮播图指示点组件",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "轮播图指示点",
+    "dot",
+    "swiper"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["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-swiper-dot/readme.md b/uni_modules/uni-swiper-dot/readme.md
new file mode 100644
index 0000000..7d397e2
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/readme.md
@@ -0,0 +1,11 @@
+
+
+## SwiperDot 轮播图指示点
+> **组件名：uni-swiper-dot**
+> 代码块： `uSwiperDot`
+
+
+自定义轮播图指示点
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-table/changelog.md b/uni_modules/uni-table/changelog.md
new file mode 100644
index 0000000..8233b20
--- /dev/null
+++ b/uni_modules/uni-table/changelog.md
@@ -0,0 +1,23 @@
+## 1.2.1（2022-06-06）
+- 修复 微信小程序存在无使用组件的问题
+## 1.2.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-table](https://uniapp.dcloud.io/component/uniui/uni-table)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-07-08）
+- 新增 uni-th 支持 date 日期筛选范围
+## 1.0.6（2021-07-05）
+- 新增 uni-th 支持 range 筛选范围
+## 1.0.5（2021-06-28）
+- 新增 uni-th 筛选功能
+## 1.0.4（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的Bug
+## 1.0.3（2021-04-16）
+- 新增 sortable 属性，是否开启单列排序
+- 优化 表格多选逻辑
+## 1.0.2（2021-03-22）
+- uni-tr 添加 disabled 属性，用于 type=selection 时，设置某行是否可由全选按钮控制
+## 1.0.1（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-table/components/uni-table/uni-table.vue b/uni_modules/uni-table/components/uni-table/uni-table.vue
new file mode 100644
index 0000000..91b74fa
--- /dev/null
+++ b/uni_modules/uni-table/components/uni-table/uni-table.vue
@@ -0,0 +1,455 @@
+<template>
+	<view class="uni-table-scroll" :class="{ 'table--border': border, 'border-none': !noData }">
+		<!-- #ifdef H5 -->
+		<table class="uni-table" border="0" cellpadding="0" cellspacing="0" :class="{ 'table--stripe': stripe }" :style="{ 'min-width': minWidth + 'px' }">
+			<slot></slot>
+			<view v-if="noData" class="uni-table-loading">
+				<view class="uni-table-text" :class="{ 'empty-border': border }">{{ emptyText }}</view>
+			</view>
+			<view v-if="loading" class="uni-table-mask" :class="{ 'empty-border': border }"><div class="uni-table--loader"></div></view>
+		</table>
+		<!-- #endif -->
+		<!-- #ifndef H5 -->
+		<view class="uni-table" :style="{ 'min-width': minWidth + 'px' }" :class="{ 'table--stripe': stripe }">
+			<slot></slot>
+			<view v-if="noData" class="uni-table-loading">
+				<view class="uni-table-text" :class="{ 'empty-border': border }">{{ emptyText }}</view>
+			</view>
+			<view v-if="loading" class="uni-table-mask" :class="{ 'empty-border': border }"><div class="uni-table--loader"></div></view>
+		</view>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+/**
+ * Table 表格
+ * @description 用于展示多条结构类似的数据
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=3270
+ * @property {Boolean} 	border 				是否带有纵向边框
+ * @property {Boolean} 	stripe 				是否显示斑马线
+ * @property {Boolean} 	type 					是否开启多选
+ * @property {String} 	emptyText 			空数据时显示的文本内容
+ * @property {Boolean} 	loading 			显示加载中
+ * @event {Function} 	selection-change 	开启多选时，当选择项发生变化时会触发该事件
+ */
+export default {
+	name: 'uniTable',
+	options: {
+		virtualHost: true
+	},
+	emits:['selection-change'],
+	props: {
+		data: {
+			type: Array,
+			default() {
+				return []
+			}
+		},
+		// 是否有竖线
+		border: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示斑马线
+		stripe: {
+			type: Boolean,
+			default: false
+		},
+		// 多选
+		type: {
+			type: String,
+			default: ''
+		},
+		// 没有更多数据
+		emptyText: {
+			type: String,
+			default: '没有更多数据'
+		},
+		loading: {
+			type: Boolean,
+			default: false
+		},
+		rowKey: {
+			type: String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			noData: true,
+			minWidth: 0,
+			multiTableHeads: []
+		}
+	},
+	watch: {
+		loading(val) {},
+		data(newVal) {
+			let theadChildren = this.theadChildren
+			let rowspan = 1
+			if (this.theadChildren) {
+				rowspan = this.theadChildren.rowspan
+			}
+			
+			// this.trChildren.length - rowspan
+			this.noData = false
+			// this.noData = newVal.length === 0 
+		}
+	},
+	created() {
+		// 定义tr的实例数组
+		this.trChildren = []
+		this.thChildren = []
+		this.theadChildren = null
+		this.backData = []
+		this.backIndexData = []
+	},
+
+	methods: {
+		isNodata() {
+			let theadChildren = this.theadChildren
+			let rowspan = 1
+			if (this.theadChildren) {
+				rowspan = this.theadChildren.rowspan
+			}
+			this.noData = this.trChildren.length - rowspan <= 0
+		},
+		/**
+		 * 选中所有
+		 */
+		selectionAll() {
+			let startIndex = 1
+			let theadChildren = this.theadChildren
+			if (!this.theadChildren) {
+				theadChildren = this.trChildren[0]
+			} else {
+				startIndex = theadChildren.rowspan - 1
+			}
+			let isHaveData = this.data && this.data.length.length > 0
+			theadChildren.checked = true
+			theadChildren.indeterminate = false
+			this.trChildren.forEach((item, index) => {
+				if (!item.disabled) {
+					item.checked = true
+					if (isHaveData && item.keyValue) {
+						const row = this.data.find(v => v[this.rowKey] === item.keyValue)
+						if (!this.backData.find(v => v[this.rowKey] === row[this.rowKey])) {
+							this.backData.push(row)
+						}
+					}
+					if (index > (startIndex - 1) && this.backIndexData.indexOf(index - startIndex) === -1) {
+						this.backIndexData.push(index - startIndex)
+					}
+				}
+			})
+			// this.backData = JSON.parse(JSON.stringify(this.data))
+			this.$emit('selection-change', {
+				detail: {
+					value: this.backData,
+					index: this.backIndexData
+				}
+			})
+		},
+		/**
+		 * 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+		 */
+		toggleRowSelection(row, selected) {
+			// if (!this.theadChildren) return
+			row = [].concat(row)
+
+			this.trChildren.forEach((item, index) => {
+				// if (item.keyValue) {
+
+				const select = row.findIndex(v => {
+					//
+					if (typeof v === 'number') {
+						return v === index - 1
+					} else {
+						return v[this.rowKey] === item.keyValue
+					}
+				})
+				let ischeck = item.checked
+				if (select !== -1) {
+					if (typeof selected === 'boolean') {
+						item.checked = selected
+					} else {
+						item.checked = !item.checked
+					}
+					if (ischeck !== item.checked) {
+						this.check(item.rowData||item, item.checked, item.rowData?item.keyValue:null, true)
+					}
+				}
+				// }
+			})
+			this.$emit('selection-change', {
+				detail: {
+					value: this.backData,
+					index:this.backIndexData
+				}
+			})
+		},
+
+		/**
+		 * 用于多选表格，清空用户的选择
+		 */
+		clearSelection() {
+			let theadChildren = this.theadChildren
+			if (!this.theadChildren) {
+				theadChildren = this.trChildren[0]
+			}
+			// if (!this.theadChildren) return
+			theadChildren.checked = false
+			theadChildren.indeterminate = false
+			this.trChildren.forEach(item => {
+				// if (item.keyValue) {
+					item.checked = false
+				// }
+			})
+			this.backData = []
+			this.backIndexData = []
+			this.$emit('selection-change', {
+				detail: {
+					value: [],
+					index: []
+				}
+			})
+		},
+		/**
+		 * 用于多选表格，切换所有行的选中状态
+		 */
+		toggleAllSelection() {
+			let list = []
+			let startIndex = 1
+			let theadChildren = this.theadChildren
+			if (!this.theadChildren) {
+				theadChildren = this.trChildren[0]
+			} else {
+				startIndex = theadChildren.rowspan - 1
+			}
+			this.trChildren.forEach((item, index) => {
+				if (!item.disabled) {
+					if (index > (startIndex - 1) ) {
+						list.push(index-startIndex)
+					}
+				}
+			})
+			this.toggleRowSelection(list)
+		},
+
+		/**
+		 * 选中\取消选中
+		 * @param {Object} child
+		 * @param {Object} check
+		 * @param {Object} rowValue
+		 */
+		check(child, check, keyValue, emit) {
+			let theadChildren = this.theadChildren
+			if (!this.theadChildren) {
+				theadChildren = this.trChildren[0]
+			}
+			
+			
+			
+			let childDomIndex = this.trChildren.findIndex((item, index) => child === item)
+			if(childDomIndex < 0){
+				childDomIndex = this.data.findIndex(v=>v[this.rowKey] === keyValue) + 1
+			}
+			const dataLen = this.trChildren.filter(v => !v.disabled && v.keyValue).length
+			if (childDomIndex === 0) {
+				check ? this.selectionAll() : this.clearSelection()
+				return
+			}
+
+			if (check) {
+				if (keyValue) {
+					this.backData.push(child)
+				}
+				this.backIndexData.push(childDomIndex - 1)
+			} else {
+				const index = this.backData.findIndex(v => v[this.rowKey] === keyValue)
+				const idx = this.backIndexData.findIndex(item => item === childDomIndex - 1)
+				if (keyValue) {
+					this.backData.splice(index, 1)
+				}
+				this.backIndexData.splice(idx, 1)
+			}
+
+			const domCheckAll = this.trChildren.find((item, index) => index > 0 && !item.checked && !item.disabled)
+			if (!domCheckAll) {
+				theadChildren.indeterminate = false
+				theadChildren.checked = true
+			} else {
+				theadChildren.indeterminate = true
+				theadChildren.checked = false
+			}
+
+			if (this.backIndexData.length === 0) {
+				theadChildren.indeterminate = false
+			}
+
+			if (!emit) {
+				this.$emit('selection-change', {
+					detail: {
+						value: this.backData,
+						index: this.backIndexData
+					}
+				})
+			}
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+$border-color: #ebeef5;
+
+.uni-table-scroll {
+	width: 100%;
+	/* #ifndef APP-NVUE */
+	overflow-x: auto;
+	/* #endif */
+}
+
+.uni-table {
+	position: relative;
+	width: 100%;
+	border-radius: 5px;
+	// box-shadow: 0px 0px 3px 1px rgba(0, 0, 0, 0.1);
+	background-color: #fff;
+	/* #ifndef APP-NVUE */
+	box-sizing: border-box;
+	display: table;
+	overflow-x: auto;
+	::v-deep .uni-table-tr:nth-child(n + 2) {
+		&:hover {
+			background-color: #f5f7fa;
+		}
+	}
+	::v-deep .uni-table-thead {
+		.uni-table-tr {
+			// background-color: #f5f7fa;
+			&:hover {
+				background-color:#fafafa;
+			}
+		}
+	}
+	/* #endif */
+}
+
+.table--border {
+	border: 1px $border-color solid;
+	border-right: none;
+}
+
+.border-none {
+	/* #ifndef APP-NVUE */
+	border-bottom: none;
+	/* #endif */
+}
+
+.table--stripe {
+	/* #ifndef APP-NVUE */
+	::v-deep .uni-table-tr:nth-child(2n + 3) {
+		background-color: #fafafa;
+	}
+	/* #endif */
+}
+
+/* 表格加载、无数据样式 */
+.uni-table-loading {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: table-row;
+	/* #endif */
+	height: 50px;
+	line-height: 50px;
+	overflow: hidden;
+	box-sizing: border-box;
+}
+.empty-border {
+	border-right: 1px $border-color solid;
+}
+.uni-table-text {
+	position: absolute;
+	right: 0;
+	left: 0;
+	text-align: center;
+	font-size: 14px;
+	color: #999;
+}
+
+.uni-table-mask {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	background-color: rgba(255, 255, 255, 0.8);
+	z-index: 99;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	margin: auto;
+	transition: all 0.5s;
+	/* #endif */
+	justify-content: center;
+	align-items: center;
+}
+
+.uni-table--loader {
+	width: 30px;
+	height: 30px;
+	border: 2px solid #aaa;
+	// border-bottom-color: transparent;
+	border-radius: 50%;
+	/* #ifndef APP-NVUE */
+	animation: 2s uni-table--loader linear infinite;
+	/* #endif */
+	position: relative;
+}
+
+@keyframes uni-table--loader {
+	0% {
+		transform: rotate(360deg);
+	}
+
+	10% {
+		border-left-color: transparent;
+	}
+
+	20% {
+		border-bottom-color: transparent;
+	}
+
+	30% {
+		border-right-color: transparent;
+	}
+
+	40% {
+		border-top-color: transparent;
+	}
+
+	50% {
+		transform: rotate(0deg);
+	}
+
+	60% {
+		border-top-color: transparent;
+	}
+
+	70% {
+		border-left-color: transparent;
+	}
+
+	80% {
+		border-bottom-color: transparent;
+	}
+
+	90% {
+		border-right-color: transparent;
+	}
+
+	100% {
+		transform: rotate(-360deg);
+	}
+}
+</style>
diff --git a/uni_modules/uni-table/components/uni-tbody/uni-tbody.vue b/uni_modules/uni-table/components/uni-tbody/uni-tbody.vue
new file mode 100644
index 0000000..fbe1bdc
--- /dev/null
+++ b/uni_modules/uni-table/components/uni-tbody/uni-tbody.vue
@@ -0,0 +1,29 @@
+<template>
+	<!-- #ifdef H5 -->
+	<tbody>
+		<slot></slot>
+	</tbody>
+	<!-- #endif -->
+	<!-- #ifndef H5 -->
+	<view><slot></slot></view>
+	<!-- #endif -->
+</template>
+
+<script>
+export default {
+	name: 'uniBody',
+	options: {
+		virtualHost: true
+	},
+	data() {
+		return {
+			
+		}
+	},
+	created() {},
+	methods: {}
+}
+</script>
+
+<style>
+</style>
diff --git a/uni_modules/uni-table/components/uni-td/uni-td.vue b/uni_modules/uni-table/components/uni-td/uni-td.vue
new file mode 100644
index 0000000..9ce93e9
--- /dev/null
+++ b/uni_modules/uni-table/components/uni-td/uni-td.vue
@@ -0,0 +1,90 @@
+<template>
+	<!-- #ifdef H5 -->
+	<td class="uni-table-td" :rowspan="rowspan" :colspan="colspan" :class="{'table--border':border}" :style="{width:width + 'px','text-align':align}">
+		<slot></slot>
+	</td>
+	<!-- #endif -->
+	<!-- #ifndef H5 -->
+	<!-- :class="{'table--border':border}"  -->
+	<view class="uni-table-td" :class="{'table--border':border}" :style="{width:width + 'px','text-align':align}">
+		<slot></slot>
+	</view>
+	<!-- #endif -->
+	
+</template>
+
+<script>
+	/**
+	 * Td 单元格
+	 * @description 表格中的标准单元格组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3270
+	 * @property {Number} 	align = [left|center|right]	单元格对齐方式
+	 */
+	export default {
+		name: 'uniTd',
+		options: {
+			virtualHost: true
+		},
+		props: {
+			width: {
+				type: [String, Number],
+				default: ''
+			},
+			align: {
+				type: String,
+				default: 'left'
+			},
+			rowspan: {
+				type: [Number,String],
+				default: 1
+			},
+			colspan: {
+					type: [Number,String],
+				default: 1
+			}
+		},
+		data() {
+			return {
+				border: false
+			};
+		},
+		created() {
+			this.root = this.getTable()
+			this.border = this.root.border
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getTable() {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== 'uniTable') {
+					parent = parent.$parent;
+					if (!parent) return false;
+					parentName = parent.$options.name;
+				}
+				return parent;
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	$border-color:#EBEEF5;
+
+	.uni-table-td {
+		display: table-cell;
+		padding: 8px 10px;
+		font-size: 14px;
+		border-bottom: 1px $border-color solid;
+		font-weight: 400;
+		color: #606266;
+		line-height: 23px;
+		box-sizing: border-box;
+	}
+
+	.table--border {
+		border-right: 1px $border-color solid;
+	}
+</style>
diff --git a/uni_modules/uni-table/components/uni-th/filter-dropdown.vue b/uni_modules/uni-table/components/uni-th/filter-dropdown.vue
new file mode 100644
index 0000000..bc9a0e3
--- /dev/null
+++ b/uni_modules/uni-table/components/uni-th/filter-dropdown.vue
@@ -0,0 +1,503 @@
+<template>
+	<view class="uni-filter-dropdown">
+		<view class="dropdown-btn" @click="onDropdown">
+			<view class="icon-select" :class="{active: canReset}" v-if="isSelect || isRange"></view>
+			<view class="icon-search" :class="{active: canReset}" v-if="isSearch">
+				<view class="icon-search-0"></view>
+				<view class="icon-search-1"></view>
+			</view>
+			<view class="icon-calendar" :class="{active: canReset}" v-if="isDate">
+				<view class="icon-calendar-0"></view>
+				<view class="icon-calendar-1"></view>
+			</view>
+		</view>
+		<view class="uni-dropdown-cover" v-if="isOpened" @click="handleClose"></view>
+		<view class="dropdown-popup dropdown-popup-right" v-if="isOpened" @click.stop>
+			<!-- select-->
+			<view v-if="isSelect" class="list">
+				<label class="flex-r a-i-c list-item" v-for="(item,index) in dataList" :key="index"
+					@click="onItemClick($event, index)">
+					<check-box class="check" :checked="item.checked" />
+					<view class="checklist-content">
+						<text class="checklist-text" :style="item.styleIconText">{{item[map.text]}}</text>
+					</view>
+				</label>
+			</view>
+			<view v-if="isSelect" class="flex-r opera-area">
+				<view class="flex-f btn btn-default" :class="{disable: !canReset}" @click="handleSelectReset">
+					{{resource.reset}}</view>
+				<view class="flex-f btn btn-submit" @click="handleSelectSubmit">{{resource.submit}}</view>
+			</view>
+			<!-- search -->
+			<view v-if="isSearch" class="search-area">
+				<input class="search-input" v-model="filterValue" />
+			</view>
+			<view v-if="isSearch" class="flex-r opera-area">
+				<view class="flex-f btn btn-submit" @click="handleSearchSubmit">{{resource.search}}</view>
+				<view class="flex-f btn btn-default" :class="{disable: !canReset}" @click="handleSearchReset">
+					{{resource.reset}}</view>
+			</view>
+			<!-- range -->
+			<view v-if="isRange">
+				<view class="input-label">{{resource.gt}}</view>
+				<input class="input" v-model="gtValue" />
+				<view class="input-label">{{resource.lt}}</view>
+				<input class="input" v-model="ltValue" />
+			</view>
+			<view v-if="isRange" class="flex-r opera-area">
+				<view class="flex-f btn btn-default" :class="{disable: !canReset}" @click="handleRangeReset">
+					{{resource.reset}}</view>
+				<view class="flex-f btn btn-submit" @click="handleRangeSubmit">{{resource.submit}}</view>
+			</view>
+			<!-- date -->
+			<view v-if="isDate">
+				<uni-datetime-picker ref="datetimepicker" :value="dateRange" type="datetimerange" return-type="timestamp" @change="datetimechange" @maskClick="timepickerclose">
+					<view></view>
+				</uni-datetime-picker>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import checkBox from '../uni-tr/table-checkbox.vue'
+
+	const resource = {
+		"reset": "重置",
+		"search": "搜索",
+		"submit": "确定",
+		"filter": "筛选",
+		"gt": "大于等于",
+		"lt": "小于等于",
+		"date": "日期范围"
+	}
+
+	const DropdownType = {
+		Select: "select",
+		Search: "search",
+		Range: "range",
+		Date: "date",
+		Timestamp: "timestamp"
+	}
+
+	export default {
+		name: 'FilterDropdown',
+		emits:['change'],
+		components: {
+			checkBox
+		},
+		options: {
+			virtualHost: true
+		},
+		props: {
+			filterType: {
+				type: String,
+				default: DropdownType.Select
+			},
+			filterData: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			mode: {
+				type: String,
+				default: 'default'
+			},
+			map: {
+				type: Object,
+				default () {
+					return {
+						text: 'text',
+						value: 'value'
+					}
+				}
+			}
+		},
+		computed: {
+			canReset() {
+				if (this.isSearch) {
+					return this.filterValue.length > 0
+				}
+				if (this.isSelect) {
+					return this.checkedValues.length > 0
+				}
+				if (this.isRange) {
+					return (this.gtValue.length > 0 && this.ltValue.length > 0)
+				}
+				if (this.isDate) {
+					return this.dateSelect.length > 0
+				}
+				return false
+			},
+			isSelect() {
+				return this.filterType === DropdownType.Select
+			},
+			isSearch() {
+				return this.filterType === DropdownType.Search
+			},
+			isRange() {
+				return this.filterType === DropdownType.Range
+			},
+			isDate() {
+				return (this.filterType === DropdownType.Date || this.filterType === DropdownType.Timestamp)
+			}
+		},
+		watch: {
+			filterData(newVal) {
+				this._copyFilters()
+			},
+			indeterminate(newVal) {
+				this.isIndeterminate = newVal
+			}
+		},
+		data() {
+			return {
+				resource,
+				enabled: true,
+				isOpened: false,
+				dataList: [],
+				filterValue: '',
+				checkedValues: [],
+				gtValue: '',
+				ltValue: '',
+				dateRange: [],
+				dateSelect: []
+			};
+		},
+		created() {
+			this._copyFilters()
+		},
+		methods: {
+			_copyFilters() {
+				let dl = JSON.parse(JSON.stringify(this.filterData))
+				for (let i = 0; i < dl.length; i++) {
+					if (dl[i].checked === undefined) {
+						dl[i].checked = false
+					}
+				}
+				this.dataList = dl
+			},
+			openPopup() {
+				this.isOpened = true
+				if (this.isDate) {
+					this.$nextTick(() => {
+						if (!this.dateRange.length) {
+							this.resetDate()
+						}
+						this.$refs.datetimepicker.show()
+					})
+				}
+			},
+			closePopup() {
+				this.isOpened = false
+			},
+			handleClose(e) {
+				this.closePopup()
+			},
+			resetDate() {
+				let date = new Date()
+				let dateText = date.toISOString().split('T')[0]
+				this.dateRange = [dateText + ' 0:00:00', dateText + ' 23:59:59']
+			},
+			onDropdown(e) {
+				this.openPopup()
+			},
+			onItemClick(e, index) {
+				let items = this.dataList
+				let listItem = items[index]
+				if (listItem.checked === undefined) {
+					items[index].checked = true
+				} else {
+					items[index].checked = !listItem.checked
+				}
+
+				let checkvalues = []
+				for (let i = 0; i < items.length; i++) {
+					const item = items[i]
+					if (item.checked) {
+						checkvalues.push(item.value)
+					}
+				}
+				this.checkedValues = checkvalues
+			},
+			datetimechange(e) {
+				this.closePopup()
+				this.dateRange = e
+				this.dateSelect = e
+				this.$emit('change', {
+					filterType: this.filterType,
+					filter: e
+				})
+			},
+			timepickerclose(e) {
+				this.closePopup()
+			},
+			handleSelectSubmit() {
+				this.closePopup()
+				this.$emit('change', {
+					filterType: this.filterType,
+					filter: this.checkedValues
+				})
+			},
+			handleSelectReset() {
+				if (!this.canReset) {
+					return;
+				}
+				var items = this.dataList
+				for (let i = 0; i < items.length; i++) {
+					let item = items[i]
+					this.$set(item, 'checked', false)
+				}
+				this.checkedValues = []
+				this.handleSelectSubmit()
+			},
+			handleSearchSubmit() {
+				this.closePopup()
+				this.$emit('change', {
+					filterType: this.filterType,
+					filter: this.filterValue
+				})
+			},
+			handleSearchReset() {
+				if (!this.canReset) {
+					return;
+				}
+				this.filterValue = ''
+				this.handleSearchSubmit()
+			},
+			handleRangeSubmit(isReset) {
+				this.closePopup()
+				this.$emit('change', {
+					filterType: this.filterType,
+					filter: isReset === true ? [] : [parseInt(this.gtValue), parseInt(this.ltValue)]
+				})
+			},
+			handleRangeReset() {
+				if (!this.canReset) {
+					return;
+				}
+				this.gtValue = ''
+				this.ltValue = ''
+				this.handleRangeSubmit(true)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.flex-r {
+		display: flex;
+		flex-direction: row;
+	}
+
+	.flex-f {
+		flex: 1;
+	}
+
+	.a-i-c {
+		align-items: center;
+	}
+
+	.j-c-c {
+		justify-content: center;
+	}
+
+	.icon-select {
+		width: 14px;
+		height: 16px;
+		border: solid 6px transparent;
+		border-top: solid 6px #ddd;
+		border-bottom: none;
+		background-color: #ddd;
+		background-clip: content-box;
+		box-sizing: border-box;
+	}
+
+	.icon-select.active {
+		background-color: #1890ff;
+		border-top-color: #1890ff;
+	}
+
+	.icon-search {
+		width: 12px;
+		height: 16px;
+		position: relative;
+	}
+
+	.icon-search-0 {
+		border: 2px solid #ddd;
+		border-radius: 8px;
+		width: 7px;
+		height: 7px;
+	}
+
+	.icon-search-1 {
+		position: absolute;
+		top: 8px;
+		right: 0;
+		width: 1px;
+		height: 7px;
+		background-color: #ddd;
+		transform: rotate(-45deg);
+	}
+
+	.icon-search.active .icon-search-0 {
+		border-color: #1890ff;
+	}
+
+	.icon-search.active .icon-search-1 {
+		background-color: #1890ff;
+	}
+
+	.icon-calendar {
+		color: #ddd;
+		width: 14px;
+		height: 16px;
+	}
+
+	.icon-calendar-0 {
+		height: 4px;
+		margin-top: 3px;
+		margin-bottom: 1px;
+		background-color: #ddd;
+		border-radius: 2px 2px 1px 1px;
+		position: relative;
+	}
+	.icon-calendar-0:before, .icon-calendar-0:after {
+		content: '';
+		position: absolute;
+		top: -3px;
+		width: 4px;
+		height: 3px;
+		border-radius: 1px;
+		background-color: #ddd;
+	}
+	.icon-calendar-0:before {
+		left: 2px;
+	}
+	.icon-calendar-0:after {
+		right: 2px;
+	}
+
+	.icon-calendar-1 {
+		height: 9px;
+		background-color: #ddd;
+		border-radius: 1px 1px 2px 2px;
+	}
+
+	.icon-calendar.active {
+		color: #1890ff;
+	}
+
+	.icon-calendar.active .icon-calendar-0,
+	.icon-calendar.active .icon-calendar-1,
+	.icon-calendar.active .icon-calendar-0:before,
+	.icon-calendar.active .icon-calendar-0:after {
+		background-color: #1890ff;
+	}
+
+	.uni-filter-dropdown {
+		position: relative;
+		font-weight: normal;
+	}
+
+	.dropdown-popup {
+		position: absolute;
+		top: 100%;
+		background-color: #fff;
+		box-shadow: 0 3px 6px -4px #0000001f, 0 6px 16px #00000014, 0 9px 28px 8px #0000000d;
+		min-width: 150px;
+		z-index: 1000;
+	}
+
+	.dropdown-popup-left {
+		left: 0;
+	}
+
+	.dropdown-popup-right {
+		right: 0;
+	}
+
+	.uni-dropdown-cover {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: transparent;
+		z-index: 100;
+	}
+
+	.list {
+		margin-top: 5px;
+		margin-bottom: 5px;
+	}
+
+	.list-item {
+		padding: 5px 10px;
+		text-align: left;
+	}
+
+	.list-item:hover {
+		background-color: #f0f0f0;
+	}
+
+	.check {
+		margin-right: 5px;
+	}
+
+	.search-area {
+		padding: 10px;
+	}
+
+	.search-input {
+		font-size: 12px;
+		border: 1px solid #f0f0f0;
+		border-radius: 3px;
+		padding: 2px 5px;
+		min-width: 150px;
+		text-align: left;
+	}
+
+	.input-label {
+		margin: 10px 10px 5px 10px;
+		text-align: left;
+	}
+
+	.input {
+		font-size: 12px;
+		border: 1px solid #f0f0f0;
+		border-radius: 3px;
+		margin: 10px;
+		padding: 2px 5px;
+		min-width: 150px;
+		text-align: left;
+	}
+
+	.opera-area {
+		cursor: default;
+		border-top: 1px solid #ddd;
+		padding: 5px;
+	}
+
+	.opera-area .btn {
+		font-size: 12px;
+		border-radius: 3px;
+		margin: 5px;
+		padding: 4px 4px;
+	}
+
+	.btn-default {
+		border: 1px solid #ddd;
+	}
+
+	.btn-default.disable {
+		border-color: transparent;
+	}
+
+	.btn-submit {
+		background-color: #1890ff;
+		color: #ffffff;
+	}
+</style>
diff --git a/uni_modules/uni-table/components/uni-th/uni-th.vue b/uni_modules/uni-table/components/uni-th/uni-th.vue
new file mode 100644
index 0000000..883e3f2
--- /dev/null
+++ b/uni_modules/uni-table/components/uni-th/uni-th.vue
@@ -0,0 +1,278 @@
+<template>
+	<!-- #ifdef H5 -->
+	<th :rowspan="rowspan" :colspan="colspan" class="uni-table-th" :class="{ 'table--border': border }" :style="{ width: customWidth + 'px', 'text-align': align }">
+		<view class="uni-table-th-row">
+			<view class="uni-table-th-content" :style="{ 'justify-content': contentAlign }" @click="sort">
+				<slot></slot>
+				<view v-if="sortable" class="arrow-box">
+					<text class="arrow up" :class="{ active: ascending }" @click.stop="ascendingFn"></text>
+					<text class="arrow down" :class="{ active: descending }" @click.stop="descendingFn"></text>
+				</view>
+			</view>
+			<dropdown v-if="filterType || filterData.length" :filterData="filterData" :filterType="filterType" @change="ondropdown"></dropdown>
+		</view>
+	</th>
+	<!-- #endif -->
+	<!-- #ifndef H5 -->
+	<view class="uni-table-th" :class="{ 'table--border': border }" :style="{ width: customWidth + 'px', 'text-align': align }"><slot></slot></view>
+	<!-- #endif -->
+</template>
+
+<script>
+	// #ifdef H5
+	import dropdown from './filter-dropdown.vue'
+	// #endif
+/**
+ * Th 表头
+ * @description 表格内的表头单元格组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=3270
+ * @property {Number | String} 	width 	单元格宽度（支持纯数字、携带单位px或rpx）
+ * @property {Boolean} 	sortable 					是否启用排序
+ * @property {Number} 	align = [left|center|right]	单元格对齐方式
+ * @value left   	单元格文字左侧对齐
+ * @value center	单元格文字居中
+ * @value right		单元格文字右侧对齐
+ * @property {Array}	filterData 筛选数据
+ * @property {String}	filterType	[search|select] 筛选类型
+ * @value search	关键字搜素
+ * @value select	条件选择
+ * @event {Function} sort-change 排序触发事件
+ */
+export default {
+	name: 'uniTh',
+	options: {
+		virtualHost: true
+	},
+	components: {
+		// #ifdef H5
+		dropdown
+		// #endif
+	},
+	emits:['sort-change','filter-change'],
+	props: {
+		width: {
+			type: [String, Number],
+			default: ''
+		},
+		align: {
+			type: String,
+			default: 'left'
+		},
+		rowspan: {
+			type: [Number, String],
+			default: 1
+		},
+		colspan: {
+			type: [Number, String],
+			default: 1
+		},
+		sortable: {
+			type: Boolean,
+			default: false
+		},
+		filterType: {
+			type: String,
+			default: ""
+		},
+		filterData: {
+			type: Array,
+			default () {
+				return []
+			}
+		}
+	},
+	data() {
+		return {
+			border: false,
+			ascending: false,
+			descending: false
+		}
+	},
+	computed: {
+		// 根据props中的width属性 自动匹配当前th的宽度(px)
+		customWidth(){
+			if(typeof this.width === 'number'){
+				return this.width
+			} else if(typeof this.width === 'string') {
+				let regexHaveUnitPx = new RegExp(/^[1-9][0-9]*px$/g)
+				let regexHaveUnitRpx = new RegExp(/^[1-9][0-9]*rpx$/g)
+				let regexHaveNotUnit = new RegExp(/^[1-9][0-9]*$/g)
+				if (this.width.match(regexHaveUnitPx) !== null) { // 携带了 px
+					return this.width.replace('px', '')
+				} else if (this.width.match(regexHaveUnitRpx) !== null) { // 携带了 rpx
+					let numberRpx = Number(this.width.replace('rpx', ''))
+					let widthCoe = uni.getSystemInfoSync().screenWidth / 750
+					return Math.round(numberRpx * widthCoe)
+				} else if (this.width.match(regexHaveNotUnit) !== null) { // 未携带 rpx或px 的纯数字 String
+					return this.width
+				} else { // 不符合格式
+					return ''
+				}
+			} else {
+				return ''
+			}
+		},
+		contentAlign() {
+			let align = 'left'
+			switch (this.align) {
+				case 'left':
+					align = 'flex-start'
+					break
+				case 'center':
+					align = 'center'
+					break
+				case 'right':
+					align = 'flex-end'
+					break
+			}
+			return align
+		}
+	},
+	created() {
+		this.root = this.getTable('uniTable')
+		this.rootTr = this.getTable('uniTr')
+		this.rootTr.minWidthUpdate(this.customWidth ? this.customWidth : 140)
+		this.border = this.root.border
+		this.root.thChildren.push(this)
+	},
+	methods: {
+		sort() {
+			if (!this.sortable) return
+			this.clearOther()
+			if (!this.ascending && !this.descending) {
+				this.ascending = true
+				this.$emit('sort-change', { order: 'ascending' })
+				return
+			}
+			if (this.ascending && !this.descending) {
+				this.ascending = false
+				this.descending = true
+				this.$emit('sort-change', { order: 'descending' })
+				return
+			}
+
+			if (!this.ascending && this.descending) {
+				this.ascending = false
+				this.descending = false
+				this.$emit('sort-change', { order: null })
+			}
+		},
+		ascendingFn() {
+			this.clearOther()
+			this.ascending = !this.ascending
+			this.descending = false
+			this.$emit('sort-change', { order: this.ascending ? 'ascending' : null })
+		},
+		descendingFn() {
+			this.clearOther()
+			this.descending = !this.descending
+			this.ascending = false
+			this.$emit('sort-change', { order: this.descending ? 'descending' : null })
+		},
+		clearOther() {
+			this.root.thChildren.map(item => {
+				if (item !== this) {
+					item.ascending = false
+					item.descending = false
+				}
+				return item
+			})
+		},
+		ondropdown(e) {
+			this.$emit("filter-change", e)
+		},
+		/**
+		 * 获取父元素实例
+		 */
+		getTable(name) {
+			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
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+$border-color: #ebeef5;
+
+.uni-table-th {
+	padding: 12px 10px;
+	/* #ifndef APP-NVUE */
+	display: table-cell;
+	box-sizing: border-box;
+	/* #endif */
+	font-size: 14px;
+	font-weight: bold;
+	color: #909399;
+	border-bottom: 1px $border-color solid;
+}
+
+.uni-table-th-row {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+}
+
+.table--border {
+	border-right: 1px $border-color solid;
+}
+.uni-table-th-content {
+	display: flex;
+	align-items: center;
+	flex: 1;
+}
+.arrow-box {
+}
+.arrow {
+	display: block;
+	position: relative;
+	width: 10px;
+	height: 8px;
+	// border: 1px red solid;
+	left: 5px;
+	overflow: hidden;
+	cursor: pointer;
+}
+.down {
+	top: 3px;
+	::after {
+		content: '';
+		width: 8px;
+		height: 8px;
+		position: absolute;
+		left: 2px;
+		top: -5px;
+		transform: rotate(45deg);
+		background-color: #ccc;
+	}
+	&.active {
+		::after {
+			background-color: #007aff;
+		}
+	}
+}
+.up {
+	::after {
+		content: '';
+		width: 8px;
+		height: 8px;
+		position: absolute;
+		left: 2px;
+		top: 5px;
+		transform: rotate(45deg);
+		background-color: #ccc;
+	}
+	&.active {
+		::after {
+			background-color: #007aff;
+		}
+	}
+}
+</style>
diff --git a/uni_modules/uni-table/components/uni-thead/uni-thead.vue b/uni_modules/uni-table/components/uni-thead/uni-thead.vue
new file mode 100644
index 0000000..0dd18cd
--- /dev/null
+++ b/uni_modules/uni-table/components/uni-thead/uni-thead.vue
@@ -0,0 +1,129 @@
+<template>
+	<!-- #ifdef H5 -->
+	<thead class="uni-table-thead">
+		<tr class="uni-table-tr">
+			<th :rowspan="rowspan" colspan="1" class="checkbox" :class="{ 'tr-table--border': border }">
+				<table-checkbox :indeterminate="indeterminate" :checked="checked" @checkboxSelected="checkboxSelected"></table-checkbox>
+			</th>
+		</tr>
+		<slot></slot>
+	</thead>
+	<!-- #endif -->
+	<!-- #ifndef H5 -->
+	<view class="uni-table-thead"><slot></slot></view>
+	<!-- #endif -->
+</template>
+
+<script>
+import tableCheckbox from '../uni-tr/table-checkbox.vue'
+export default {
+	name: 'uniThead',
+	components: {
+		tableCheckbox
+	},
+	options: {
+		virtualHost: true
+	},
+	data() {
+		return {
+			border: false,
+			selection: false,
+			rowspan: 1,
+			indeterminate: false,
+			checked: false
+		}
+	},
+	created() {
+		this.root = this.getTable()
+		// #ifdef H5
+		this.root.theadChildren = this
+		// #endif
+		this.border = this.root.border
+		this.selection = this.root.type
+	},
+	methods: {
+		init(self) {
+			this.rowspan++
+		},
+		checkboxSelected(e) {
+			this.indeterminate = false
+			const backIndexData = this.root.backIndexData
+			const data = this.root.trChildren.filter(v => !v.disabled && v.keyValue)
+			if (backIndexData.length === data.length) {
+				this.checked = false
+				this.root.clearSelection()
+			} else {
+				this.checked = true
+				this.root.selectionAll()
+			}
+		},
+		/**
+		 * 获取父元素实例
+		 */
+		getTable(name = 'uniTable') {
+			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
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+$border-color: #ebeef5;
+
+.uni-table-thead {
+	display: table-header-group;
+}
+
+.uni-table-tr {
+	/* #ifndef APP-NVUE */
+	display: table-row;
+	transition: all 0.3s;
+	box-sizing: border-box;
+	/* #endif */
+	border: 1px red solid;
+	background-color: #fafafa;
+}
+
+.checkbox {
+	padding: 0 8px;
+	width: 26px;
+	padding-left: 12px;
+	/* #ifndef APP-NVUE */
+	display: table-cell;
+	vertical-align: middle;
+	/* #endif */
+	color: #333;
+	font-weight: 500;
+	border-bottom: 1px $border-color solid;
+	font-size: 14px;
+	// text-align: center;
+}
+
+.tr-table--border {
+	border-right: 1px $border-color solid;
+}
+
+/* #ifndef APP-NVUE */
+.uni-table-tr {
+	::v-deep .uni-table-th {
+		&.table--border:last-child {
+			// border-right: none;
+		}
+	}
+
+	::v-deep .uni-table-td {
+		&.table--border:last-child {
+			// border-right: none;
+		}
+	}
+}
+
+/* #endif */
+</style>
diff --git a/uni_modules/uni-table/components/uni-tr/table-checkbox.vue b/uni_modules/uni-table/components/uni-tr/table-checkbox.vue
new file mode 100644
index 0000000..158f3ff
--- /dev/null
+++ b/uni_modules/uni-table/components/uni-tr/table-checkbox.vue
@@ -0,0 +1,179 @@
+<template>
+	<view class="uni-table-checkbox" @click="selected">
+		<view v-if="!indeterminate" class="checkbox__inner" :class="{'is-checked':isChecked,'is-disable':isDisabled}">
+			<view class="checkbox__inner-icon"></view>
+		</view>
+		<view v-else class="checkbox__inner checkbox--indeterminate">
+			<view class="checkbox__inner-icon"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'TableCheckbox',
+		emits:['checkboxSelected'],
+		props: {
+			indeterminate: {
+				type: Boolean,
+				default: false
+			},
+			checked: {
+				type: [Boolean,String],
+				default: false
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			index: {
+				type: Number,
+				default: -1
+			},
+			cellData: {
+				type: Object,
+				default () {
+					return {}
+				}
+			}
+		},
+		watch:{
+			checked(newVal){
+				if(typeof this.checked === 'boolean'){
+					this.isChecked = newVal
+				}else{
+					this.isChecked = true
+				}
+			},
+			indeterminate(newVal){
+				this.isIndeterminate = newVal
+			}
+		},
+		data() {
+			return {
+				isChecked: false,
+				isDisabled: false,
+				isIndeterminate:false
+			}
+		},
+		created() {
+			if(typeof this.checked === 'boolean'){
+				this.isChecked = this.checked
+			}
+			this.isDisabled = this.disabled
+		},
+		methods: {
+			selected() {
+				if (this.isDisabled) return
+				this.isIndeterminate = false
+				this.isChecked = !this.isChecked
+				this.$emit('checkboxSelected', {
+					checked: this.isChecked,
+					data: this.cellData
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$checked-color: #007aff;
+	$border-color: #DCDFE6;
+	$disable:0.4;
+
+	.uni-table-checkbox {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		margin: 5px 0;
+		cursor: pointer;
+
+		// 多选样式
+		.checkbox__inner {
+			/* #ifndef APP-NVUE */
+			flex-shrink: 0;
+			box-sizing: border-box;
+			/* #endif */
+			position: relative;
+			width: 16px;
+			height: 16px;
+			border: 1px solid $border-color;
+			border-radius: 2px;
+			background-color: #fff;
+			z-index: 1;
+
+			.checkbox__inner-icon {
+				position: absolute;
+				/* #ifdef APP-NVUE */
+				top: 2px;
+				/* #endif */
+				/* #ifndef APP-NVUE */
+				top: 2px;
+				/* #endif */
+				left: 5px;
+				height: 7px;
+				width: 3px;
+				border: 1px solid #fff;
+				border-left: 0;
+				border-top: 0;
+				opacity: 0;
+				transform-origin: center;
+				transform: rotate(45deg);
+				box-sizing: content-box;
+			}
+
+			&.checkbox--indeterminate {
+				border-color: $checked-color;
+				background-color: $checked-color;
+
+				.checkbox__inner-icon {
+					position: absolute;
+					opacity: 1;
+					transform: rotate(0deg);
+					height: 2px;
+					top: 0;
+					bottom: 0;
+					margin: auto;
+					left: 0px;
+					right: 0px;
+					bottom: 0;
+					width: auto;
+					border: none;
+					border-radius: 2px;
+					transform: scale(0.5);
+					background-color: #fff;
+				}
+			}
+			&:hover{
+				border-color: $checked-color;
+			}
+			// 禁用
+			&.is-disable {
+				/* #ifdef H5 */
+				cursor: not-allowed;
+				/* #endif */
+				background-color: #F2F6FC;
+				border-color: $border-color;
+			}
+
+			// 选中
+			&.is-checked {
+				border-color: $checked-color;
+				background-color: $checked-color;
+
+				.checkbox__inner-icon {
+					opacity: 1;
+					transform: rotate(45deg);
+				}
+
+				// 选中禁用
+				&.is-disable {
+					opacity: $disable;
+				}
+			}
+			
+		}
+	}
+</style>
diff --git a/uni_modules/uni-table/components/uni-tr/uni-tr.vue b/uni_modules/uni-table/components/uni-tr/uni-tr.vue
new file mode 100644
index 0000000..f9b9671
--- /dev/null
+++ b/uni_modules/uni-table/components/uni-tr/uni-tr.vue
@@ -0,0 +1,171 @@
+<template>
+	<!-- #ifdef H5 -->
+	<tr class="uni-table-tr">
+		<th v-if="selection === 'selection' && ishead" class="checkbox" :class="{ 'tr-table--border': border }">
+			<table-checkbox :checked="checked" :indeterminate="indeterminate" :disabled="disabled" @checkboxSelected="checkboxSelected"></table-checkbox>
+		</th>
+		<slot></slot>
+		<!-- <uni-th class="th-fixed">123</uni-th> -->
+	</tr>
+	<!-- #endif -->
+	<!-- #ifndef H5 -->
+	<view class="uni-table-tr">
+		<view v-if="selection === 'selection' " class="checkbox" :class="{ 'tr-table--border': border }">
+			<table-checkbox :checked="checked" :indeterminate="indeterminate" :disabled="disabled" @checkboxSelected="checkboxSelected"></table-checkbox>
+		</view>
+		<slot></slot>
+	</view>
+	<!-- #endif -->
+</template>
+
+<script>
+	import tableCheckbox from './table-checkbox.vue'
+/**
+ * Tr 表格行组件
+ * @description 表格行组件 仅包含 th,td 组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=
+ */
+export default {
+	name: 'uniTr',
+	components: { tableCheckbox },
+	props: {
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		keyValue: {
+			type: [String, Number],
+			default: ''
+		}
+	},
+	options: {
+		virtualHost: true
+	},
+	data() {
+		return {
+			value: false,
+			border: false,
+			selection: false,
+			widthThArr: [],
+			ishead: true,
+			checked: false,
+			indeterminate:false
+		}
+	},
+	created() {
+		this.root = this.getTable()
+		this.head = this.getTable('uniThead')
+		if (this.head) {
+			this.ishead = false
+			this.head.init(this)
+		}
+		this.border = this.root.border
+		this.selection = this.root.type
+		this.root.trChildren.push(this)
+		const rowData = this.root.data.find(v => v[this.root.rowKey] === this.keyValue)
+		if(rowData){
+			this.rowData = rowData
+		}
+		this.root.isNodata()
+	},
+	mounted() {
+		if (this.widthThArr.length > 0) {
+			const selectionWidth = this.selection === 'selection' ? 50 : 0
+			this.root.minWidth = this.widthThArr.reduce((a, b) => Number(a) + Number(b)) + selectionWidth
+		}
+	},
+	// #ifndef VUE3
+	destroyed() {
+		const index = this.root.trChildren.findIndex(i => i === this)
+		this.root.trChildren.splice(index, 1)
+		this.root.isNodata()
+	},
+	// #endif
+	// #ifdef VUE3
+	unmounted() {
+		const index = this.root.trChildren.findIndex(i => i === this)
+		this.root.trChildren.splice(index, 1)
+		this.root.isNodata()
+	},
+	// #endif
+	methods: {
+		minWidthUpdate(width) {
+			this.widthThArr.push(width)
+		},
+		// 选中
+		checkboxSelected(e) {
+			let rootData = this.root.data.find(v => v[this.root.rowKey] === this.keyValue)
+			this.checked = e.checked
+			this.root.check(rootData||this, e.checked,rootData? this.keyValue:null)
+		},
+		change(e) {
+			this.root.trChildren.forEach(item => {
+				if (item === this) {
+					this.root.check(this, e.detail.value.length > 0 ? true : false)
+				}
+			})
+		},
+		/**
+		 * 获取父元素实例
+		 */
+		getTable(name = 'uniTable') {
+			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
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+$border-color: #ebeef5;
+
+.uni-table-tr {
+	/* #ifndef APP-NVUE */
+	display: table-row;
+	transition: all 0.3s;
+	box-sizing: border-box;
+	/* #endif */
+}
+
+.checkbox {
+	padding: 0 8px;
+	width: 26px;
+	padding-left: 12px;
+	/* #ifndef APP-NVUE */
+	display: table-cell;
+	vertical-align: middle;
+	/* #endif */
+	color: #333;
+	font-weight: 500;
+	border-bottom: 1px $border-color solid;
+	font-size: 14px;
+	// text-align: center;
+}
+
+.tr-table--border {
+	border-right: 1px $border-color solid;
+}
+
+/* #ifndef APP-NVUE */
+.uni-table-tr {
+	::v-deep .uni-table-th {
+		&.table--border:last-child {
+			// border-right: none;
+		}
+	}
+
+	::v-deep .uni-table-td {
+		&.table--border:last-child {
+			// border-right: none;
+		}
+	}
+}
+
+/* #endif */
+</style>
diff --git a/uni_modules/uni-table/i18n/en.json b/uni_modules/uni-table/i18n/en.json
new file mode 100644
index 0000000..e32023c
--- /dev/null
+++ b/uni_modules/uni-table/i18n/en.json
@@ -0,0 +1,9 @@
+{
+	"filter-dropdown.reset": "Reset",
+	"filter-dropdown.search": "Search",
+	"filter-dropdown.submit": "Submit",
+	"filter-dropdown.filter": "Filter",
+	"filter-dropdown.gt": "Greater or equal to",
+	"filter-dropdown.lt": "Less than or equal to",
+	"filter-dropdown.date": "Date"
+}
diff --git a/uni_modules/uni-table/i18n/es.json b/uni_modules/uni-table/i18n/es.json
new file mode 100644
index 0000000..9afd04b
--- /dev/null
+++ b/uni_modules/uni-table/i18n/es.json
@@ -0,0 +1,9 @@
+{
+	"filter-dropdown.reset": "Reiniciar",
+	"filter-dropdown.search": "Búsqueda",
+	"filter-dropdown.submit": "Entregar",
+	"filter-dropdown.filter": "Filtrar",
+	"filter-dropdown.gt": "Mayor o igual a",
+	"filter-dropdown.lt": "Menos que o igual a",
+	"filter-dropdown.date": "Fecha"
+}
diff --git a/uni_modules/uni-table/i18n/fr.json b/uni_modules/uni-table/i18n/fr.json
new file mode 100644
index 0000000..b006237
--- /dev/null
+++ b/uni_modules/uni-table/i18n/fr.json
@@ -0,0 +1,9 @@
+{
+	"filter-dropdown.reset": "Réinitialiser",
+	"filter-dropdown.search": "Chercher",
+	"filter-dropdown.submit": "Soumettre",
+	"filter-dropdown.filter": "Filtre",
+	"filter-dropdown.gt": "Supérieur ou égal à",
+	"filter-dropdown.lt": "Inférieur ou égal à",
+	"filter-dropdown.date": "Date"
+}
diff --git a/uni_modules/uni-table/i18n/index.js b/uni_modules/uni-table/i18n/index.js
new file mode 100644
index 0000000..2469dd0
--- /dev/null
+++ b/uni_modules/uni-table/i18n/index.js
@@ -0,0 +1,12 @@
+import en from './en.json'
+import es from './es.json'
+import fr from './fr.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	es,
+	fr,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-table/i18n/zh-Hans.json b/uni_modules/uni-table/i18n/zh-Hans.json
new file mode 100644
index 0000000..862af17
--- /dev/null
+++ b/uni_modules/uni-table/i18n/zh-Hans.json
@@ -0,0 +1,9 @@
+{
+	"filter-dropdown.reset": "重置",
+	"filter-dropdown.search": "搜索",
+	"filter-dropdown.submit": "确定",
+	"filter-dropdown.filter": "筛选",
+	"filter-dropdown.gt": "大于等于",
+	"filter-dropdown.lt": "小于等于",
+	"filter-dropdown.date": "日期范围"
+}
diff --git a/uni_modules/uni-table/i18n/zh-Hant.json b/uni_modules/uni-table/i18n/zh-Hant.json
new file mode 100644
index 0000000..64f8061
--- /dev/null
+++ b/uni_modules/uni-table/i18n/zh-Hant.json
@@ -0,0 +1,9 @@
+{
+	"filter-dropdown.reset": "重置",
+	"filter-dropdown.search": "搜索",
+	"filter-dropdown.submit": "確定",
+	"filter-dropdown.filter": "篩選",
+	"filter-dropdown.gt": "大於等於",
+	"filter-dropdown.lt": "小於等於",
+	"filter-dropdown.date": "日期範圍"
+}
diff --git a/uni_modules/uni-table/package.json b/uni_modules/uni-table/package.json
new file mode 100644
index 0000000..f224ab7
--- /dev/null
+++ b/uni_modules/uni-table/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-table",
+  "displayName": "uni-table 表格",
+  "version": "1.2.1",
+  "description": "表格组件，多用于展示多条结构类似的数据，如",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "table",
+    "表格"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss","uni-datetime-picker"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "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",
+          "字节跳动": "n",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-table/readme.md b/uni_modules/uni-table/readme.md
new file mode 100644
index 0000000..bb08c79
--- /dev/null
+++ b/uni_modules/uni-table/readme.md
@@ -0,0 +1,13 @@
+
+
+## Table 表单
+> 组件名：``uni-table``，代码块： `uTable`。
+
+用于展示多条结构类似的数据
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-table)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
diff --git a/uni_modules/uni-tag/changelog.md b/uni_modules/uni-tag/changelog.md
new file mode 100644
index 0000000..c0c5839
--- /dev/null
+++ b/uni_modules/uni-tag/changelog.md
@@ -0,0 +1,21 @@
+## 2.1.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-tag](https://uniapp.dcloud.io/component/uniui/uni-tag)
+## 2.0.0（2021-11-09）
+- 新增 提供组件设计资源，组件样式调整
+- 移除 插槽
+- 移除 type 属性的 royal 选项
+## 1.1.1（2021-08-11）
+- type 不是 default 时，size 为 small 字体大小显示不正确
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-06-18）
+- 修复 uni-tag 在字节跳动小程序上 css 类名编译错误的 bug
+## 1.0.6（2021-06-04）
+- 修复 未定义 sass 变量 "$uni-color-royal" 的bug
+## 1.0.5（2021-05-10）
+- 修复 royal 类型无效的bug
+- 修复 uni-tag 宽度不自适应的bug
+- 新增 uni-tag 支持属性 custom-style 自定义样式
+## 1.0.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-tag/components/uni-tag/uni-tag.vue b/uni_modules/uni-tag/components/uni-tag/uni-tag.vue
new file mode 100644
index 0000000..418c955
--- /dev/null
+++ b/uni_modules/uni-tag/components/uni-tag/uni-tag.vue
@@ -0,0 +1,252 @@
+<template>
+	<text class="uni-tag" v-if="text" :class="classes" :style="customStyle" @click="onClick">{{text}}</text>
+</template>
+
+<script>
+	/**
+	 * Tag 标签
+	 * @description 用于展示1个或多个文字标签，可点击切换选中、不选中的状态
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=35
+	 * @property {String} text 标签内容
+	 * @property {String} size = [default|small|mini] 大小尺寸
+	 * 	@value default 正常
+	 * 	@value small 小尺寸
+	 * 	@value mini 迷你尺寸
+	 * @property {String} type = [default|primary|success｜warning｜error]  颜色类型
+	 * 	@value default 灰色
+	 * 	@value primary 蓝色
+	 * 	@value success 绿色
+	 * 	@value warning 黄色
+	 * 	@value error 红色
+	 * @property {Boolean} disabled = [true|false] 是否为禁用状态
+	 * @property {Boolean} inverted = [true|false] 是否无需背景颜色（空心标签）
+	 * @property {Boolean} circle = [true|false] 是否为圆角
+	 * @event {Function} click 点击 Tag 触发事件
+	 */
+
+	export default {
+		name: "UniTag",
+		emits: ['click'],
+		props: {
+			type: {
+				// 标签类型default、primary、success、warning、error、royal
+				type: String,
+				default: "default"
+			},
+			size: {
+				// 标签大小 normal, small
+				type: String,
+				default: "normal"
+			},
+			// 标签内容
+			text: {
+				type: String,
+				default: ""
+			},
+			disabled: {
+				// 是否为禁用状态
+				type: [Boolean, String],
+				default: false
+			},
+			inverted: {
+				// 是否为空心
+				type: [Boolean, String],
+				default: false
+			},
+			circle: {
+				// 是否为圆角样式
+				type: [Boolean, String],
+				default: false
+			},
+			mark: {
+				// 是否为标记样式
+				type: [Boolean, String],
+				default: false
+			},
+			customStyle: {
+				type: String,
+				default: ''
+			}
+		},
+		computed: {
+			classes() {
+				const {
+					type,
+					disabled,
+					inverted,
+					circle,
+					mark,
+					size,
+					isTrue
+				} = this
+				const classArr = [
+					'uni-tag--' + type,
+					'uni-tag--' + size,
+					isTrue(disabled) ? 'uni-tag--disabled' : '',
+					isTrue(inverted) ? 'uni-tag--' + type + '--inverted' : '',
+					isTrue(circle) ? 'uni-tag--circle' : '',
+					isTrue(mark) ? 'uni-tag--mark' : '',
+					// type === 'default' ? 'uni-tag--default' : 'uni-tag-text',
+					isTrue(inverted) ? 'uni-tag--inverted uni-tag-text--' + type : '',
+					size === 'small' ? 'uni-tag-text--small' : ''
+				]
+				// 返回类的字符串，兼容字节小程序
+				return classArr.join(' ')
+			}
+		},
+		methods: {
+			isTrue(value) {
+				return value === true || value === 'true'
+			},
+			onClick() {
+				if (this.isTrue(this.disabled)) return
+				this.$emit("click");
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	$uni-primary: #2979ff !default;
+	$uni-success: #18bc37 !default;
+	$uni-warning: #f3a73f !default;
+	$uni-error: #e43d33 !default;
+	$uni-info: #8f939c !default;
+
+
+	$tag-default-pd: 4px 7px;
+	$tag-small-pd: 2px 5px;
+	$tag-mini-pd: 1px 3px;
+
+	.uni-tag {
+		line-height: 14px;
+		font-size: 12px;
+		font-weight: 200;
+		padding: $tag-default-pd;
+		color: #fff;
+		border-radius: 3px;
+		background-color: $uni-info;
+		border-width: 1rpx;
+		border-style: solid;
+		border-color: $uni-info;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+
+		// size attr
+		&--default {
+			font-size: 12px;
+		}
+
+		&--default--inverted {
+			color: $uni-info;
+			border-color: $uni-info;
+		}
+
+		&--small {
+			padding: $tag-small-pd;
+			font-size: 12px;
+			border-radius: 2px;
+		}
+
+		&--mini {
+			padding: $tag-mini-pd;
+			font-size: 12px;
+			border-radius: 2px;
+		}
+
+		// type attr
+		&--primary {
+			background-color: $uni-primary;
+			border-color: $uni-primary;
+			color: #fff;
+		}
+
+		&--success {
+			color: #fff;
+			background-color: $uni-success;
+			border-color: $uni-success;
+		}
+
+		&--warning {
+			color: #fff;
+			background-color: $uni-warning;
+			border-color: $uni-warning;
+		}
+
+		&--error {
+			color: #fff;
+			background-color: $uni-error;
+			border-color: $uni-error;
+		}
+
+		&--primary--inverted {
+			color: $uni-primary;
+			border-color: $uni-primary;
+		}
+
+		&--success--inverted {
+			color: $uni-success;
+			border-color: $uni-success;
+		}
+
+		&--warning--inverted {
+			color: $uni-warning;
+			border-color: $uni-warning;
+		}
+
+		&--error--inverted {
+			color: $uni-error;
+			border-color: $uni-error;
+		}
+
+		&--inverted {
+			background-color: #fff;
+		}
+
+		// other attr
+		&--circle {
+			border-radius: 15px !important;
+		}
+
+		&--mark {
+			border-top-left-radius: 0 !important;
+			border-bottom-left-radius: 0 !important;
+			border-top-right-radius: 15px !important;
+			border-bottom-right-radius: 15px !important;
+		}
+
+		&--disabled {
+			opacity: 0.5;
+			/* #ifdef H5 */
+			cursor: not-allowed;
+			/* #endif */
+		}
+	}
+
+
+	.uni-tag-text {
+		color: #fff;
+		font-size: 14px;
+
+		&--primary {
+			color: $uni-primary;
+		}
+
+		&--success {
+			color: $uni-success;
+		}
+
+		&--warning {
+			color: $uni-warning;
+		}
+
+		&--error {
+			color: $uni-error;
+		}
+
+		&--small {
+			font-size: 12px;
+		}
+	}
+</style>
diff --git a/uni_modules/uni-tag/package.json b/uni_modules/uni-tag/package.json
new file mode 100644
index 0000000..1878088
--- /dev/null
+++ b/uni_modules/uni-tag/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-tag",
+  "displayName": "uni-tag 标签",
+  "version": "2.1.0",
+  "description": "Tag 组件，用于展示1个或多个文字标签，可点击切换选中、不选中的状态。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "",
+    "tag",
+    "标签"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["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-tag/readme.md b/uni_modules/uni-tag/readme.md
new file mode 100644
index 0000000..6e78ff5
--- /dev/null
+++ b/uni_modules/uni-tag/readme.md
@@ -0,0 +1,13 @@
+
+
+## Tag 标签
+> **组件名：uni-tag**
+> 代码块： `uTag`
+
+
+用于展示1个或多个文字标签，可点击切换选中、不选中的状态 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-tag)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-title/changelog.md b/uni_modules/uni-title/changelog.md
new file mode 100644
index 0000000..7626216
--- /dev/null
+++ b/uni_modules/uni-title/changelog.md
@@ -0,0 +1,10 @@
+## 1.1.1（2022-05-19）
+- 修改组件描述
+## 1.1.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-title](https://uniapp.dcloud.io/component/uniui/uni-title)
+## 1.0.2（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的Bug
+## 1.0.1（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-title/components/uni-title/uni-title.vue b/uni_modules/uni-title/components/uni-title/uni-title.vue
new file mode 100644
index 0000000..bf4f926
--- /dev/null
+++ b/uni_modules/uni-title/components/uni-title/uni-title.vue
@@ -0,0 +1,171 @@
+<template>
+	<view class="uni-title__box" :style="{'align-items':textAlign}">
+		<text class="uni-title__base" :class="['uni-'+type]" :style="{'color':color}">{{title}}</text>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Title 标题
+	 * @description 标题，通常用于记录页面标题，使用当前组件，uni-app 如果开启统计，将会自动统计页面标题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=1066
+	 * @property {String} type = [h1|h2|h3|h4|h5] 标题类型
+	 * 	@value h1 一级标题
+	 * 	@value h2 二级标题
+	 * 	@value h3 三级标题
+	 * 	@value h4 四级标题
+	 * 	@value h5 五级标题
+	 * @property {String} title 标题内容
+	 * @property {String} align = [left|center|right] 对齐方式
+	 * 	@value left 做对齐
+	 * 	@value center 居中对齐
+	 * 	@value right 右对齐
+	 * @property {String} color 字体颜色
+	 * @property {Boolean} stat = [true|false] 是否开启统计功能呢，如不填写type值，默认为开启，填写 type 属性，默认为关闭
+	 */
+	export default {
+		name:"UniTitle",
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			align: {
+				type: String,
+				default: 'left'
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			stat: {
+				type: [Boolean, String],
+				default: ''
+			}
+		},
+		data() {
+			return {
+
+			};
+		},
+		computed: {
+			textAlign() {
+				let align = 'center';
+				switch (this.align) {
+					case 'left':
+						align = 'flex-start'
+						break;
+					case 'center':
+						align = 'center'
+						break;
+					case 'right':
+						align = 'flex-end'
+						break;
+				}
+				return align
+			}
+		},
+		watch: {
+			title(newVal) {
+				if (this.isOpenStat()) {
+					// 上报数据
+					if (uni.report) {
+						uni.report('title', this.title)
+					}
+				}
+			}
+		},
+		mounted() {
+			if (this.isOpenStat()) {
+				// 上报数据
+				if (uni.report) {
+					uni.report('title', this.title)
+				}
+			}
+		},
+		methods: {
+			isOpenStat() {
+				if (this.stat === '') {
+					this.isStat = false
+				}
+				let stat_type = (typeof(this.stat) === 'boolean' && this.stat) || (typeof(this.stat) === 'string' && this.stat !==
+					'')
+				if (this.type === "") {
+					this.isStat = true
+					if (this.stat.toString() === 'false') {
+						this.isStat = false
+					}
+				}
+
+				if (this.type !== '') {
+					this.isStat = true
+					if (stat_type) {
+						this.isStat = true
+					} else {
+						this.isStat = false
+					}
+				}
+				return this.isStat
+			}
+		}
+	}
+</script>
+
+<style>
+	/* .uni-title {
+
+	} */
+	.uni-title__box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: flex-start;
+		justify-content: center;
+		padding: 8px 0;
+		flex: 1;
+	}
+
+	.uni-title__base {
+		font-size: 15px;
+		color: #333;
+		font-weight: 500;
+	}
+
+	.uni-h1 {
+		font-size: 20px;
+		color: #333;
+		font-weight: bold;
+	}
+
+	.uni-h2 {
+		font-size: 18px;
+		color: #333;
+		font-weight: bold;
+	}
+
+	.uni-h3 {
+		font-size: 16px;
+		color: #333;
+		font-weight: bold;
+		/* font-weight: 400; */
+	}
+
+	.uni-h4 {
+		font-size: 14px;
+		color: #333;
+		font-weight: bold;
+		/* font-weight: 300; */
+	}
+
+	.uni-h5 {
+		font-size: 12px;
+		color: #333;
+		font-weight: bold;
+		/* font-weight: 200; */
+	}
+</style>
diff --git a/uni_modules/uni-title/package.json b/uni_modules/uni-title/package.json
new file mode 100644
index 0000000..2249f5a
--- /dev/null
+++ b/uni_modules/uni-title/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-title",
+  "displayName": "uni-title 章节标题",
+  "version": "1.1.1",
+  "description": "章节标题，通常用于记录页面标题，使用当前组件，uni-app 如果开启统计，将会自动统计页面标题",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "标题",
+    "章节",
+    "章节标题",
+    ""
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["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-title/readme.md b/uni_modules/uni-title/readme.md
new file mode 100644
index 0000000..0e60b1b
--- /dev/null
+++ b/uni_modules/uni-title/readme.md
@@ -0,0 +1,14 @@
+
+
+## Title 标题
+> **组件名：uni-title**
+> 代码块： `uTitle`
+
+
+章节标题，通常用于记录页面标题，使用当前组件，uni-app 如果开启统计，将会自动统计页面标题 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-title)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
diff --git a/uni_modules/uni-tooltip/changelog.md b/uni_modules/uni-tooltip/changelog.md
new file mode 100644
index 0000000..00f1572
--- /dev/null
+++ b/uni_modules/uni-tooltip/changelog.md
@@ -0,0 +1,10 @@
+## 0.2.1（2022-05-09）
+- 修复 content 为空时仍然弹出的bug
+## 0.2.0（2022-05-07）
+**注意：破坏性更新**
+- 更新 text 属性变更为 content
+- 更新 移除 width 属性
+## 0.1.1（2022-04-27）
+- 修复 组件根 text 嵌套组件 warning
+## 0.1.0（2022-04-21）
+- 初始化
diff --git a/uni_modules/uni-tooltip/components/uni-tooltip/uni-tooltip.vue b/uni_modules/uni-tooltip/components/uni-tooltip/uni-tooltip.vue
new file mode 100644
index 0000000..ffbb6fa
--- /dev/null
+++ b/uni_modules/uni-tooltip/components/uni-tooltip/uni-tooltip.vue
@@ -0,0 +1,68 @@
+<template>
+	<view class="uni-tooltip">
+		<slot></slot>
+		<view v-if="content || $slots.content" class="uni-tooltip-popup">
+			<slot name="content">
+				{{content}}
+			</slot>
+		</view>
+	</view>
+</template>
+
+
+<script>
+	/**
+	 * Tooltip 提示文字
+	 * @description 常用于展示鼠标 hover 时的提示信息。
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-tooltip
+	 * @property {String} content   弹出层显示的内容
+	 * @property {String}  placement出现位置, 目前只支持 left
+	 */
+
+
+	export default {
+		name: "uni-tooltip",
+		data() {
+			return {
+
+			};
+		},
+		props: {
+			content: {
+				type: String,
+				default: ''
+			},
+
+			placement: {
+				type: String,
+				default: 'bottom'
+			},
+		}
+	}
+</script>
+
+<style>
+	.uni-tooltip {
+		position: relative;
+		cursor: pointer;
+	}
+
+	.uni-tooltip-popup {
+		z-index: 1;
+		display: none;
+		position: absolute;
+		left: 0;
+		background-color: #333;
+		border-radius: 8px;
+		color: #fff;
+		font-size: 12px;
+		text-align: left;
+		line-height: 16px;
+		padding: 12px;
+	}
+
+
+	.uni-tooltip:hover .uni-tooltip-popup {
+		display: block;
+	}
+</style>
diff --git a/uni_modules/uni-tooltip/package.json b/uni_modules/uni-tooltip/package.json
new file mode 100644
index 0000000..b626efb
--- /dev/null
+++ b/uni_modules/uni-tooltip/package.json
@@ -0,0 +1,83 @@
+{
+  "id": "uni-tooltip",
+  "displayName": "uni-tooltip",
+  "version": "0.2.1",
+  "description": "Tooltip 提示文字",
+  "keywords": [
+    "uni-tooltip",
+    "uni-ui",
+    "tooltip",
+    "tip",
+    "文字提示"
+],
+  "repository": "",
+"engines": {
+  },
+  "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": "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",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-tooltip/readme.md b/uni_modules/uni-tooltip/readme.md
new file mode 100644
index 0000000..faafa2e
--- /dev/null
+++ b/uni_modules/uni-tooltip/readme.md
@@ -0,0 +1,8 @@
+## Badge 数字角标
+> **组件名：uni-tooltip**
+> 代码块： `uTooltip`
+
+数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景，
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-tooltip)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-transition/changelog.md b/uni_modules/uni-transition/changelog.md
new file mode 100644
index 0000000..b1a824b
--- /dev/null
+++ b/uni_modules/uni-transition/changelog.md
@@ -0,0 +1,20 @@
+## 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..5f54365
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
@@ -0,0 +1,128 @@
+// 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
+		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..0d739bd
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -0,0 +1,277 @@
+<template>
+	<view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+</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: ''
+		}
+	},
+	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..d15fdf0
--- /dev/null
+++ b/uni_modules/uni-transition/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-transition",
+  "displayName": "uni-transition 过渡动画",
+  "version": "1.3.1",
+  "description": "元素的简单过渡动画",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "动画",
+    "过渡",
+    "过渡动画"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["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/vk-uview-ui/changelog.md b/uni_modules/vk-uview-ui/changelog.md
new file mode 100644
index 0000000..95c58b1
--- /dev/null
+++ b/uni_modules/vk-uview-ui/changelog.md
@@ -0,0 +1,135 @@
+## 1.4.5（2022-12-05）
+* 【修复】`u-row`、`u-col` 使用 `@click.stop` 会报错的问题，同时建议改用 `@click.native.stop` 来代替 `@click.stop`
+## 1.4.4（2022-11-12）
+* 【修复】`u-calendar` `u-modal` `u-picker` `u-popup` 组件在页面进入后马上需要弹窗时，无法正常弹窗的问题。
+## 1.4.3（2022-10-22）
+* 【优化】部分组件的细节
+## 1.4.2（2022-10-15）
+* 【修复】`1.4.1` 引出的 `u-subsection` 的部分问题
+## 1.4.1（2022-10-14）
+* 【修复】`u-count-to` 若设置了千分位符合，会错误显示-的问题
+* 【修复】`u-subsection` 部分细节问题
+## 1.4.0（2022-10-07）
+* 【修复】`u-section` 点击更多，会触发两次事件的问题
+* 【修复】`loadMore` 加载更多，icon-type为circle不会转动的问题
+* 【修复】`u-subsection` current 有转入值时，变更值，样式不更新（需用 `v-model="current"` 代替 `:current="current"`）
+## 1.3.13（2022-09-28）
+* 【修复】`u-avatar-cropper` 组件在vue3中会报错的问题。
+## 1.3.12（2022-08-30）
+* 【优化】`u-keyboard` 组件内部细节。
+## 1.3.11（2022-08-30）
+* 【修复】`u-subsection` 组件的 `list` 属性不支持动态修改的问题。
+## 1.3.10（2022-07-30）
+* 【优化】上传组件部分细节
+## 1.3.9（2022-07-07）
+* 【更新】省市区数据源
+* 【优化】`u-subsection` 组件支持在右上角显示数字角标 
+```html
+<template>
+	<u-subsection :list="list"></u-subsection>
+</template>
+```
+
+```js
+export default {
+	data() {
+		return {
+			list: [
+				{
+					name: '待发货',
+					num: 10
+				}, 
+				{
+					name: '待付款',
+					num: 5
+				}, 
+				{
+					name: '待评价',
+					num: 15
+				}
+			]
+		}
+	}
+}
+```
+## 1.3.8（2022-06-13）
+* 【优化】组件 `u-icon`，使之更方便的兼容第三方icon（满足规则自动计算customPrefix）
+**规则如下：**
+* 当 `name` 中包含 `-icon-` 字符串时
+* 如 `vk-icon-goods`，则组件的 `customPrefix` 属性自动识别为 `vk-icon` ，`name`属性 自动识别为 `goods`
+* 如 `vk-2-icon-goods-list`，则组件的 `customPrefix` 属性自动识别为 `vk-2-icon` ，`name`属性 自动识别为 `goods-list`
+## 1.3.7（2022-06-10）
+* 【优化】组件 `u-action-sheet` `u-calendar` `u-dropdown-item` `u-field` `u-input` `u-keyboard` `u-modal` `u-radio-group` `u-rate` `u-search` `u-slider` `u-switch` `u-tabbar` `u-waterfall` 在 `vue3` 模式下的细节问题。
+## 1.3.6（2022-06-10）
+* 【优化】组件 `u-action-sheet` `u-calendar` `u-dropdown-item` `u-field` `u-input` `u-keyboard` `u-modal` `u-radio-group` `u-rate` `u-search` `u-slider` `u-switch` `u-tabbar` `u-waterfall` 在 `vue3` 模式下的细节问题。
+## 1.3.5（2022-05-28）
+* 【优化】组件 `u-mask` `u-popup` `u-select` `u-modal` `u-keyboard` `u-calendar` `u-action-sheet` `u-picker` 均新增 `blur` 属性，可用于设置弹出遮罩的模糊度，默认为0（不模糊）
+* ![](https://vkceyugu.cdn.bspapp.com/VKCEYUGU-cf0c5e69-620c-4f3c-84ab-f4619262939f/49b773a3-273f-4b1c-95e8-a42dcba1a53c.png)
+## 1.3.4（2022-05-03）
+* 【修复】`u-tabs` 组件细节问题。
+## 1.1.4（2022-03-22）
+* 【修复】`u-field` 组件 `arrowDirection` 属性无效的问题。
+## 1.1.3（2022-03-21）
+* 【优化】部分细节。
+## 1.1.2（2022-03-21）
+* 【优化】部分细节。
+## 1.1.1（2022-03-17）
+* 【优化】部分细节。
+## 1.1.0（2022-03-12）
+* 【重要】`u-picker` 组件新增 `regionDiscern` 方法 智能识别省市区街道地址
+如将字符串 `浙江省杭州市西湖区希望路1333弄是啊我庭12号楼1203` 中识别为
+```json
+{
+	"province": {
+		"code": "330000",
+		"name": "浙江省"
+	},
+	"city": {
+		"code": "330100",
+		"name": "杭州市"
+	},
+	"area": {
+		"code": "330106",
+		"name": "西湖区"
+	},
+	"address": "龙井路1号",
+	"formatted_address": "浙江省杭州市西湖区龙井路1号"
+}
+```
+而组件的 `addressDiscern` 方法还可以识别收货信息，如 `张三 13888888888 上海市嘉定区希望路1333弄是啊我庭12号楼1203` 中识别姓名、手机号、地址（支持多种格式）
+## 1.0.13（2022-03-12）
+* 【优化】部分细节。
+## 1.0.12（2022-03-09）
+* 【修复】`u-radio-group` 在 vue3 模式下，设置默认值可能会无效的问题。
+## 1.0.11（2022-03-07）
+* 【优化】部分细节。
+## 1.0.10（2022-03-05）
+* 【修复】`u-radio` 中的值相等的判断 == 改为 === 
+* 【优化】部分注释的错别字。
+## 1.0.9（2022-03-03）
+* 【修复】`u-parse` 在 vue3模式下编译到app无法正常显示的问题。
+## 1.0.8（2022-02-26）
+* 【优化】`u-form` 组件新增2个属性 `inputAlign` 和 `clearable` 用于统一设置表单内所有 `u-input` 组件的对应属性默认值
+* 【优化】更新城市数据源信息
+## 1.0.7（2022-02-25）
+* 【重要】`u-picker` 组件新增 `addressDiscern` 方法 智能识别收货信息
+
+如在 `张三 13888888888 上海市嘉定区希望路1333弄是啊我庭12号楼1203` 中识别姓名、手机号、地址（支持多种格式）
+即使这样的字符串也能识别 `!!!!~~~$张三~~~上海市嘉定区希望路1333弄是啊我庭12号楼1203【【【【13888888888】`
+## 1.0.6（2022-02-24）
+* 【优化】`u-form-item` 组件的 `prop` 属性支持 a.b 形式
+## 1.0.5（2022-01-11）
+* 【修复】`u-sticky` 组件 在微信小程序中无法正常吸顶的问题
+## 1.0.4（2021-12-31）
+* 【优化】`u-dropdown-item` 组件 0和"" 无法区分的问题。
+* 【修复】`u-modal` 在Vue3版本中使用了mask-close-able属性无效的问题
+## 1.0.3（2021-12-20）
+【优化】u-icon在微信小程序下可能会显示null字符串的问题
+## 1.0.2（2021-12-09）
+* 1、【优化】`u-button` 组件新增 `timerId` 属性
+* 之前的效果是：所有按钮一定时间内只能点击1次（`共用计算时间`）导致点击按钮A后无法马上点击按钮B
+* 优化的效果是：每个按钮一定时间内只能点击1次（`分开计算时间`）且支持设置相同的 timerId 来达到指定按钮 `共用计算时间`
+## 1.0.1（2021-11-22）
+* 修复 u-parse 组件在微信小程序上的显示问题。
+## 1.0.0（2021-11-18）
+uView Vue3.0 横空出世，继承uView1.0意志，再战江湖，风云再起！by vk 2021-11-18
diff --git a/uni_modules/vk-uview-ui/components/u-action-sheet/u-action-sheet.vue b/uni_modules/vk-uview-ui/components/u-action-sheet/u-action-sheet.vue
new file mode 100644
index 0000000..c5261a1
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-action-sheet/u-action-sheet.vue
@@ -0,0 +1,246 @@
+<template>
+	<u-popup
+		:blur="blur"
+		mode="bottom"
+		:border-radius="borderRadius"
+		:popup="false"
+		v-model="popupValue"
+		:maskCloseAble="maskCloseAble"
+		length="auto"
+		:safeAreaInsetBottom="safeAreaInsetBottom"
+		@close="popupClose"
+		:z-index="uZIndex"
+	>
+		<view class="u-tips u-border-bottom" v-if="tips.text" :style="[tipsStyle]">
+			<text>{{ tips.text }}</text>
+		</view>
+		<block v-for="(item, index) in list" :key="index">
+			<view
+				@touchmove.stop.prevent
+				@tap="itemClick(index)"
+				:style="[itemStyle(index)]"
+				class="u-action-sheet-item u-line-1"
+				:class="[index < list.length - 1 ? 'u-border-bottom' : '']"
+				:hover-stay-time="150"
+			>
+				<text>{{ item[labelName] }}</text>
+				<text class="u-action-sheet-item__subtext u-line-1" v-if="item.subText">
+					{{ item.subText }}
+				</text>
+			</view>
+		</block>
+		<view class="u-gab" v-if="cancelBtn"></view>
+		<view
+			@touchmove.stop.prevent
+			class="u-actionsheet-cancel u-action-sheet-item"
+			hover-class="u-hover-class"
+			:hover-stay-time="150"
+			v-if="cancelBtn"
+			@tap="close"
+		>
+			{{ cancelText }}
+		</view>
+	</u-popup>
+</template>
+
+<script>
+/**
+ * actionSheet 操作菜单
+ * @description 本组件用于从底部弹出一个操作菜单，供用户选择并返回结果。本组件功能类似于uni的uni.showActionSheetAPI，配置更加灵活，所有平台都表现一致。
+ * @tutorial https://www.uviewui.com/components/actionSheet.html
+ * @property {Array<Object>} list 按钮的文字数组，见官方文档示例
+ * @property {Object} tips 顶部的提示文字，见官方文档示例
+ * @property {String} cancel-text 取消按钮的提示文字
+ * @property {Boolean} cancel-btn 是否显示底部的取消按钮（默认true）
+ * @property {Number String} border-radius 弹出部分顶部左右的圆角值，单位rpx（默认0）
+ * @property {Boolean} mask-close-able 点击遮罩是否可以关闭（默认true）
+ * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配（默认false）
+ * @property {Number String} z-index z-index值（默认1075）
+ * @property {String} cancel-text 取消按钮的提示文字
+ * @event {Function} click 点击ActionSheet列表项时触发
+ * @event {Function} close 点击取消按钮时触发
+ * @example <u-action-sheet :list="list" @click="click" v-model="show"></u-action-sheet>
+ */
+
+export default {
+	name: "u-action-sheet",
+	emits: ["update:modelValue", "input", "click", "close"],
+	props: {
+		// 通过双向绑定控制组件的弹出与收起
+		value: {
+			type: Boolean,
+			default: false
+		},
+		modelValue: {
+			type: Boolean,
+			default: false
+		},
+		// 点击遮罩是否可以关闭actionsheet
+		maskCloseAble: {
+			type: Boolean,
+			default: true
+		},
+		// 按钮的文字数组，可以自定义颜色和字体大小，字体单位为rpx
+		list: {
+			type: Array,
+			default() {
+				// 如下
+				// return [{
+				// 	text: '确定',
+				// 	color: '',
+				// 	fontSize: ''
+				// }]
+				return [];
+			}
+		},
+		// 顶部的提示文字
+		tips: {
+			type: Object,
+			default() {
+				return {
+					text: "",
+					color: "",
+					fontSize: "26"
+				};
+			}
+		},
+		// 底部的取消按钮
+		cancelBtn: {
+			type: Boolean,
+			default: true
+		},
+		// 是否开启底部安全区适配，开启的话，会在iPhoneX机型底部添加一定的内边距
+		safeAreaInsetBottom: {
+			type: Boolean,
+			default: false
+		},
+		// 弹出的顶部圆角值
+		borderRadius: {
+			type: [String, Number],
+			default: 0
+		},
+		// 弹出的z-index值
+		zIndex: {
+			type: [String, Number],
+			default: 0
+		},
+		// 取消按钮的文字提示
+		cancelText: {
+			type: String,
+			default: "取消"
+		},
+		// 自定义label属性名
+		labelName: {
+			type: String,
+			default: "text"
+		},
+		// 遮罩的模糊度
+		blur: {
+			type: [Number, String],
+			default: 0
+		}
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		// 顶部提示的样式
+		tipsStyle() {
+			let style = {};
+			if (this.tips.color) style.color = this.tips.color;
+			if (this.tips.fontSize) style.fontSize = this.tips.fontSize + "rpx";
+			return style;
+		},
+		// 操作项目的样式
+		itemStyle() {
+			return index => {
+				let style = {};
+				if (this.list[index].color) style.color = this.list[index].color;
+				if (this.list[index].fontSize) style.fontSize = this.list[index].fontSize + "rpx";
+				// 选项被禁用的样式
+				if (this.list[index].disabled) style.color = "#c0c4cc";
+				return style;
+			};
+		},
+		uZIndex() {
+			// 如果用户有传递z-index值，优先使用
+			return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+		}
+	},
+	data() {
+		return {
+			popupValue: false
+		};
+	},
+	watch: {
+		valueCom(v1, v2) {
+			this.popupValue = v1;
+		}
+	},
+	methods: {
+		// 点击取消按钮
+		close() {
+			// 发送input事件，并不会作用于父组件，而是要设置组件内部通过props传递的value参数
+			// 这是一个vue发送事件的特殊用法
+			this.popupClose();
+			this.$emit("close");
+		},
+		// 弹窗关闭
+		popupClose() {
+			this.$emit("input", false);
+			this.$emit("update:modelValue", false);
+		},
+		// 点击某一个item
+		itemClick(index) {
+			// disabled的项禁止点击
+			if (this.list[index].disabled) return;
+			this.$emit("click", index);
+			this.$emit("input", false);
+			this.$emit("update:modelValue", false);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-tips {
+	font-size: 26rpx;
+	text-align: center;
+	padding: 34rpx 0;
+	line-height: 1.5;
+	color: $u-tips-color;
+}
+
+.u-action-sheet-item {
+	@include vue-flex;
+	line-height: 1;
+	justify-content: center;
+	align-items: center;
+	font-size: 32rpx;
+	padding: 34rpx 0;
+	flex-direction: column;
+}
+
+.u-action-sheet-item__subtext {
+	font-size: 24rpx;
+	color: $u-tips-color;
+	margin-top: 20rpx;
+}
+
+.u-gab {
+	height: 12rpx;
+	background-color: rgb(234, 234, 236);
+}
+
+.u-actionsheet-cancel {
+	color: $u-main-color;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-alert-tips/u-alert-tips.vue b/uni_modules/vk-uview-ui/components/u-alert-tips/u-alert-tips.vue
new file mode 100644
index 0000000..48b3d85
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-alert-tips/u-alert-tips.vue
@@ -0,0 +1,257 @@
+<template>
+	<view class="u-alert-tips" v-if="show" :class="[
+		!show ? 'u-close-alert-tips': '',
+		type ? 'u-alert-tips--bg--' + type + '-light' : '',
+		type ? 'u-alert-tips--border--' + type + '-disabled' : '',
+	]" :style="{
+		backgroundColor: bgColor,
+		borderColor: borderColor
+	}">
+		<view class="u-icon-wrap">
+			<u-icon v-if="showIcon" :name="uIcon" :size="description ? 40 : 32" class="u-icon" :color="uIconType" :custom-style="iconStyle"></u-icon>
+		</view>
+		<view class="u-alert-content" @tap.stop="click">
+			<view class="u-alert-title" :style="[uTitleStyle]">
+				{{title}}
+			</view>
+			<view v-if="description" class="u-alert-desc" :style="[descStyle]">
+				{{description}}
+			</view>
+		</view>
+		<view class="u-icon-wrap">
+			<u-icon @click="close" v-if="closeAble && !closeText" hoverClass="u-type-error-hover-color" name="close" color="#c0c4cc"
+			 :size="22" class="u-close-icon" :style="{
+				top: description ? '18rpx' : '24rpx'
+			}"></u-icon>
+		</view>
+		<text v-if="closeAble && closeText" class="u-close-text" :style="{
+			top: description ? '18rpx' : '24rpx'
+		}">{{closeText}}</text>
+	</view>
+</template>
+
+<script>
+	/**
+	 * alertTips 警告提示
+	 * @description 警告提示，展现需要关注的信息
+	 * @tutorial https://uviewui.com/components/alertTips.html
+	 * @property {String} title 显示的标题文字
+	 * @property {String} description 辅助性文字，颜色比title浅一点，字号也小一点，可选
+	 * @property {String} type 关闭按钮(默认为叉号icon图标)
+	 * @property {String} icon 图标名称
+	 * @property {Object} icon-style 图标的样式，对象形式
+	 * @property {Object} title-style 标题的样式，对象形式
+	 * @property {Object} desc-style 描述的样式，对象形式
+	 * @property {String} close-able 用文字替代关闭图标，close-able为true时有效
+	 * @property {Boolean} show-icon 是否显示左边的辅助图标
+	 * @property {Boolean} show 显示或隐藏组件
+	 * @event {Function} click 点击组件时触发
+	 * @event {Function} close 点击关闭按钮时触发
+	 */
+	export default {
+		name: 'u-alert-tips',
+    emits: ["click", "close"],
+		props: {
+			// 显示文字
+			title: {
+				type: String,
+				default: ''
+			},
+			// 主题，success/warning/info/error
+			type: {
+				type: String,
+				default: 'warning'
+			},
+			// 辅助性文字
+			description: {
+				type: String,
+				default: ''
+			},
+			// 是否可关闭
+			closeAble: {
+				type: Boolean,
+				default: false
+			},
+			// 关闭按钮自定义文本
+			closeText: {
+				type: String,
+				default: ''
+			},
+			// 是否显示图标
+			showIcon: {
+				type: Boolean,
+				default: false
+			},
+			// 文字颜色，如果定义了color值，icon会失效
+			color: {
+				type: String,
+				default: ''
+			},
+			// 背景颜色
+			bgColor: {
+				type: String,
+				default: ''
+			},
+			// 边框颜色
+			borderColor: {
+				type: String,
+				default: ''
+			},
+			// 是否显示
+			show: {
+				type: Boolean,
+				default: true
+			},
+			// 左边显示的icon
+			icon: {
+				type: String,
+				default: ''
+			},
+			// icon的样式
+			iconStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+			// 标题的样式
+			titleStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+			// 描述文字的样式
+			descStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+		},
+		data() {
+			return {
+			}
+		},
+		computed: {
+			uTitleStyle() {
+				let style = {};
+				// 如果有描述文字的话，标题进行加粗
+				style.fontWeight = this.description ? 500 : 'normal';
+				// 将用户传入样式对象和style合并，传入的优先级比style高，同属性会被覆盖
+				return this.$u.deepMerge(style, this.titleStyle);
+			},
+			uIcon() {
+				// 如果有设置icon名称就使用，否则根据type主题，推定一个默认的图标
+				return this.icon ? this.icon : this.$u.type2icon(this.type);
+			},
+			uIconType() {
+				// 如果有设置图标的样式，优先使用，没有的话，则用type的样式
+				return Object.keys(this.iconStyle).length ? '' : this.type;
+			}
+		},
+		methods: {
+			// 点击内容
+			click() {
+				this.$emit('click');
+			},
+			// 点击关闭按钮
+			close() {
+				this.$emit('close');
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-alert-tips {
+		@include vue-flex;
+		align-items: center;
+		padding: 16rpx 30rpx;
+		border-radius: 8rpx;
+		position: relative;
+		transition: all 0.3s linear;
+		border: 1px solid #fff;
+		
+		&--bg--primary-light {
+			background-color: $u-type-primary-light;
+		}
+		
+		&--bg--info-light {
+			background-color: $u-type-info-light;
+		}
+		
+		&--bg--success-light {
+			background-color: $u-type-success-light;
+		}
+		
+		&--bg--warning-light {
+			background-color: $u-type-warning-light;
+		}
+		
+		&--bg--error-light {
+			background-color: $u-type-error-light;
+		}
+		
+		&--border--primary-disabled {
+			border-color: $u-type-primary-disabled;
+		}
+		
+		&--border--success-disabled {
+			border-color: $u-type-success-disabled;
+		}
+		
+		&--border--error-disabled {
+			border-color: $u-type-error-disabled;
+		}
+		
+		&--border--warning-disabled {
+			border-color: $u-type-warning-disabled;
+		}
+		
+		&--border--info-disabled {
+			border-color: $u-type-info-disabled;
+		}
+	}
+
+	.u-close-alert-tips {
+		opacity: 0;
+		visibility: hidden;
+	}
+
+	.u-icon {
+		margin-right: 16rpx;
+	}
+
+	.u-alert-title {
+		font-size: 28rpx;
+		color: $u-main-color;
+	}
+
+	.u-alert-desc {
+		font-size: 26rpx;
+		text-align: left;
+		color: $u-content-color;
+	}
+
+	.u-close-icon {
+		position: absolute;
+		top: 20rpx;
+		right: 20rpx;
+	}
+
+	.u-close-hover {
+		color: red;
+	}
+	
+	.u-close-text {
+		font-size: 24rpx;
+		color: $u-tips-color;
+		position: absolute;
+		top: 20rpx;
+		right: 20rpx;
+		line-height: 1;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue b/uni_modules/vk-uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue
new file mode 100644
index 0000000..a48dd54
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue
@@ -0,0 +1,290 @@
+<template>
+	<view class="content">
+		<view class="cropper-wrapper" :style="{ height: cropperOpt.height + 'px' }">
+			<canvas
+				class="cropper"
+				:disable-scroll="true"
+				@touchstart="touchStart"
+				@touchmove="touchMove"
+				@touchend="touchEnd"
+				:style="{ width: cropperOpt.width, height: cropperOpt.height, backgroundColor: 'rgba(0, 0, 0, 0.8)' }"
+				canvas-id="cropper"
+				id="cropper"
+			></canvas>
+			<canvas
+				class="cropper"
+				:disable-scroll="true"
+				:style="{
+					position: 'fixed',
+					top: `-${cropperOpt.width * cropperOpt.pixelRatio}px`,
+					left: `-${cropperOpt.height * cropperOpt.pixelRatio}px`,
+					width: `${cropperOpt.width * cropperOpt.pixelRatio}px`,
+					height: `${cropperOpt.height * cropperOpt.pixelRatio}`
+				}"
+				canvas-id="targetId"
+				id="targetId"
+			></canvas>
+		</view>
+		<view class="cropper-buttons safe-area-padding" :style="{ height: bottomNavHeight + 'px' }">
+			<!-- #ifdef H5 -->
+			<view class="upload" @tap="uploadTap">选择图片</view>
+			<!-- #endif -->
+			<!-- #ifndef H5 -->
+			<view class="upload" @tap="uploadTap">重新选择</view>
+			<!-- #endif -->
+			<view class="getCropperImage" @tap="getCropperImage(false)">确定</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import WeCropper from './weCropper.js';
+export default {
+	props: {
+		// 裁剪矩形框的样式，其中可包含的属性为lineWidth-边框宽度(单位rpx)，color: 边框颜色，
+		// mask-遮罩颜色，一般设置为一个rgba的透明度，如"rgba(0, 0, 0, 0.35)"
+		boundStyle: {
+			type: Object,
+			default() {
+				return {
+					lineWidth: 4,
+					borderColor: 'rgb(245, 245, 245)',
+					mask: 'rgba(0, 0, 0, 0.35)'
+				};
+			}
+		}
+		// // 裁剪框宽度，单位rpx
+		// rectWidth: {
+		// 	type: [String, Number],
+		// 	default: 400
+		// },
+		// // 裁剪框高度，单位rpx
+		// rectHeight: {
+		// 	type: [String, Number],
+		// 	default: 400
+		// },
+		// // 输出图片宽度，单位rpx
+		// destWidth: {
+		// 	type: [String, Number],
+		// 	default: 400
+		// },
+		// // 输出图片高度，单位rpx
+		// destHeight: {
+		// 	type: [String, Number],
+		// 	default: 400
+		// },
+		// // 输出的图片类型，如果发现裁剪的图片很大，可能是因为设置为了"png"，改成"jpg"即可
+		// fileType: {
+		// 	type: String,
+		// 	default: 'jpg',
+		// },
+		// // 生成的图片质量
+		// // H5上无效，目前不考虑使用此参数
+		// quality: {
+		// 	type: [Number, String],
+		// 	default: 1
+		// }
+	},
+	data() {
+		return {
+			// 底部导航的高度
+			bottomNavHeight: 50,
+			originWidth: 200,
+			width: 0,
+			height: 0,
+			cropperOpt: {
+				id: 'cropper',
+				targetId: 'targetCropper',
+				pixelRatio: 1,
+				width: 0,
+				height: 0,
+				scale: 2.5,
+				zoom: 8,
+				cut: {
+					x: (this.width - this.originWidth) / 2,
+					y: (this.height - this.originWidth) / 2,
+					width: this.originWidth,
+					height: this.originWidth
+				},
+				boundStyle: {
+					lineWidth: uni.upx2px(this.boundStyle.lineWidth),
+					mask: this.boundStyle.mask,
+					color: this.boundStyle.borderColor
+				}
+			},
+			// 裁剪框和输出图片的尺寸，高度默认等于宽度
+			// 输出图片宽度，单位px
+			destWidth: 200,
+			// 裁剪框宽度，单位px
+			rectWidth: 200,
+			// 输出的图片类型，如果'png'类型发现裁剪的图片太大，改成"jpg"即可
+			fileType: 'jpg',
+			src: '', // 选择的图片路径，用于在点击确定时，判断是否选择了图片
+		};
+	},
+	onLoad(option) {
+		let rectInfo = uni.getSystemInfoSync();
+		this.width = rectInfo.windowWidth;
+		this.height = rectInfo.windowHeight - this.bottomNavHeight;
+		this.cropperOpt.width = this.width;
+		this.cropperOpt.height = this.height;
+		this.cropperOpt.pixelRatio = rectInfo.pixelRatio;
+
+		if (option.destWidth) this.destWidth = option.destWidth;
+		if (option.rectWidth) {
+			let rectWidth = Number(option.rectWidth);
+			this.cropperOpt.cut = {
+				x: (this.width - rectWidth) / 2,
+				y: (this.height - rectWidth) / 2,
+				width: rectWidth,
+				height: rectWidth
+			};
+		}
+		this.rectWidth = option.rectWidth;
+		if (option.fileType) this.fileType = option.fileType;
+		// 初始化
+		this.cropper = new WeCropper(this.cropperOpt)
+			.on('ready', ctx => {
+				// wecropper is ready for work!
+			})
+			.on('beforeImageLoad', ctx => {
+				// before picture loaded, i can do something
+			})
+			.on('imageLoad', ctx => {
+				// picture loaded
+			})
+			.on('beforeDraw', (ctx, instance) => {
+				// before canvas draw,i can do something
+			});
+		// 设置导航栏样式，以免用户在page.json中没有设置为黑色背景
+		uni.setNavigationBarColor({
+			frontColor: '#ffffff',
+			backgroundColor: '#000000'
+		});
+		uni.chooseImage({
+			count: 1, // 默认9
+			sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
+			sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+			success: res => {
+				this.src = res.tempFilePaths[0];
+				//  获取裁剪图片资源后，给data添加src属性及其值
+				this.cropper.pushOrign(this.src);
+			}
+		});
+	},
+	methods: {
+		touchStart(e) {
+			this.cropper.touchStart(e);
+		},
+		touchMove(e) {
+			this.cropper.touchMove(e);
+		},
+		touchEnd(e) {
+			this.cropper.touchEnd(e);
+		},
+		getCropperImage(isPre = false) {
+			if(!this.src) return this.$u.toast('请先选择图片再裁剪');
+
+			let cropper_opt = {
+				destHeight: Number(this.destWidth), // uni.canvasToTempFilePath要求这些参数为数值
+				destWidth: Number(this.destWidth),
+				fileType: this.fileType
+			};
+			this.cropper.getCropperImage(cropper_opt, (path, err) => {
+				if (err) {
+					uni.showModal({
+						title: '温馨提示',
+						content: err.message
+					});
+				} else {
+					if (isPre) {
+						uni.previewImage({
+							current: '', // 当前显示图片的 http 链接
+							urls: [path] // 需要预览的图片 http 链接列表
+						});
+					} else {
+						uni.$emit('uAvatarCropper', path);
+						this.$u.route({
+							type: 'back'
+						});
+					}
+				}
+			});
+		},
+		uploadTap() {
+			const self = this;
+			uni.chooseImage({
+				count: 1, // 默认9
+				sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+				sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+				success: (res) => {
+					self.src = res.tempFilePaths[0];
+					//  获取裁剪图片资源后，给data添加src属性及其值
+
+					self.cropper.pushOrign(this.src);
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import '../../libs/css/style.components.scss';
+
+.content {
+	background: rgba(255, 255, 255, 1);
+}
+
+.cropper {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	z-index: 11;
+}
+
+.cropper-buttons {
+	background-color: #000000;
+	color: #eee;
+}
+
+.cropper-wrapper {
+	position: relative;
+	@include vue-flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	background-color: #000;
+}
+
+.cropper-buttons {
+	width: 100vw;
+	@include vue-flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	font-size: 28rpx;
+}
+
+.cropper-buttons .upload,
+.cropper-buttons .getCropperImage {
+	width: 50%;
+	text-align: center;
+}
+
+.cropper-buttons .upload {
+	text-align: left;
+	padding-left: 50rpx;
+}
+
+.cropper-buttons .getCropperImage {
+	text-align: right;
+	padding-right: 50rpx;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-avatar-cropper/weCropper.js b/uni_modules/vk-uview-ui/components/u-avatar-cropper/weCropper.js
new file mode 100644
index 0000000..6dac900
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-avatar-cropper/weCropper.js
@@ -0,0 +1,1256 @@
+/**
+ * we-cropper v1.3.9
+ * (c) 2020 dlhandsome
+ * @license MIT
+ */
+'use strict';
+
+var device = void 0;
+var TOUCH_STATE = ['touchstarted', 'touchmoved', 'touchended'];
+
+function firstLetterUpper(str) {
+	return str.charAt(0).toUpperCase() + str.slice(1)
+}
+
+function setTouchState(instance) {
+	var arg = [],
+		len = arguments.length - 1;
+	while (len-- > 0) arg[len] = arguments[len + 1];
+
+	TOUCH_STATE.forEach(function(key, i) {
+		if (arg[i] !== undefined) {
+			instance[key] = arg[i];
+		}
+	});
+}
+
+function validator(instance, o) {
+	Object.defineProperties(instance, o);
+}
+
+function getDevice() {
+	if (!device) {
+		device = uni.getSystemInfoSync();
+	}
+	return device
+}
+
+var tmp = {};
+
+var ref = getDevice();
+var pixelRatio = ref.pixelRatio;
+
+var DEFAULT = {
+	id: {
+		default: 'cropper',
+		get: function get() {
+			return tmp.id
+		},
+		set: function set(value) {
+			if (typeof(value) !== 'string') {
+				console.error(("id：" + value + " is invalid"));
+			}
+			tmp.id = value;
+		}
+	},
+	width: {
+		default: 750,
+		get: function get() {
+			return tmp.width
+		},
+		set: function set(value) {
+			if (typeof(value) !== 'number') {
+				console.error(("width：" + value + " is invalid"));
+			}
+			tmp.width = value;
+		}
+	},
+	height: {
+		default: 750,
+		get: function get() {
+			return tmp.height
+		},
+		set: function set(value) {
+			if (typeof(value) !== 'number') {
+				console.error(("height：" + value + " is invalid"));
+			}
+			tmp.height = value;
+		}
+	},
+	pixelRatio: {
+		default: pixelRatio,
+		get: function get() {
+			return tmp.pixelRatio
+		},
+		set: function set(value) {
+			if (typeof(value) !== 'number') {
+				console.error(("pixelRatio：" + value + " is invalid"));
+			}
+			tmp.pixelRatio = value;
+		}
+	},
+	scale: {
+		default: 2.5,
+		get: function get() {
+			return tmp.scale
+		},
+		set: function set(value) {
+			if (typeof(value) !== 'number') {
+				console.error(("scale：" + value + " is invalid"));
+			}
+			tmp.scale = value;
+		}
+	},
+	zoom: {
+		default: 5,
+		get: function get() {
+			return tmp.zoom
+		},
+		set: function set(value) {
+			if (typeof(value) !== 'number') {
+				console.error(("zoom：" + value + " is invalid"));
+			} else if (value < 0 || value > 10) {
+				console.error("zoom should be ranged in 0 ~ 10");
+			}
+			tmp.zoom = value;
+		}
+	},
+	src: {
+		default: '',
+		get: function get() {
+			return tmp.src
+		},
+		set: function set(value) {
+			if (typeof(value) !== 'string') {
+				console.error(("src：" + value + " is invalid"));
+			}
+			tmp.src = value;
+		}
+	},
+	cut: {
+		default: {},
+		get: function get() {
+			return tmp.cut
+		},
+		set: function set(value) {
+			if (typeof(value) !== 'object') {
+				console.error(("cut：" + value + " is invalid"));
+			}
+			tmp.cut = value;
+		}
+	},
+	boundStyle: {
+		default: {},
+		get: function get() {
+			return tmp.boundStyle
+		},
+		set: function set(value) {
+			if (typeof(value) !== 'object') {
+				console.error(("boundStyle：" + value + " is invalid"));
+			}
+			tmp.boundStyle = value;
+		}
+	},
+	onReady: {
+		default: null,
+		get: function get() {
+			return tmp.ready
+		},
+		set: function set(value) {
+			tmp.ready = value;
+		}
+	},
+	onBeforeImageLoad: {
+		default: null,
+		get: function get() {
+			return tmp.beforeImageLoad
+		},
+		set: function set(value) {
+			tmp.beforeImageLoad = value;
+		}
+	},
+	onImageLoad: {
+		default: null,
+		get: function get() {
+			return tmp.imageLoad
+		},
+		set: function set(value) {
+			tmp.imageLoad = value;
+		}
+	},
+	onBeforeDraw: {
+		default: null,
+		get: function get() {
+			return tmp.beforeDraw
+		},
+		set: function set(value) {
+			tmp.beforeDraw = value;
+		}
+	}
+};
+
+var ref$1 = getDevice();
+var windowWidth = ref$1.windowWidth;
+
+function prepare() {
+	var self = this;
+
+	// v1.4.0 版本中将不再自动绑定we-cropper实例
+	self.attachPage = function() {
+		var pages = getCurrentPages();
+		// 获取到当前page上下文
+		var pageContext = pages[pages.length - 1];
+		// 把this依附在Page上下文的wecropper属性上，便于在page钩子函数中访问
+		Object.defineProperty(pageContext, 'wecropper', {
+			get: function get() {
+				console.warn(
+					'Instance will not be automatically bound to the page after v1.4.0\n\n' +
+					'Please use a custom instance name instead\n\n' +
+					'Example: \n' +
+					'this.mycropper = new WeCropper(options)\n\n' +
+					'// ...\n' +
+					'this.mycropper.getCropperImage()'
+				);
+				return self
+			},
+			configurable: true
+		});
+	};
+
+	self.createCtx = function() {
+		var id = self.id;
+		var targetId = self.targetId;
+
+		if (id) {
+			self.ctx = self.ctx || uni.createCanvasContext(id);
+			self.targetCtx = self.targetCtx || uni.createCanvasContext(targetId);
+		} else {
+			console.error("constructor: create canvas context failed, 'id' must be valuable");
+		}
+	};
+
+	self.deviceRadio = windowWidth / 750;
+}
+
+var commonjsGlobal = typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !==
+	'undefined' ? self : {};
+
+
+
+
+
+function createCommonjsModule(fn, module) {
+	return module = {
+		exports: {}
+	}, fn(module, module.exports), module.exports;
+}
+
+var tools = createCommonjsModule(function(module, exports) {
+	/**
+	 * String type check
+	 */
+	exports.isStr = function(v) {
+		return typeof v === 'string';
+	};
+	/**
+	 * Number type check
+	 */
+	exports.isNum = function(v) {
+		return typeof v === 'number';
+	};
+	/**
+	 * Array type check
+	 */
+	exports.isArr = Array.isArray;
+	/**
+	 * undefined type check
+	 */
+	exports.isUndef = function(v) {
+		return v === undefined;
+	};
+
+	exports.isTrue = function(v) {
+		return v === true;
+	};
+
+	exports.isFalse = function(v) {
+		return v === false;
+	};
+	/**
+	 * Function type check
+	 */
+	exports.isFunc = function(v) {
+		return typeof v === 'function';
+	};
+	/**
+	 * Quick object check - this is primarily used to tell
+	 * Objects from primitive values when we know the value
+	 * is a JSON-compliant type.
+	 */
+	exports.isObj = exports.isObject = function(obj) {
+		return obj !== null && typeof obj === 'object'
+	};
+
+	/**
+	 * Strict object type check. Only returns true
+	 * for plain JavaScript objects.
+	 */
+	var _toString = Object.prototype.toString;
+	exports.isPlainObject = function(obj) {
+		return _toString.call(obj) === '[object Object]'
+	};
+
+	/**
+	 * Check whether the object has the property.
+	 */
+	var hasOwnProperty = Object.prototype.hasOwnProperty;
+	exports.hasOwn = function(obj, key) {
+		return hasOwnProperty.call(obj, key)
+	};
+
+	/**
+	 * Perform no operation.
+	 * Stubbing args to make Flow happy without leaving useless transpiled code
+	 * with ...rest (https://flow.org/blog/2017/05/07/Strict-Function-Call-Arity/)
+	 */
+	exports.noop = function(a, b, c) {};
+
+	/**
+	 * Check if val is a valid array index.
+	 */
+	exports.isValidArrayIndex = function(val) {
+		var n = parseFloat(String(val));
+		return n >= 0 && Math.floor(n) === n && isFinite(val)
+	};
+});
+
+var tools_7 = tools.isFunc;
+var tools_10 = tools.isPlainObject;
+
+var EVENT_TYPE = ['ready', 'beforeImageLoad', 'beforeDraw', 'imageLoad'];
+
+function observer() {
+	var self = this;
+
+	self.on = function(event, fn) {
+		if (EVENT_TYPE.indexOf(event) > -1) {
+			if (tools_7(fn)) {
+				event === 'ready' ?
+					fn(self) :
+					self[("on" + (firstLetterUpper(event)))] = fn;
+			}
+		} else {
+			console.error(("event: " + event + " is invalid"));
+		}
+		return self
+	};
+}
+
+function wxPromise(fn) {
+	return function(obj) {
+		var args = [],
+			len = arguments.length - 1;
+		while (len-- > 0) args[len] = arguments[len + 1];
+
+		if (obj === void 0) obj = {};
+		return new Promise(function(resolve, reject) {
+			obj.success = function(res) {
+				resolve(res);
+			};
+			obj.fail = function(err) {
+				reject(err);
+			};
+			fn.apply(void 0, [obj].concat(args));
+		})
+	}
+}
+
+function draw(ctx, reserve) {
+	if (reserve === void 0) reserve = false;
+
+	return new Promise(function(resolve) {
+		ctx.draw(reserve, resolve);
+	})
+}
+
+var getImageInfo = wxPromise(uni.getImageInfo);
+
+var canvasToTempFilePath = wxPromise(uni.canvasToTempFilePath);
+
+var base64 = createCommonjsModule(function(module, exports) {
+	/*! http://mths.be/base64 v0.1.0 by @mathias | MIT license */
+	(function(root) {
+
+		// Detect free variables `exports`.
+		var freeExports = 'object' == 'object' && exports;
+
+		// Detect free variable `module`.
+		var freeModule = 'object' == 'object' && module &&
+			module.exports == freeExports && module;
+
+		// Detect free variable `global`, from Node.js or Browserified code, and use
+		// it as `root`.
+		var freeGlobal = typeof commonjsGlobal == 'object' && commonjsGlobal;
+		if (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal) {
+			root = freeGlobal;
+		}
+
+		/*--------------------------------------------------------------------------*/
+
+		var InvalidCharacterError = function(message) {
+			this.message = message;
+		};
+		InvalidCharacterError.prototype = new Error;
+		InvalidCharacterError.prototype.name = 'InvalidCharacterError';
+
+		var error = function(message) {
+			// Note: the error messages used throughout this file match those used by
+			// the native `atob`/`btoa` implementation in Chromium.
+			throw new InvalidCharacterError(message);
+		};
+
+		var TABLE = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+		// http://whatwg.org/html/common-microsyntaxes.html#space-character
+		var REGEX_SPACE_CHARACTERS = /[\t\n\f\r ]/g;
+
+		// `decode` is designed to be fully compatible with `atob` as described in the
+		// HTML Standard. http://whatwg.org/html/webappapis.html#dom-windowbase64-atob
+		// The optimized base64-decoding algorithm used is based on @atk’s excellent
+		// implementation. https://gist.github.com/atk/1020396
+		var decode = function(input) {
+			input = String(input)
+				.replace(REGEX_SPACE_CHARACTERS, '');
+			var length = input.length;
+			if (length % 4 == 0) {
+				input = input.replace(/==?$/, '');
+				length = input.length;
+			}
+			if (
+				length % 4 == 1 ||
+				// http://whatwg.org/C#alphanumeric-ascii-characters
+				/[^+a-zA-Z0-9/]/.test(input)
+			) {
+				error(
+					'Invalid character: the string to be decoded is not correctly encoded.'
+				);
+			}
+			var bitCounter = 0;
+			var bitStorage;
+			var buffer;
+			var output = '';
+			var position = -1;
+			while (++position < length) {
+				buffer = TABLE.indexOf(input.charAt(position));
+				bitStorage = bitCounter % 4 ? bitStorage * 64 + buffer : buffer;
+				// Unless this is the first of a group of 4 characters…
+				if (bitCounter++ % 4) {
+					// …convert the first 8 bits to a single ASCII character.
+					output += String.fromCharCode(
+						0xFF & bitStorage >> (-2 * bitCounter & 6)
+					);
+				}
+			}
+			return output;
+		};
+
+		// `encode` is designed to be fully compatible with `btoa` as described in the
+		// HTML Standard: http://whatwg.org/html/webappapis.html#dom-windowbase64-btoa
+		var encode = function(input) {
+			input = String(input);
+			if (/[^\0-\xFF]/.test(input)) {
+				// Note: no need to special-case astral symbols here, as surrogates are
+				// matched, and the input is supposed to only contain ASCII anyway.
+				error(
+					'The string to be encoded contains characters outside of the ' +
+					'Latin1 range.'
+				);
+			}
+			var padding = input.length % 3;
+			var output = '';
+			var position = -1;
+			var a;
+			var b;
+			var c;
+			var buffer;
+			// Make sure any padding is handled outside of the loop.
+			var length = input.length - padding;
+
+			while (++position < length) {
+				// Read three bytes, i.e. 24 bits.
+				a = input.charCodeAt(position) << 16;
+				b = input.charCodeAt(++position) << 8;
+				c = input.charCodeAt(++position);
+				buffer = a + b + c;
+				// Turn the 24 bits into four chunks of 6 bits each, and append the
+				// matching character for each of them to the output.
+				output += (
+					TABLE.charAt(buffer >> 18 & 0x3F) +
+					TABLE.charAt(buffer >> 12 & 0x3F) +
+					TABLE.charAt(buffer >> 6 & 0x3F) +
+					TABLE.charAt(buffer & 0x3F)
+				);
+			}
+
+			if (padding == 2) {
+				a = input.charCodeAt(position) << 8;
+				b = input.charCodeAt(++position);
+				buffer = a + b;
+				output += (
+					TABLE.charAt(buffer >> 10) +
+					TABLE.charAt((buffer >> 4) & 0x3F) +
+					TABLE.charAt((buffer << 2) & 0x3F) +
+					'='
+				);
+			} else if (padding == 1) {
+				buffer = input.charCodeAt(position);
+				output += (
+					TABLE.charAt(buffer >> 2) +
+					TABLE.charAt((buffer << 4) & 0x3F) +
+					'=='
+				);
+			}
+
+			return output;
+		};
+
+		var base64 = {
+			'encode': encode,
+			'decode': decode,
+			'version': '0.1.0'
+		};
+
+		// Some AMD build optimizers, like r.js, check for specific condition patterns
+		// like the following:
+		if (
+			typeof undefined == 'function' &&
+			typeof undefined.amd == 'object' &&
+			undefined.amd
+		) {
+			undefined(function() {
+				return base64;
+			});
+		} else if (freeExports && !freeExports.nodeType) {
+			if (freeModule) { // in Node.js or RingoJS v0.8.0+
+				freeModule.exports = base64;
+			} else { // in Narwhal or RingoJS v0.7.0-
+				for (var key in base64) {
+					base64.hasOwnProperty(key) && (freeExports[key] = base64[key]);
+				}
+			}
+		} else { // in Rhino or a web browser
+			root.base64 = base64;
+		}
+
+	}(commonjsGlobal));
+});
+
+function makeURI(strData, type) {
+	return 'data:' + type + ';base64,' + strData
+}
+
+function fixType(type) {
+	type = type.toLowerCase().replace(/jpg/i, 'jpeg');
+	var r = type.match(/png|jpeg|bmp|gif/)[0];
+	return 'image/' + r
+}
+
+function encodeData(data) {
+	var str = '';
+	if (typeof data === 'string') {
+		str = data;
+	} else {
+		for (var i = 0; i < data.length; i++) {
+			str += String.fromCharCode(data[i]);
+		}
+	}
+	return base64.encode(str)
+}
+
+/**
+ * 获取图像区域隐含的像素数据
+ * @param canvasId canvas标识
+ * @param x 将要被提取的图像数据矩形区域的左上角 x 坐标
+ * @param y 将要被提取的图像数据矩形区域的左上角 y 坐标
+ * @param width 将要被提取的图像数据矩形区域的宽度
+ * @param height 将要被提取的图像数据矩形区域的高度
+ * @param done 完成回调
+ */
+function getImageData(canvasId, x, y, width, height, done) {
+	uni.canvasGetImageData({
+		canvasId: canvasId,
+		x: x,
+		y: y,
+		width: width,
+		height: height,
+		success: function success(res) {
+			done(res, null);
+		},
+		fail: function fail(res) {
+			done(null, res);
+		}
+	});
+}
+
+/**
+ * 生成bmp格式图片
+ * 按照规则生成图片响应头和响应体
+ * @param oData 用来描述 canvas 区域隐含的像素数据 { data, width, height } = oData
+ * @returns {*} base64字符串
+ */
+function genBitmapImage(oData) {
+	//
+	// BITMAPFILEHEADER: http://msdn.microsoft.com/en-us/library/windows/desktop/dd183374(v=vs.85).aspx
+	// BITMAPINFOHEADER: http://msdn.microsoft.com/en-us/library/dd183376.aspx
+	//
+	var biWidth = oData.width;
+	var biHeight = oData.height;
+	var biSizeImage = biWidth * biHeight * 3;
+	var bfSize = biSizeImage + 54; // total header size = 54 bytes
+
+	//
+	//  typedef struct tagBITMAPFILEHEADER {
+	//  	WORD bfType;
+	//  	DWORD bfSize;
+	//  	WORD bfReserved1;
+	//  	WORD bfReserved2;
+	//  	DWORD bfOffBits;
+	//  } BITMAPFILEHEADER;
+	//
+	var BITMAPFILEHEADER = [
+		// WORD bfType -- The file type signature; must be "BM"
+		0x42, 0x4D,
+		// DWORD bfSize -- The size, in bytes, of the bitmap file
+		bfSize & 0xff, bfSize >> 8 & 0xff, bfSize >> 16 & 0xff, bfSize >> 24 & 0xff,
+		// WORD bfReserved1 -- Reserved; must be zero
+		0, 0,
+		// WORD bfReserved2 -- Reserved; must be zero
+		0, 0,
+		// DWORD bfOffBits -- The offset, in bytes, from the beginning of the BITMAPFILEHEADER structure to the bitmap bits.
+		54, 0, 0, 0
+	];
+
+	//
+	//  typedef struct tagBITMAPINFOHEADER {
+	//  	DWORD biSize;
+	//  	LONG  biWidth;
+	//  	LONG  biHeight;
+	//  	WORD  biPlanes;
+	//  	WORD  biBitCount;
+	//  	DWORD biCompression;
+	//  	DWORD biSizeImage;
+	//  	LONG  biXPelsPerMeter;
+	//  	LONG  biYPelsPerMeter;
+	//  	DWORD biClrUsed;
+	//  	DWORD biClrImportant;
+	//  } BITMAPINFOHEADER, *PBITMAPINFOHEADER;
+	//
+	var BITMAPINFOHEADER = [
+		// DWORD biSize -- The number of bytes required by the structure
+		40, 0, 0, 0,
+		// LONG biWidth -- The width of the bitmap, in pixels
+		biWidth & 0xff, biWidth >> 8 & 0xff, biWidth >> 16 & 0xff, biWidth >> 24 & 0xff,
+		// LONG biHeight -- The height of the bitmap, in pixels
+		biHeight & 0xff, biHeight >> 8 & 0xff, biHeight >> 16 & 0xff, biHeight >> 24 & 0xff,
+		// WORD biPlanes -- The number of planes for the target device. This value must be set to 1
+		1, 0,
+		// WORD biBitCount -- The number of bits-per-pixel, 24 bits-per-pixel -- the bitmap
+		// has a maximum of 2^24 colors (16777216, Truecolor)
+		24, 0,
+		// DWORD biCompression -- The type of compression, BI_RGB (code 0) -- uncompressed
+		0, 0, 0, 0,
+		// DWORD biSizeImage -- The size, in bytes, of the image. This may be set to zero for BI_RGB bitmaps
+		biSizeImage & 0xff, biSizeImage >> 8 & 0xff, biSizeImage >> 16 & 0xff, biSizeImage >> 24 & 0xff,
+		// LONG biXPelsPerMeter, unused
+		0, 0, 0, 0,
+		// LONG biYPelsPerMeter, unused
+		0, 0, 0, 0,
+		// DWORD biClrUsed, the number of color indexes of palette, unused
+		0, 0, 0, 0,
+		// DWORD biClrImportant, unused
+		0, 0, 0, 0
+	];
+
+	var iPadding = (4 - ((biWidth * 3) % 4)) % 4;
+
+	var aImgData = oData.data;
+
+	var strPixelData = '';
+	var biWidth4 = biWidth << 2;
+	var y = biHeight;
+	var fromCharCode = String.fromCharCode;
+
+	do {
+		var iOffsetY = biWidth4 * (y - 1);
+		var strPixelRow = '';
+		for (var x = 0; x < biWidth; x++) {
+			var iOffsetX = x << 2;
+			strPixelRow += fromCharCode(aImgData[iOffsetY + iOffsetX + 2]) +
+				fromCharCode(aImgData[iOffsetY + iOffsetX + 1]) +
+				fromCharCode(aImgData[iOffsetY + iOffsetX]);
+		}
+
+		for (var c = 0; c < iPadding; c++) {
+			strPixelRow += String.fromCharCode(0);
+		}
+
+		strPixelData += strPixelRow;
+	} while (--y)
+
+	var strEncoded = encodeData(BITMAPFILEHEADER.concat(BITMAPINFOHEADER)) + encodeData(strPixelData);
+
+	return strEncoded
+}
+
+/**
+ * 转换为图片base64
+ * @param canvasId canvas标识
+ * @param x 将要被提取的图像数据矩形区域的左上角 x 坐标
+ * @param y 将要被提取的图像数据矩形区域的左上角 y 坐标
+ * @param width 将要被提取的图像数据矩形区域的宽度
+ * @param height 将要被提取的图像数据矩形区域的高度
+ * @param type 转换图片类型
+ * @param done 完成回调
+ */
+function convertToImage(canvasId, x, y, width, height, type, done) {
+	if (done === void 0) done = function() {};
+
+	if (type === undefined) {
+		type = 'png';
+	}
+	type = fixType(type);
+	if (/bmp/.test(type)) {
+		getImageData(canvasId, x, y, width, height, function(data, err) {
+			var strData = genBitmapImage(data);
+			tools_7(done) && done(makeURI(strData, 'image/' + type), err);
+		});
+	} else {
+		console.error('暂不支持生成\'' + type + '\'类型的base64图片');
+	}
+}
+
+var CanvasToBase64 = {
+	convertToImage: convertToImage,
+	// convertToPNG: function (width, height, done) {
+	//   return convertToImage(width, height, 'png', done)
+	// },
+	// convertToJPEG: function (width, height, done) {
+	//   return convertToImage(width, height, 'jpeg', done)
+	// },
+	// convertToGIF: function (width, height, done) {
+	//   return convertToImage(width, height, 'gif', done)
+	// },
+	convertToBMP: function(ref, done) {
+		if (ref === void 0) ref = {};
+		var canvasId = ref.canvasId;
+		var x = ref.x;
+		var y = ref.y;
+		var width = ref.width;
+		var height = ref.height;
+		if (done === void 0) done = function() {};
+
+		return convertToImage(canvasId, x, y, width, height, 'bmp', done)
+	}
+};
+
+function methods() {
+	var self = this;
+
+	var boundWidth = self.width; // 裁剪框默认宽度，即整个画布宽度
+	var boundHeight = self.height; // 裁剪框默认高度，即整个画布高度
+
+	var id = self.id;
+	var targetId = self.targetId;
+	var pixelRatio = self.pixelRatio;
+
+	var ref = self.cut;
+	var x = ref.x;
+	if (x === void 0) x = 0;
+	var y = ref.y;
+	if (y === void 0) y = 0;
+	var width = ref.width;
+	if (width === void 0) width = boundWidth;
+	var height = ref.height;
+	if (height === void 0) height = boundHeight;
+
+	self.updateCanvas = function(done) {
+		if (self.croperTarget) {
+			//  画布绘制图片
+			self.ctx.drawImage(
+				self.croperTarget,
+				self.imgLeft,
+				self.imgTop,
+				self.scaleWidth,
+				self.scaleHeight
+			);
+		}
+		tools_7(self.onBeforeDraw) && self.onBeforeDraw(self.ctx, self);
+
+		self.setBoundStyle(self.boundStyle); //	设置边界样式
+
+		self.ctx.draw(false, done);
+		return self
+	};
+
+	self.pushOrigin = self.pushOrign = function(src) {
+		self.src = src;
+
+		tools_7(self.onBeforeImageLoad) && self.onBeforeImageLoad(self.ctx, self);
+
+		return getImageInfo({
+				src: src
+			})
+			.then(function(res) {
+				var innerAspectRadio = res.width / res.height;
+				var customAspectRadio = width / height;
+
+				self.croperTarget = res.path;
+
+				if (innerAspectRadio < customAspectRadio) {
+					self.rectX = x;
+					self.baseWidth = width;
+					self.baseHeight = width / innerAspectRadio;
+					self.rectY = y - Math.abs((height - self.baseHeight) / 2);
+				} else {
+					self.rectY = y;
+					self.baseWidth = height * innerAspectRadio;
+					self.baseHeight = height;
+					self.rectX = x - Math.abs((width - self.baseWidth) / 2);
+				}
+
+				self.imgLeft = self.rectX;
+				self.imgTop = self.rectY;
+				self.scaleWidth = self.baseWidth;
+				self.scaleHeight = self.baseHeight;
+
+				self.update();
+
+				return new Promise(function(resolve) {
+					self.updateCanvas(resolve);
+				})
+			})
+			.then(function() {
+				tools_7(self.onImageLoad) && self.onImageLoad(self.ctx, self);
+			})
+	};
+
+	self.removeImage = function() {
+		self.src = '';
+		self.croperTarget = '';
+		return draw(self.ctx)
+	};
+
+	self.getCropperBase64 = function(done) {
+		if (done === void 0) done = function() {};
+
+		CanvasToBase64.convertToBMP({
+			canvasId: id,
+			x: x,
+			y: y,
+			width: width,
+			height: height
+		}, done);
+	};
+
+	self.getCropperImage = function(opt, fn) {
+		var customOptions = opt;
+
+		var canvasOptions = {
+			canvasId: id,
+			x: x,
+			y: y,
+			width: width,
+			height: height
+		};
+
+		var task = function() {
+			return Promise.resolve();
+		};
+
+		if (
+			tools_10(customOptions) &&
+			customOptions.original
+		) {
+			// original mode
+			task = function() {
+				self.targetCtx.drawImage(
+					self.croperTarget,
+					self.imgLeft * pixelRatio,
+					self.imgTop * pixelRatio,
+					self.scaleWidth * pixelRatio,
+					self.scaleHeight * pixelRatio
+				);
+
+				canvasOptions = {
+					canvasId: targetId,
+					x: x * pixelRatio,
+					y: y * pixelRatio,
+					width: width * pixelRatio,
+					height: height * pixelRatio
+				};
+
+				return draw(self.targetCtx)
+			};
+		}
+
+		return task()
+			.then(function() {
+				if (tools_10(customOptions)) {
+					canvasOptions = Object.assign({}, canvasOptions, customOptions);
+				}
+
+				if (tools_7(customOptions)) {
+					fn = customOptions;
+				}
+
+				var arg = canvasOptions.componentContext ? [canvasOptions, canvasOptions.componentContext] : [canvasOptions];
+
+				return canvasToTempFilePath.apply(null, arg)
+			})
+			.then(function(res) {
+				var tempFilePath = res.tempFilePath;
+
+				return tools_7(fn) ?
+					fn.call(self, tempFilePath, null) :
+					tempFilePath
+			})
+			.catch(function(err) {
+				if (tools_7(fn)) {
+					fn.call(self, null, err);
+				} else {
+					throw err
+				}
+			})
+	};
+}
+
+/**
+ * 获取最新缩放值
+ * @param oldScale 上一次触摸结束后的缩放值
+ * @param oldDistance 上一次触摸结束后的双指距离
+ * @param zoom 缩放系数
+ * @param touch0 第一指touch对象
+ * @param touch1 第二指touch对象
+ * @returns {*}
+ */
+var getNewScale = function(oldScale, oldDistance, zoom, touch0, touch1) {
+	var xMove, yMove, newDistance;
+	// 计算二指最新距离
+	xMove = Math.round(touch1.x - touch0.x);
+	yMove = Math.round(touch1.y - touch0.y);
+	newDistance = Math.round(Math.sqrt(xMove * xMove + yMove * yMove));
+
+	return oldScale + 0.001 * zoom * (newDistance - oldDistance)
+};
+
+function update() {
+	var self = this;
+
+	if (!self.src) {
+		return
+	}
+
+	self.__oneTouchStart = function(touch) {
+		self.touchX0 = Math.round(touch.x);
+		self.touchY0 = Math.round(touch.y);
+	};
+
+	self.__oneTouchMove = function(touch) {
+		var xMove, yMove;
+		// 计算单指移动的距离
+		if (self.touchended) {
+			return self.updateCanvas()
+		}
+		xMove = Math.round(touch.x - self.touchX0);
+		yMove = Math.round(touch.y - self.touchY0);
+
+		var imgLeft = Math.round(self.rectX + xMove);
+		var imgTop = Math.round(self.rectY + yMove);
+
+		self.outsideBound(imgLeft, imgTop);
+
+		self.updateCanvas();
+	};
+
+	self.__twoTouchStart = function(touch0, touch1) {
+		var xMove, yMove, oldDistance;
+
+		self.touchX1 = Math.round(self.rectX + self.scaleWidth / 2);
+		self.touchY1 = Math.round(self.rectY + self.scaleHeight / 2);
+
+		// 计算两指距离
+		xMove = Math.round(touch1.x - touch0.x);
+		yMove = Math.round(touch1.y - touch0.y);
+		oldDistance = Math.round(Math.sqrt(xMove * xMove + yMove * yMove));
+
+		self.oldDistance = oldDistance;
+	};
+
+	self.__twoTouchMove = function(touch0, touch1) {
+		var oldScale = self.oldScale;
+		var oldDistance = self.oldDistance;
+		var scale = self.scale;
+		var zoom = self.zoom;
+
+		self.newScale = getNewScale(oldScale, oldDistance, zoom, touch0, touch1);
+
+		//  设定缩放范围
+		self.newScale <= 1 && (self.newScale = 1);
+		self.newScale >= scale && (self.newScale = scale);
+
+		self.scaleWidth = Math.round(self.newScale * self.baseWidth);
+		self.scaleHeight = Math.round(self.newScale * self.baseHeight);
+		var imgLeft = Math.round(self.touchX1 - self.scaleWidth / 2);
+		var imgTop = Math.round(self.touchY1 - self.scaleHeight / 2);
+
+		self.outsideBound(imgLeft, imgTop);
+
+		self.updateCanvas();
+	};
+
+	self.__xtouchEnd = function() {
+		self.oldScale = self.newScale;
+		self.rectX = self.imgLeft;
+		self.rectY = self.imgTop;
+	};
+}
+
+var handle = {
+	//  图片手势初始监测
+	touchStart: function touchStart(e) {
+		var self = this;
+		var ref = e.touches;
+		var touch0 = ref[0];
+		var touch1 = ref[1];
+
+		if (!self.src) {
+			return
+		}
+
+		setTouchState(self, true, null, null);
+
+		// 计算第一个触摸点的位置，并参照改点进行缩放
+		self.__oneTouchStart(touch0);
+
+		// 两指手势触发
+		if (e.touches.length >= 2) {
+			self.__twoTouchStart(touch0, touch1);
+		}
+	},
+
+	//  图片手势动态缩放
+	touchMove: function touchMove(e) {
+		var self = this;
+		var ref = e.touches;
+		var touch0 = ref[0];
+		var touch1 = ref[1];
+
+		if (!self.src) {
+			return
+		}
+
+		setTouchState(self, null, true);
+
+		// 单指手势时触发
+		if (e.touches.length === 1) {
+			self.__oneTouchMove(touch0);
+		}
+		// 两指手势触发
+		if (e.touches.length >= 2) {
+			self.__twoTouchMove(touch0, touch1);
+		}
+	},
+
+	touchEnd: function touchEnd(e) {
+		var self = this;
+
+		if (!self.src) {
+			return
+		}
+
+		setTouchState(self, false, false, true);
+		self.__xtouchEnd();
+	}
+};
+
+function cut() {
+	var self = this;
+	var boundWidth = self.width; // 裁剪框默认宽度，即整个画布宽度
+	var boundHeight = self.height;
+	// 裁剪框默认高度，即整个画布高度
+	var ref = self.cut;
+	var x = ref.x;
+	if (x === void 0) x = 0;
+	var y = ref.y;
+	if (y === void 0) y = 0;
+	var width = ref.width;
+	if (width === void 0) width = boundWidth;
+	var height = ref.height;
+	if (height === void 0) height = boundHeight;
+
+	/**
+	 * 设置边界
+	 * @param imgLeft 图片左上角横坐标值
+	 * @param imgTop 图片左上角纵坐标值
+	 */
+	self.outsideBound = function(imgLeft, imgTop) {
+		self.imgLeft = imgLeft >= x ?
+			x :
+			self.scaleWidth + imgLeft - x <= width ?
+			x + width - self.scaleWidth :
+			imgLeft;
+
+		self.imgTop = imgTop >= y ?
+			y :
+			self.scaleHeight + imgTop - y <= height ?
+			y + height - self.scaleHeight :
+			imgTop;
+	};
+
+	/**
+	 * 设置边界样式
+	 * @param color	边界颜色
+	 */
+	self.setBoundStyle = function(ref) {
+		if (ref === void 0) ref = {};
+		var color = ref.color;
+		if (color === void 0) color = '#04b00f';
+		var mask = ref.mask;
+		if (mask === void 0) mask = 'rgba(0, 0, 0, 0.3)';
+		var lineWidth = ref.lineWidth;
+		if (lineWidth === void 0) lineWidth = 1;
+
+		var half = lineWidth / 2;
+		var boundOption = [{
+				start: {
+					x: x - half,
+					y: y + 10 - half
+				},
+				step1: {
+					x: x - half,
+					y: y - half
+				},
+				step2: {
+					x: x + 10 - half,
+					y: y - half
+				}
+			},
+			{
+				start: {
+					x: x - half,
+					y: y + height - 10 + half
+				},
+				step1: {
+					x: x - half,
+					y: y + height + half
+				},
+				step2: {
+					x: x + 10 - half,
+					y: y + height + half
+				}
+			},
+			{
+				start: {
+					x: x + width - 10 + half,
+					y: y - half
+				},
+				step1: {
+					x: x + width + half,
+					y: y - half
+				},
+				step2: {
+					x: x + width + half,
+					y: y + 10 - half
+				}
+			},
+			{
+				start: {
+					x: x + width + half,
+					y: y + height - 10 + half
+				},
+				step1: {
+					x: x + width + half,
+					y: y + height + half
+				},
+				step2: {
+					x: x + width - 10 + half,
+					y: y + height + half
+				}
+			}
+		];
+
+		// 绘制半透明层
+		self.ctx.beginPath();
+		self.ctx.setFillStyle(mask);
+		self.ctx.fillRect(0, 0, x, boundHeight);
+		self.ctx.fillRect(x, 0, width, y);
+		self.ctx.fillRect(x, y + height, width, boundHeight - y - height);
+		self.ctx.fillRect(x + width, 0, boundWidth - x - width, boundHeight);
+		self.ctx.fill();
+
+		boundOption.forEach(function(op) {
+			self.ctx.beginPath();
+			self.ctx.setStrokeStyle(color);
+			self.ctx.setLineWidth(lineWidth);
+			self.ctx.moveTo(op.start.x, op.start.y);
+			self.ctx.lineTo(op.step1.x, op.step1.y);
+			self.ctx.lineTo(op.step2.x, op.step2.y);
+			self.ctx.stroke();
+		});
+	};
+}
+
+var version = "1.3.9";
+
+var WeCropper = function WeCropper(params) {
+	var self = this;
+	var _default = {};
+
+	validator(self, DEFAULT);
+
+	Object.keys(DEFAULT).forEach(function(key) {
+		_default[key] = DEFAULT[key].default;
+	});
+	Object.assign(self, _default, params);
+
+	self.prepare();
+	self.attachPage();
+	self.createCtx();
+	self.observer();
+	self.cutt();
+	self.methods();
+	self.init();
+	self.update();
+
+	return self
+};
+
+WeCropper.prototype.init = function init() {
+	var self = this;
+	var src = self.src;
+
+	self.version = version;
+
+	typeof self.onReady === 'function' && self.onReady(self.ctx, self);
+
+	if (src) {
+		self.pushOrign(src);
+	} else {
+		self.updateCanvas();
+	}
+	setTouchState(self, false, false, false);
+
+	self.oldScale = 1;
+	self.newScale = 1;
+
+	return self
+};
+
+Object.assign(WeCropper.prototype, handle);
+
+WeCropper.prototype.prepare = prepare;
+WeCropper.prototype.observer = observer;
+WeCropper.prototype.methods = methods;
+WeCropper.prototype.cutt = cut;
+WeCropper.prototype.update = update;
+
+export default WeCropper;
diff --git a/uni_modules/vk-uview-ui/components/u-avatar/u-avatar.vue b/uni_modules/vk-uview-ui/components/u-avatar/u-avatar.vue
new file mode 100644
index 0000000..ab21c46
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-avatar/u-avatar.vue
@@ -0,0 +1,263 @@
+<template>
+  <view class="u-avatar" :style="[wrapStyle]" @tap="click">
+    <image
+      @error="loadError"
+      :style="[imgStyle]"
+      class="u-avatar__img"
+      v-if="!uText && avatar"
+      :src="avatar"
+      :mode="imgMode"
+    ></image>
+    <text
+      class="u-line-1"
+      v-else-if="uText"
+      :style="{
+        fontSize: '38rpx'
+      }"
+    >
+      {{ uText }}
+    </text>
+    <slot v-else></slot>
+    <view
+      class="u-avatar__sex"
+      v-if="showSex"
+      :class="['u-avatar__sex--' + sexIcon]"
+      :style="[uSexStyle]"
+    >
+      <u-icon :name="sexIcon" size="20"></u-icon>
+    </view>
+    <view class="u-avatar__level" v-if="showLevel" :style="[uLevelStyle]">
+      <u-icon :name="levelIcon" size="20"></u-icon>
+    </view>
+  </view>
+</template>
+
+<script>
+let base64Avatar =
+  "data:image/jpg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAA8AAD/4QMraHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjMtYzAxMSA2Ni4xNDU2NjEsIDIwMTIvMDIvMDYtMTQ6NTY6MjcgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjREMEQwRkY0RjgwNDExRUE5OTY2RDgxODY3NkJFODMxIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjREMEQwRkY1RjgwNDExRUE5OTY2RDgxODY3NkJFODMxIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NEQwRDBGRjJGODA0MTFFQTk5NjZEODE4Njc2QkU4MzEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NEQwRDBGRjNGODA0MTFFQTk5NjZEODE4Njc2QkU4MzEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7/7gAOQWRvYmUAZMAAAAAB/9sAhAAGBAQEBQQGBQUGCQYFBgkLCAYG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";
+/**
+ * avatar 头像
+ * @description 本组件一般用于展示头像的地方，如个人中心，或者评论列表页的用户头像展示等场所。
+ * @tutorial https://www.uviewui.com/components/avatar.html
+ * @property {String} bg-color 背景颜色，一般显示文字时用（默认#ffffff）
+ * @property {String} src 头像路径，如加载失败，将会显示默认头像
+ * @property {String Number} size 头像尺寸，可以为指定字符串(large, default, mini)，或者数值，单位rpx（默认default）
+ * @property {String} mode 显示类型，见上方说明（默认circle）
+ * @property {String} sex-icon 性别图标，man-男，woman-女（默认man）
+ * @property {String} level-icon 等级图标（默认level）
+ * @property {String} sex-bg-color 性别图标背景颜色
+ * @property {String} level-bg-color 等级图标背景颜色
+ * @property {String} show-sex 是否显示性别图标（默认false）
+ * @property {String} show-level 是否显示等级图标（默认false）
+ * @property {String} img-mode 头像图片的裁剪类型，与uni的image组件的mode参数一致，如效果达不到需求，可尝试传widthFix值（默认aspectFill）
+ * @property {String} index 用户传递的标识符值，如果是列表循环，可穿v-for的index值
+ * @event {Function} click 头像被点击
+ * @example <u-avatar :src="src"></u-avatar>
+ */
+export default {
+  name: "u-avatar",
+  emits: ["click"],
+  props: {
+    // 背景颜色
+    bgColor: {
+      type: String,
+      default: "transparent"
+    },
+    // 头像路径
+    src: {
+      type: String,
+      default: ""
+    },
+    // 尺寸，large-大，default-中等，mini-小，如果为数值，则单位为rpx
+    // 宽度等于高度
+    size: {
+      type: [String, Number],
+      default: "default"
+    },
+    // 头像模型，square-带圆角方形，circle-圆形
+    mode: {
+      type: String,
+      default: "circle"
+    },
+    // 文字内容
+    text: {
+      type: String,
+      default: ""
+    },
+    // 图片的裁剪模型
+    imgMode: {
+      type: String,
+      default: "aspectFill"
+    },
+    // 标识符
+    index: {
+      type: [String, Number],
+      default: ""
+    },
+    // 右上角性别角标，man-男，woman-女
+    sexIcon: {
+      type: String,
+      default: "man"
+    },
+    // 右下角的等级图标
+    levelIcon: {
+      type: String,
+      default: "level"
+    },
+    // 右下角等级图标背景颜色
+    levelBgColor: {
+      type: String,
+      default: ""
+    },
+    // 右上角性别图标的背景颜色
+    sexBgColor: {
+      type: String,
+      default: ""
+    },
+    // 是否显示性别图标
+    showSex: {
+      type: Boolean,
+      default: false
+    },
+    // 是否显示等级图标
+    showLevel: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      error: false,
+      // 头像的地址，因为如果加载错误，需要赋值为默认图片，props值无法修改，所以需要一个中间值
+      avatar: this.src ? this.src : base64Avatar
+    };
+  },
+  watch: {
+    src(n) {
+      // 用户可能会在头像加载失败时，再次修改头像值，所以需要重新赋值
+      if (!n) {
+        // 如果传入null或者''，或者undefined，显示默认头像
+        this.avatar = base64Avatar;
+        this.error = true;
+      } else {
+        this.avatar = n;
+        this.error = false;
+      }
+    }
+  },
+  computed: {
+    wrapStyle() {
+      let style = {};
+      style.height =
+        this.size == "large"
+          ? "120rpx"
+          : this.size == "default"
+          ? "90rpx"
+          : this.size == "mini"
+          ? "70rpx"
+          : this.size + "rpx";
+      style.width = style.height;
+      style.flex = `0 0 ${style.height}`;
+      style.backgroundColor = this.bgColor;
+      style.borderRadius = this.mode == "circle" ? "500px" : "5px";
+      if (this.text) style.padding = `0 6rpx`;
+      return style;
+    },
+    imgStyle() {
+      let style = {};
+      style.borderRadius = this.mode == "circle" ? "500px" : "5px";
+      return style;
+    },
+    // 取字符串的第一个字符
+    uText() {
+      return String(this.text)[0];
+    },
+    // 性别图标的自定义样式
+    uSexStyle() {
+      let style = {};
+      if (this.sexBgColor) style.backgroundColor = this.sexBgColor;
+      return style;
+    },
+    // 等级图标的自定义样式
+    uLevelStyle() {
+      let style = {};
+      if (this.levelBgColor) style.backgroundColor = this.levelBgColor;
+      return style;
+    }
+  },
+  methods: {
+    // 图片加载错误时，显示默认头像
+    loadError() {
+      this.error = true;
+      this.avatar = base64Avatar;
+    },
+    click() {
+      this.$emit("click", this.index);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-avatar {
+  /* #ifndef APP-NVUE */
+  display: inline-flex;
+  /* #endif */
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  color: $u-content-color;
+  border-radius: 10px;
+  position: relative;
+
+  &__img {
+    width: 100%;
+    height: 100%;
+  }
+
+  &__sex {
+    position: absolute;
+    width: 32rpx;
+    color: #ffffff;
+    height: 32rpx;
+    @include vue-flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 100rpx;
+    top: 5%;
+    z-index: 1;
+    right: -7%;
+    border: 1px #ffffff solid;
+
+    &--man {
+      background-color: $u-type-primary;
+    }
+
+    &--woman {
+      background-color: $u-type-error;
+    }
+
+    &--none {
+      background-color: $u-type-warning;
+    }
+  }
+
+  &__level {
+    position: absolute;
+    width: 32rpx;
+    color: #ffffff;
+    height: 32rpx;
+    @include vue-flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 100rpx;
+    bottom: 5%;
+    z-index: 1;
+    right: -7%;
+    border: 1px #ffffff solid;
+    background-color: $u-type-warning;
+  }
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-back-top/u-back-top.vue b/uni_modules/vk-uview-ui/components/u-back-top/u-back-top.vue
new file mode 100644
index 0000000..7970fc7
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-back-top/u-back-top.vue
@@ -0,0 +1,153 @@
+<template>
+	<view @tap="backToTop" class="u-back-top" :class="['u-back-top--mode--' + mode]" :style="[{
+		bottom: bottom + 'rpx',
+		right: right + 'rpx',
+		borderRadius: mode == 'circle' ? '10000rpx' : '8rpx',
+		zIndex: uZIndex,
+		opacity: opacity
+	}, customStyle]">
+		<view class="u-back-top__content" v-if="!$slots.default && !$slots.$default">
+			<u-icon @click="backToTop" :name="icon" :custom-style="iconStyle"></u-icon>
+			<view class="u-back-top__content__tips">
+				{{tips}}
+			</view>
+		</view>
+		<slot v-else />
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'u-back-top',
+		props: {
+			// 返回顶部的形状，circle-圆形，square-方形
+			mode: {
+				type: String,
+				default: 'circle'
+			},
+			// 自定义图标
+			icon: {
+				type: String,
+				default: 'arrow-upward'
+			},
+			// 提示文字
+			tips: {
+				type: String,
+				default: ''
+			},
+			// 返回顶部滚动时间
+			duration: {
+				type: [Number, String],
+				default: 100
+			},
+			// 滚动距离
+			scrollTop: {
+				type: [Number, String],
+				default: 0
+			},
+			// 距离顶部多少距离显示，单位rpx
+			top: {
+				type: [Number, String],
+				default: 400
+			},
+			// 返回顶部按钮到底部的距离，单位rpx
+			bottom: {
+				type: [Number, String],
+				default: 200
+			},
+			// 返回顶部按钮到右边的距离，单位rpx
+			right: {
+				type: [Number, String],
+				default: 40
+			},
+			// 层级
+			zIndex: {
+				type: [Number, String],
+				default: '9'
+			},
+			// 图标的样式，对象形式
+			iconStyle: {
+				type: Object,
+				default() {
+					return {
+						color: '#909399',
+						fontSize: '38rpx'
+					}
+				}
+			},
+			// 整个组件的样式
+			customStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			}
+		},
+		watch: {
+			showBackTop(nVal, oVal) {
+				// 当组件的显示与隐藏状态发生跳变时，修改组件的层级和不透明度
+				// 让组件有显示和消失的动画效果，如果用v-if控制组件状态，将无设置动画效果
+				if(nVal) {
+					this.uZIndex = this.zIndex;
+					this.opacity = 1;
+				} else {
+					this.uZIndex = -1;
+					this.opacity = 0;
+				}
+			}
+		},
+		computed: {
+			showBackTop() {
+				// 由于scrollTop为页面的滚动距离，默认为px单位，这里将用于传入的top(rpx)值
+				// 转为px用于比较，如果滚动条到顶的距离大于设定的距离，就显示返回顶部的按钮
+				return this.scrollTop > uni.upx2px(this.top);
+			},
+		},
+		data() {
+			return {
+				// 不透明度，为了让组件有一个显示和隐藏的过渡动画
+				opacity: 0,
+				// 组件的z-index值，隐藏时设置为-1，就会看不到
+				uZIndex: -1
+			}
+		},
+		methods: {
+			backToTop() {
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: this.duration
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-back-top {
+		width: 80rpx;
+		height: 80rpx;
+		position: fixed;
+		z-index: 9;
+		@include vue-flex;
+		flex-direction: column;
+		justify-content: center;
+		background-color: #E1E1E1;
+		color: $u-content-color;
+		align-items: center;
+		transition: opacity 0.4s;
+		
+		&__content {
+			@include vue-flex;
+			flex-direction: column;
+			align-items: center;
+			
+			&__tips {
+				font-size: 24rpx;
+				transform: scale(0.8);
+				line-height: 1;
+			}
+		}
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-badge/u-badge.vue b/uni_modules/vk-uview-ui/components/u-badge/u-badge.vue
new file mode 100644
index 0000000..fc99562
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-badge/u-badge.vue
@@ -0,0 +1,216 @@
+<template>
+	<view v-if="show" class="u-badge" :class="[
+			isDot ? 'u-badge-dot' : '',
+			size == 'mini' ? 'u-badge-mini' : '',
+			type ? 'u-badge--bg--' + type : ''
+		]" :style="[{
+			top: offset[0] + 'rpx',
+			right: offset[1] + 'rpx',
+			fontSize: fontSize + 'rpx',
+			position: absolute ? 'absolute' : 'static',
+			color: color,
+			backgroundColor: bgColor,
+		}, boxStyle]"
+	>
+		{{showText}}
+	</view>
+</template>
+
+<script>
+	/**
+	 * badge 角标
+	 * @description 本组件一般用于展示头像的地方，如个人中心，或者评论列表页的用户头像展示等场所。
+	 * @tutorial https://www.uviewui.com/components/badge.html
+	 * @property {String Number} count 展示的数字，大于 overflowCount 时显示为 ${overflowCount}+，为0且show-zero为false时隐藏
+	 * @property {Boolean} is-dot 不展示数字，只有一个小点（默认false）
+	 * @property {Boolean} absolute 组件是否绝对定位，为true时，offset参数才有效（默认true）
+	 * @property {String Number} overflow-count 展示封顶的数字值（默认99）
+	 * @property {String} type 使用预设的背景颜色（默认error）
+	 * @property {Boolean} show-zero 当数值为 0 时，是否展示 Badge（默认false）
+	 * @property {String} size Badge的尺寸，设为mini会得到小一号的Badge（默认default）
+	 * @property {Array} offset 设置badge的位置偏移，格式为 [x, y]，也即设置的为top和right的值，单位rpx。absolute为true时有效（默认[20, 20]）
+	 * @property {String} color 字体颜色（默认#ffffff）
+	 * @property {String} bgColor 背景颜色，优先级比type高，如设置，type参数会失效
+	 * @property {Boolean} is-center 组件中心点是否和父组件右上角重合，优先级比offset高，如设置，offset参数会失效（默认false）
+	 * @example <u-badge type="error" count="7"></u-badge>
+	 */
+	export default {
+		name: 'u-badge',
+		props: {
+			// primary,warning,success,error,info
+			type: {
+				type: String,
+				default: 'error'
+			},
+			// default, mini
+			size: {
+				type: String,
+				default: 'default'
+			},
+			//是否是圆点
+			isDot: {
+				type: Boolean,
+				default: false
+			},
+			// 显示的数值内容
+			count: {
+				type: [Number, String],
+			},
+			// 展示封顶的数字值
+			overflowCount: {
+				type: Number,
+				default: 99
+			},
+			// 当数值为 0 时，是否展示 Badge
+			showZero: {
+				type: Boolean,
+				default: false
+			},
+			// 位置偏移
+			offset: {
+				type: Array,
+				default: () => {
+					return [20, 20]
+				}
+			},
+			// 是否开启绝对定位，开启了offset才会起作用
+			absolute: {
+				type: Boolean,
+				default: true
+			},
+			// 字体大小
+			fontSize: {
+				type: [String, Number],
+				default: '26'
+			},
+			// 字体演示
+			color: {
+				type: String,
+				default: '#ffffff'
+			},
+			// badge的背景颜色
+			bgColor: {
+				type: String,
+				default: ''
+			},
+			// 是否让badge组件的中心点和父组件右上角重合，配置的话，offset将会失效
+			isCenter: {
+				type: Boolean,
+				default: false
+			}
+		},
+		computed: {
+			// 是否将badge中心与父组件右上角重合
+			boxStyle() {
+				let style = {};
+				if(this.isCenter) {
+					style.top = 0;
+					style.right = 0;
+					// Y轴-50%，意味着badge向上移动了badge自身高度一半，X轴50%，意味着向右移动了自身宽度一半
+					style.transform = "translateY(-50%) translateX(50%)";
+				} else {
+					style.top = this.offset[0] + 'rpx';
+					style.right = this.offset[1] + 'rpx';
+					style.transform = "translateY(0) translateX(0)";
+				}
+				// 如果尺寸为mini，后接上scale()
+				if(this.size == 'mini') {
+					style.transform = style.transform + " scale(0.9)";
+				}
+				return style;
+			},
+			// isDot类型时，不显示文字
+			showText() {
+				if(this.isDot) return '';
+				else {
+					if(this.count > this.overflowCount) return `${this.overflowCount}+`;
+					else return this.count;
+				}
+			},
+			// 是否显示组件
+			show() {
+				// 如果count的值为0，并且showZero设置为false，不显示组件
+				if(this.count == 0 && this.showZero == false) return false;
+				else return true;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-badge {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		line-height: 24rpx;
+		padding: 8rpx 10rpx;
+		border-radius: 50%;
+		z-index: 9;
+
+		&--bg--primary {
+			background-color: $u-type-primary;
+		}
+
+		&--bg--error {
+			background-color: $u-type-error;
+		}
+
+		&--bg--success {
+			background-color: $u-type-success;
+		}
+
+		&--bg--info {
+			background-color: $u-type-info;
+		}
+
+		&--bg--warning {
+			background-color: $u-type-warning;
+		}
+	}
+
+	.u-badge-dot {
+		height: 16rpx;
+		width: 16rpx;
+		border-radius: 100rpx;
+		line-height: 1;
+	}
+
+	.u-badge-mini {
+		transform: scale(0.8);
+		transform-origin: center center;
+	}
+
+	// .u-primary {
+	// 	background: $u-type-primary;
+	// 	color: #fff;
+	// }
+
+	// .u-error {
+	// 	background: $u-type-error;
+	// 	color: #fff;
+	// }
+
+	// .u-warning {
+	// 	background: $u-type-warning;
+	// 	color: #fff;
+	// }
+
+	// .u-success {
+	// 	background: $u-type-success;
+	// 	color: #fff;
+	// }
+
+	// .u-black {
+	// 	background: #585858;
+	// 	color: #fff;
+	// }
+
+	.u-info {
+		background-color: $u-type-info;
+		color: #fff;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-button/u-button.vue b/uni_modules/vk-uview-ui/components/u-button/u-button.vue
new file mode 100644
index 0000000..2647afc
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-button/u-button.vue
@@ -0,0 +1,602 @@
+<template>
+	<button
+		id="u-wave-btn"
+		class="u-btn u-line-1 u-fix-ios-appearance"
+		:class="[
+			'u-size-' + size,
+			plain ? 'u-btn--' + type + '--plain' : '',
+			loading ? 'u-loading' : '',
+			shape == 'circle' ? 'u-round-circle' : '',
+			hairLine ? showHairLineBorder : 'u-btn--bold-border',
+			'u-btn--' + type,
+			disabled ? `u-btn--${type}--disabled` : '',
+		]"
+		:hover-start-time="Number(hoverStartTime)"
+		:hover-stay-time="Number(hoverStayTime)"
+		:disabled="disabled"
+		:form-type="formType"
+		:open-type="openType"
+		:app-parameter="appParameter"
+		:hover-stop-propagation="hoverStopPropagation"
+		:send-message-title="sendMessageTitle"
+		send-message-path="sendMessagePath"
+		:lang="lang"
+		:data-name="dataName"
+		:session-from="sessionFrom"
+		:send-message-img="sendMessageImg"
+		:show-message-card="showMessageCard"
+		@getphonenumber="getphonenumber"
+		@getuserinfo="getuserinfo"
+		@error="error"
+		@opensetting="opensetting"
+		@launchapp="launchapp"
+		:style="[customStyle, {
+			overflow: ripple ? 'hidden' : 'visible'
+		}]"
+		@tap.stop="click($event)"
+		:hover-class="getHoverClass"
+		:loading="loading"
+	>
+		<slot></slot>
+		<view
+			v-if="ripple"
+			class="u-wave-ripple"
+			:class="[waveActive ? 'u-wave-active' : '']"
+			:style="{
+				top: rippleTop + 'px',
+				left: rippleLeft + 'px',
+				width: fields.targetWidth + 'px',
+				height: fields.targetWidth + 'px',
+				'background-color': rippleBgColor || 'rgba(0, 0, 0, 0.15)'
+			}"
+		></view>
+	</button>
+</template>
+
+<script>
+/**
+ * button 按钮
+ * @description Button 按钮
+ * @tutorial https://www.uviewui.com/components/button.html
+ * @property {String} size 按钮的大小
+ * @property {Boolean} ripple 是否开启点击水波纹效果
+ * @property {String} ripple-bg-color 水波纹的背景色，ripple为true时有效
+ * @property {String} type 按钮的样式类型
+ * @property {Boolean} plain 按钮是否镂空，背景色透明
+ * @property {Boolean} disabled 是否禁用
+ * @property {Boolean} hair-line 是否显示按钮的细边框(默认true)
+ * @property {Boolean} shape 按钮外观形状，见文档说明
+ * @property {Boolean} loading 按钮名称前是否带 loading 图标(App-nvue 平台，在 ios 上为雪花，Android上为圆圈)
+ * @property {String} form-type 用于 <form> 组件，点击分别会触发 <form> 组件的 submit/reset 事件
+ * @property {String} open-type 开放能力
+ * @property {String} data-name 额外传参参数，用于小程序的data-xxx属性，通过target.dataset.name获取
+ * @property {String} hover-class 指定按钮按下去的样式类。当 hover-class="none" 时，没有点击态效果(App-nvue 平台暂不支持)
+ * @property {Number} hover-start-time 按住后多久出现点击态，单位毫秒
+ * @property {Number} hover-stay-time 手指松开后点击态保留时间，单位毫秒
+ * @property {Object} custom-style 对按钮的自定义样式，对象形式，见文档说明
+ * @event {Function} click 按钮点击
+ * @event {Function} getphonenumber open-type="getPhoneNumber"时有效
+ * @event {Function} getuserinfo 用户点击该按钮时，会返回获取到的用户信息，从返回参数的detail中获取到的值同uni.getUserInfo
+ * @event {Function} error 当使用开放能力时，发生错误的回调
+ * @event {Function} opensetting 在打开授权设置页并关闭后回调
+ * @event {Function} launchapp 打开 APP 成功的回调
+ * @example <u-button>月落</u-button>
+ */
+export default {
+	name: 'u-button',
+  emits: ["click", "getphonenumber", "getuserinfo", "error", "opensetting", "launchapp"],
+	props: {
+		// 是否细边框
+		hairLine: {
+			type: Boolean,
+			default: true
+		},
+		// 按钮的预置样式，default，primary，error，warning，success
+		type: {
+			type: String,
+			default: 'default'
+		},
+		// 按钮尺寸，default，medium，mini
+		size: {
+			type: String,
+			default: 'default'
+		},
+		// 按钮形状，circle（两边为半圆），square（带圆角）
+		shape: {
+			type: String,
+			default: 'square'
+		},
+		// 按钮是否镂空
+		plain: {
+			type: Boolean,
+			default: false
+		},
+		// 是否禁止状态
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 是否加载中
+		loading: {
+			type: Boolean,
+			default: false
+		},
+		// 开放能力，具体请看uniapp稳定关于button组件部分说明
+		// https://uniapp.dcloud.io/component/button
+		openType: {
+			type: String,
+			default: ''
+		},
+		// 用于 <form> 组件，点击分别会触发 <form> 组件的 submit/reset 事件
+		// 取值为submit（提交表单），reset（重置表单）
+		formType: {
+			type: String,
+			default: ''
+		},
+		// 打开 APP 时，向 APP 传递的参数，open-type=launchApp时有效
+		// 只微信小程序、QQ小程序有效
+		appParameter: {
+			type: String,
+			default: ''
+		},
+		// 指定是否阻止本节点的祖先节点出现点击态，微信小程序有效
+		hoverStopPropagation: {
+			type: Boolean,
+			default: false
+		},
+		// 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文。只微信小程序有效
+		lang: {
+			type: String,
+			default: 'en'
+		},
+		// 会话来源，open-type="contact"时有效。只微信小程序有效
+		sessionFrom: {
+			type: String,
+			default: ''
+		},
+		// 会话内消息卡片标题，open-type="contact"时有效
+		// 默认当前标题，只微信小程序有效
+		sendMessageTitle: {
+			type: String,
+			default: ''
+		},
+		// 会话内消息卡片点击跳转小程序路径，open-type="contact"时有效
+		// 默认当前分享路径，只微信小程序有效
+		sendMessagePath: {
+			type: String,
+			default: ''
+		},
+		// 会话内消息卡片图片，open-type="contact"时有效
+		// 默认当前页面截图，只微信小程序有效
+		sendMessageImg: {
+			type: String,
+			default: ''
+		},
+		// 是否显示会话内消息卡片，设置此参数为 true，用户进入客服会话会在右下角显示"可能要发送的小程序"提示，
+		// 用户点击后可以快速发送小程序消息，open-type="contact"时有效
+		showMessageCard: {
+			type: Boolean,
+			default: false
+		},
+		// 手指按（触摸）按钮时按钮时的背景颜色
+		hoverBgColor: {
+			type: String,
+			default: ''
+		},
+		// 水波纹的背景颜色
+		rippleBgColor: {
+			type: String,
+			default: ''
+		},
+		// 是否开启水波纹效果
+		ripple: {
+			type: Boolean,
+			default: false
+		},
+		// 按下的类名
+		hoverClass: {
+			type: String,
+			default: ''
+		},
+		// 自定义样式，对象形式
+		customStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 额外传参参数，用于小程序的data-xxx属性，通过target.dataset.name获取
+		dataName: {
+			type: String,
+			default: ''
+		},
+		// 节流，一定时间内只能触发一次
+		throttleTime: {
+			type: [String, Number],
+			default: 500
+		},
+		// 按住后多久出现点击态，单位毫秒
+		hoverStartTime: {
+			type: [String, Number],
+			default: 20
+		},
+		// 手指松开后点击态保留时间，单位毫秒
+		hoverStayTime: {
+			type: [String, Number],
+			default: 150
+		},
+		timerId: {
+			type: [String, Number]
+		},
+	},
+	computed: {
+		// 当没有传bgColor变量时，按钮按下去的颜色类名
+		getHoverClass() {
+			// 如果开启水波纹效果，则不启用hover-class效果
+			if (this.loading || this.disabled || this.ripple || this.hoverClass) return '';
+			let hoverClass = '';
+			hoverClass = this.plain ? 'u-' + this.type + '-plain-hover' : 'u-' + this.type + '-hover';
+			return hoverClass;
+		},
+		// 在'primary', 'success', 'error', 'warning'类型下，不显示边框，否则会造成四角有毛刺现象
+		showHairLineBorder() {
+			if (['primary', 'success', 'error', 'warning'].indexOf(this.type) >= 0 && !this.plain) {
+				return '';
+			} else {
+				return 'u-hairline-border';
+			}
+		}
+	},
+	data() {
+		let btnTimerId = this.timerId || "button_" + Math.floor(Math.random() * 100000000 + 0);
+		return {
+			btnTimerId,
+			rippleTop: 0, // 水波纹的起点Y坐标到按钮上边界的距离
+			rippleLeft: 0, // 水波纹起点X坐标到按钮左边界的距离
+			fields: {}, // 波纹按钮节点信息
+			waveActive: false // 激活水波纹
+		};
+	},
+	methods: {
+		// 按钮点击
+		click(e) {
+			// 进行节流控制，每this.throttle毫秒内，只在开始处执行
+			this.$u.throttle(() => {
+				// 如果按钮时disabled和loading状态，不触发水波纹效果
+				if (this.loading === true || this.disabled === true) return;
+				// 是否开启水波纹效果
+				if (this.ripple) {
+					// 每次点击时，移除上一次的类，再次添加，才能触发动画效果
+					this.waveActive = false;
+					this.$nextTick(function() {
+						this.getWaveQuery(e);
+					});
+				}
+				this.$emit('click', e);
+			}, this.throttleTime, true, this.btnTimerId);
+		},
+		// 查询按钮的节点信息
+		getWaveQuery(e) {
+			this.getElQuery().then(res => {
+				// 查询返回的是一个数组节点
+				let data = res[0];
+				// 查询不到节点信息，不操作
+				if (!data.width || !data.width) return;
+				// 水波纹的最终形态是一个正方形(通过border-radius让其变为一个圆形)，这里要保证正方形的边长等于按钮的最长边
+				// 最终的方形（变换后的圆形）才能覆盖整个按钮
+				data.targetWidth = data.height > data.width ? data.height : data.width;
+				if (!data.targetWidth) return;
+				this.fields = data;
+				let touchesX = '',
+					touchesY = '';
+				// #ifdef MP-BAIDU
+				touchesX = e.changedTouches[0].clientX;
+				touchesY = e.changedTouches[0].clientY;
+				// #endif
+				// #ifdef MP-ALIPAY
+				touchesX = e.detail.clientX;
+				touchesY = e.detail.clientY;
+				// #endif
+				// #ifndef MP-BAIDU || MP-ALIPAY
+				touchesX = e.touches[0].clientX;
+				touchesY = e.touches[0].clientY;
+				// #endif
+				// 获取触摸点相对于按钮上边和左边的x和y坐标，原理是通过屏幕的触摸点（touchesY），减去按钮的上边界data.top
+				// 但是由于`transform-origin`默认是center，所以这里再减去半径才是水波纹view应该的位置
+				// 总的来说，就是把水波纹的矩形（变换后的圆形）的中心点，移动到我们的触摸点位置
+				this.rippleTop = touchesY - data.top - data.targetWidth / 2;
+				this.rippleLeft = touchesX - data.left - data.targetWidth / 2;
+				this.$nextTick(() => {
+					this.waveActive = true;
+				});
+			});
+		},
+		// 获取节点信息
+		getElQuery() {
+			return new Promise(resolve => {
+				let queryInfo = '';
+				// 获取元素节点信息，请查看uniapp相关文档
+				// https://uniapp.dcloud.io/api/ui/nodes-info?id=nodesrefboundingclientrect
+				queryInfo = uni.createSelectorQuery().in(this);
+				//#ifdef MP-ALIPAY
+				queryInfo = uni.createSelectorQuery();
+				//#endif
+				queryInfo.select('.u-btn').boundingClientRect();
+				queryInfo.exec(data => {
+					resolve(data);
+				});
+			});
+		},
+		// 下面为对接uniapp官方按钮开放能力事件回调的对接
+		getphonenumber(res) {
+			this.$emit('getphonenumber', res);
+		},
+		getuserinfo(res) {
+			this.$emit('getuserinfo', res);
+		},
+		error(res) {
+			this.$emit('error', res);
+		},
+		opensetting(res) {
+			this.$emit('opensetting', res);
+		},
+		launchapp(res) {
+			this.$emit('launchapp', res);
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import '../../libs/css/style.components.scss';
+.u-btn::after {
+	border: none;
+}
+
+.u-btn {
+	position: relative;
+	border: 0;
+	//border-radius: 10rpx;
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+	// 避免边框某些场景可能被“裁剪”，不能设置为hidden
+	overflow: visible;
+	line-height: 1;
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+	cursor: pointer;
+	padding: 0 40rpx;
+	z-index: 1;
+	box-sizing: border-box;
+	transition: all 0.15s;
+	
+	&--bold-border {
+		border: 1px solid #ffffff;
+	}
+	
+	&--default {
+		color: $u-content-color;
+		border-color: #c0c4cc;
+		background-color: #ffffff;
+	}
+	
+	&--primary {
+		color: #ffffff;
+		border-color: $u-type-primary;
+		background-color: $u-type-primary;
+	}
+	
+	&--success {
+		color: #ffffff;
+		border-color: $u-type-success;
+		background-color: $u-type-success;
+	}
+	
+	&--error {
+		color: #ffffff;
+		border-color: $u-type-error;
+		background-color: $u-type-error;
+	}
+	
+	&--warning {
+		color: #ffffff;
+		border-color: $u-type-warning;
+		background-color: $u-type-warning;
+	}
+	
+	&--default--disabled {
+		color: #ffffff;
+		border-color: #e4e7ed;
+		background-color: #ffffff;
+	}
+	
+	&--primary--disabled {
+		color: #ffffff!important;
+		border-color: $u-type-primary-disabled!important;
+		background-color: $u-type-primary-disabled!important;
+	}
+	
+	&--success--disabled {
+		color: #ffffff!important;
+		border-color: $u-type-success-disabled!important;
+		background-color: $u-type-success-disabled!important;
+	}
+	
+	&--error--disabled {
+		color: #ffffff!important;
+		border-color: $u-type-error-disabled!important;
+		background-color: $u-type-error-disabled!important;
+	}
+	
+	&--warning--disabled {
+		color: #ffffff!important;
+		border-color: $u-type-warning-disabled!important;
+		background-color: $u-type-warning-disabled!important;
+	}
+	
+	&--primary--plain {
+		color: $u-type-primary!important;
+		border-color: $u-type-primary-disabled!important;
+		background-color: $u-type-primary-light!important;
+	}
+	
+	&--success--plain {
+		color: $u-type-success!important;
+		border-color: $u-type-success-disabled!important;
+		background-color: $u-type-success-light!important;
+	}
+	
+	&--error--plain {
+		color: $u-type-error!important;
+		border-color: $u-type-error-disabled!important;
+		background-color: $u-type-error-light!important;
+	}
+	
+	&--warning--plain {
+		color: $u-type-warning!important;
+		border-color: $u-type-warning-disabled!important;
+		background-color: $u-type-warning-light!important;
+	}
+}
+
+.u-hairline-border:after {
+	content: ' ';
+	position: absolute;
+	pointer-events: none;
+	// 设置为border-box，意味着下面的scale缩小为0.5，实际上缩小的是伪元素的内容（border-box意味着内容不含border）
+	box-sizing: border-box;
+	// 中心点作为变形(scale())的原点
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	left: 0;
+	top: 0;
+	width: 199.8%;
+	height: 199.7%;
+	-webkit-transform: scale(0.5, 0.5);
+	transform: scale(0.5, 0.5);
+	border: 1px solid currentColor;
+	z-index: 1;
+}
+
+.u-wave-ripple {
+	z-index: 0;
+	position: absolute;
+	border-radius: 100%;
+	background-clip: padding-box;
+	pointer-events: none;
+	user-select: none;
+	transform: scale(0);
+	opacity: 1;
+	transform-origin: center;
+}
+
+.u-wave-ripple.u-wave-active {
+	opacity: 0;
+	transform: scale(2);
+	transition: opacity 1s linear, transform 0.4s linear;
+}
+
+.u-round-circle {
+	border-radius: 100rpx;
+}
+
+.u-round-circle::after {
+	border-radius: 100rpx;
+}
+
+.u-loading::after {
+	background-color: hsla(0, 0%, 100%, 0.35);
+}
+
+.u-size-default {
+	font-size: 30rpx;
+	height: 80rpx;
+	line-height: 80rpx;
+}
+
+.u-size-medium {
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+	width: auto;
+	font-size: 26rpx;
+	height: 70rpx;
+	line-height: 70rpx;
+	padding: 0 80rpx;
+}
+
+.u-size-mini {
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+	width: auto;
+	font-size: 22rpx;
+	padding-top: 1px;
+	height: 50rpx;
+	line-height: 50rpx;
+	padding: 0 20rpx;
+}
+
+.u-primary-plain-hover {
+	color: #ffffff !important;
+	background: $u-type-primary-dark !important;
+}
+
+.u-default-plain-hover {
+	color: $u-type-primary-dark !important;
+	background: $u-type-primary-light !important;
+}
+
+.u-success-plain-hover {
+	color: #ffffff !important;
+	background: $u-type-success-dark !important;
+}
+
+.u-warning-plain-hover {
+	color: #ffffff !important;
+	background: $u-type-warning-dark !important;
+}
+
+.u-error-plain-hover {
+	color: #ffffff !important;
+	background: $u-type-error-dark !important;
+}
+
+.u-info-plain-hover {
+	color: #ffffff !important;
+	background: $u-type-info-dark !important;
+}
+
+.u-default-hover {
+	color: $u-type-primary-dark !important;
+	border-color: $u-type-primary-dark !important;
+	background-color: $u-type-primary-light !important;
+}
+
+.u-primary-hover {
+	background: $u-type-primary-dark !important;
+	color: #fff;
+}
+
+.u-success-hover {
+	background: $u-type-success-dark !important;
+	color: #fff;
+}
+
+.u-info-hover {
+	background: $u-type-info-dark !important;
+	color: #fff;
+}
+
+.u-warning-hover {
+	background: $u-type-warning-dark !important;
+	color: #fff;
+}
+
+.u-error-hover {
+	background: $u-type-error-dark !important;
+	color: #fff;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-calendar/u-calendar.vue b/uni_modules/vk-uview-ui/components/u-calendar/u-calendar.vue
new file mode 100644
index 0000000..fe9f2dc
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-calendar/u-calendar.vue
@@ -0,0 +1,666 @@
+<template>
+	<u-popup :blur="blur" closeable :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="popupValue" length="auto"
+		:safeAreaInsetBottom="safeAreaInsetBottom" @close="close" :z-index="uZIndex" :border-radius="borderRadius" :closeable="closeable">
+		<view class="u-calendar">
+			<view class="u-calendar__header">
+				<view class="u-calendar__header__text" v-if="!$slots['tooltip']">
+					{{toolTip}}
+				</view>
+				<slot v-else name="tooltip" />
+			</view>
+			<view class="u-calendar__action u-flex u-row-center">
+				<view class="u-calendar__action__icon">
+					<u-icon v-if="changeYear" name="arrow-left-double" :color="yearArrowColor" @click="changeYearHandler(0)"></u-icon>
+				</view>
+				<view class="u-calendar__action__icon">
+					<u-icon v-if="changeMonth" name="arrow-left" :color="monthArrowColor" @click="changeMonthHandler(0)"></u-icon>
+				</view>
+				<view class="u-calendar__action__text">{{ showTitle }}</view>
+				<view class="u-calendar__action__icon">
+					<u-icon v-if="changeMonth" name="arrow-right" :color="monthArrowColor" @click="changeMonthHandler(1)"></u-icon>
+				</view>
+				<view class="u-calendar__action__icon">
+					<u-icon v-if="changeYear" name="arrow-right-double" :color="yearArrowColor" @click="changeYearHandler(1)"></u-icon>
+				</view>
+			</view>
+			<view class="u-calendar__week-day">
+				<view class="u-calendar__week-day__text" v-for="(item, index) in weekDayZh" :key="index">{{item}}</view>
+			</view>
+			<view class="u-calendar__content">
+				<!-- 前置空白部分 -->
+				<block v-for="(item, index) in weekdayArr" :key="index">
+					<view class="u-calendar__content__item"></view>
+				</block>
+				<view class="u-calendar__content__item" :class="{
+					'u-hover-class':openDisAbled(year,month,index+1),
+					'u-calendar__content--start-date': (mode == 'range' && startDate==`${year}-${month}-${index+1}`) || mode== 'date',
+					'u-calendar__content--end-date':(mode== 'range' && endDate==`${year}-${month}-${index+1}`) || mode == 'date'
+				}" :style="{backgroundColor: getColor(index,1)}" v-for="(item, index) in daysArr" :key="index"
+				 @tap="dateClick(index)">
+					<view class="u-calendar__content__item__inner" :style="{color: getColor(index,2)}">
+						<view>{{ index + 1 }}</view>
+					</view>
+					<view class="u-calendar__content__item__tips" :style="{color:activeColor}" v-if="mode== 'range' && startDate==`${year}-${month}-${index+1}` && startDate!=endDate">{{startText}}</view>
+					<view class="u-calendar__content__item__tips" :style="{color:activeColor}" v-if="mode== 'range' && endDate==`${year}-${month}-${index+1}`">{{endText}}</view>
+				</view>
+				<view class="u-calendar__content__bg-month">{{month}}</view>
+			</view>
+			<view class="u-calendar__bottom">
+				<view class="u-calendar__bottom__choose">
+					<text>{{mode == 'date' ? activeDate : startDate}}</text>
+					<text v-if="endDate">至{{endDate}}</text>
+				</view>
+				<view class="u-calendar__bottom__btn">
+					<u-button :type="btnType" shape="circle" size="default" @click="btnFix(false)">确定</u-button>
+				</view>
+			</view>
+		</view>
+	</u-popup>
+</template>
+<script>
+	/**
+	 * calendar 日历
+	 * @description 此组件用于单个选择日期，范围选择日期等，日历被包裹在底部弹起的容器中。
+	 * @tutorial http://uviewui.com/components/calendar.html
+	 * @property {String} mode 选择日期的模式，date-为单个日期，range-为选择日期范围
+	 * @property {Boolean} v-model 布尔值变量，用于控制日历的弹出与收起
+	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配(默认false)
+	 * @property {Boolean} change-year 是否显示顶部的切换年份方向的按钮(默认true)
+	 * @property {Boolean} change-month 是否显示顶部的切换月份方向的按钮(默认true)
+	 * @property {String Number} max-year 可切换的最大年份(默认2050)
+	 * @property {String Number} min-year 可切换的最小年份(默认1950)
+	 * @property {String Number} min-date 最小可选日期(默认1950-01-01)
+	 * @property {String Number} max-date 最大可选日期(默认当前日期)
+	 * @property {String Number} 弹窗顶部左右两边的圆角值，单位rpx(默认20)
+	 * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭日历(默认true)
+	 * @property {String} month-arrow-color 月份切换按钮箭头颜色(默认#606266)
+	 * @property {String} year-arrow-color 年份切换按钮箭头颜色(默认#909399)
+	 * @property {String} color 日期字体的默认颜色(默认#303133)
+	 * @property {String} active-bg-color 起始/结束日期按钮的背景色(默认#2979ff)
+	 * @property {String Number} z-index 弹出时的z-index值(默认10075)
+	 * @property {String} active-color 起始/结束日期按钮的字体颜色(默认#ffffff)
+	 * @property {String} range-bg-color 起始/结束日期之间的区域的背景颜色(默认rgba(41,121,255,0.13))
+	 * @property {String} range-color 选择范围内字体颜色(默认#2979ff)
+	 * @property {String} start-text 起始日期底部的提示文字(默认 '开始')
+	 * @property {String} end-text 结束日期底部的提示文字(默认 '结束')
+	 * @property {String} btn-type 底部确定按钮的主题(默认 'primary')
+	 * @property {String} toolTip 顶部提示文字，如设置名为tooltip的slot，此参数将失效(默认 '选择日期')
+	 * @property {Boolean} closeable 是否显示右上角的关闭图标(默认true)
+	 * @example <u-calendar v-model="show" :mode="mode"></u-calendar>
+	 */
+
+	export default {
+		name: 'u-calendar',
+		emits: ["update:modelValue", "input", "change"],
+		props: {
+			// 通过双向绑定控制组件的弹出与收起
+			value: {
+				type: Boolean,
+				default: false
+			},
+			modelValue: {
+				type: Boolean,
+				default: false
+			},
+			safeAreaInsetBottom: {
+				type: Boolean,
+				default: false
+			},
+			// 是否允许通过点击遮罩关闭Picker
+			maskCloseAble: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出的z-index值
+			zIndex: {
+				type: [String, Number],
+				default: 0
+			},
+			// 是否允许切换年份
+			changeYear: {
+				type: Boolean,
+				default: true
+			},
+			// 是否允许切换月份
+			changeMonth: {
+				type: Boolean,
+				default: true
+			},
+			// date-单个日期选择，range-开始日期+结束日期选择
+			mode: {
+				type: String,
+				default: 'date'
+			},
+			// 可切换的最大年份
+			maxYear: {
+				type: [Number, String],
+				default: 2050
+			},
+			// 可切换的最小年份
+			minYear: {
+				type: [Number, String],
+				default: 1950
+			},
+			// 最小可选日期(不在范围内日期禁用不可选)
+			minDate: {
+				type: [Number, String],
+				default: '1950-01-01'
+			},
+			/**
+			 * 最大可选日期
+			 * 默认最大值为今天，之后的日期不可选
+			 * 2030-12-31
+			 * */
+			maxDate: {
+				type: [Number, String],
+				default: ''
+			},
+			// 弹窗顶部左右两边的圆角值
+			borderRadius: {
+				type: [String, Number],
+				default: 20
+			},
+			// 月份切换按钮箭头颜色
+			monthArrowColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 年份切换按钮箭头颜色
+			yearArrowColor: {
+				type: String,
+				default: '#909399'
+			},
+			// 默认日期字体颜色
+			color: {
+				type: String,
+				default: '#303133'
+			},
+			// 选中|起始结束日期背景色
+			activeBgColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 选中|起始结束日期字体颜色
+			activeColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 范围内日期背景色
+			rangeBgColor: {
+				type: String,
+				default: 'rgba(41,121,255,0.13)'
+			},
+			// 范围内日期字体颜色
+			rangeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// mode=range时生效，起始日期自定义文案
+			startText: {
+				type: String,
+				default: '开始'
+			},
+			// mode=range时生效，结束日期自定义文案
+			endText: {
+				type: String,
+				default: '结束'
+			},
+			//按钮样式类型
+			btnType: {
+				type: String,
+				default: 'primary'
+			},
+			// 当前选中日期带选中效果
+			isActiveCurrent: {
+				type: Boolean,
+				default: true
+			},
+			// 切换年月是否触发事件 mode=date时生效
+			isChange: {
+				type: Boolean,
+				default: false
+			},
+			// 是否显示右上角的关闭图标
+			closeable: {
+				type: Boolean,
+				default: true
+			},
+			// 顶部的提示文字
+			toolTip: {
+				type: String,
+				default: '选择日期'
+			},
+			// 遮罩的模糊度
+			blur: {
+				type: [Number, String],
+				default: 0
+			},
+		},
+		data() {
+			return {
+				popupValue:false,
+				// 星期几,值为1-7
+				weekday: 1,
+				weekdayArr:[],
+				// 当前月有多少天
+				days: 0,
+				daysArr:[],
+				showTitle: '',
+				year: 2020,
+				month: 0,
+				day: 0,
+				startYear: 0,
+				startMonth: 0,
+				startDay: 0,
+				endYear: 0,
+				endMonth: 0,
+				endDay: 0,
+				today: '',
+				activeDate: '',
+				startDate: '',
+				endDate: '',
+				isStart: true,
+				min: null,
+				max: null,
+				weekDayZh: ['日', '一', '二', '三', '四', '五', '六']
+			};
+		},
+		computed: {
+			valueCom() {
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+			},
+			dataChange() {
+				return `${this.mode}-${this.minDate}-${this.maxDate}`;
+			},
+			uZIndex() {
+				// 如果用户有传递z-index值，优先使用
+				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+			}
+		},
+		watch: {
+			dataChange(val) {
+				this.init()
+			},
+			valueCom:{
+				immediate: true,
+				handler(val){
+					this.popupValue = val;
+				}
+			}
+		},
+		created() {
+			this.init()
+		},
+		methods: {
+			getColor(index, type) {
+				let color = type == 1 ? '' : this.color;
+				let day = index + 1
+				let date = `${this.year}-${this.month}-${day}`
+				let timestamp = new Date(date.replace(/\-/g, '/')).getTime();
+				let start = this.startDate.replace(/\-/g, '/')
+				let end = this.endDate.replace(/\-/g, '/')
+				if ((this.isActiveCurrent && this.activeDate == date) || this.startDate == date || this.endDate == date) {
+					color = type == 1 ? this.activeBgColor : this.activeColor;
+				} else if (this.endDate && timestamp > new Date(start).getTime() && timestamp < new Date(end).getTime()) {
+					color = type == 1 ? this.rangeBgColor : this.rangeColor;
+				}
+				return color;
+			},
+			init() {
+				let now = new Date();
+				this.year = now.getFullYear();
+				this.month = now.getMonth() + 1;
+				this.day = now.getDate();
+				this.today = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}`;
+				this.activeDate = this.today;
+				this.min = this.initDate(this.minDate);
+				this.max = this.initDate(this.maxDate || this.today);
+				this.startDate = "";
+				this.startYear = 0;
+				this.startMonth = 0;
+				this.startDay = 0;
+				this.endYear = 0;
+				this.endMonth = 0;
+				this.endDay = 0;
+				this.endDate = "";
+				this.isStart = true;
+				this.changeData();
+			},
+			//日期处理
+			initDate(date) {
+				let fdate = date.split('-');
+				return {
+					year: Number(fdate[0] || 1920),
+					month: Number(fdate[1] || 1),
+					day: Number(fdate[2] || 1)
+				}
+			},
+			openDisAbled: function(year, month, day) {
+				let bool = true;
+				let date = `${year}/${month}/${day}`;
+				// let today = this.today.replace(/\-/g, '/');
+				let min = `${this.min.year}/${this.min.month}/${this.min.day}`;
+				let max = `${this.max.year}/${this.max.month}/${this.max.day}`;
+				let timestamp = new Date(date).getTime();
+				if (timestamp >= new Date(min).getTime() && timestamp <= new Date(max).getTime()) {
+					bool = false;
+				}
+				return bool;
+			},
+			generateArray: function(start, end) {
+				return Array.from(new Array(end + 1).keys()).slice(start);
+			},
+			formatNum: function(num) {
+				return num < 10 ? '0' + num : num + '';
+			},
+			//一个月有多少天
+			getMonthDay(year, month) {
+				let days = new Date(year, month, 0).getDate();
+				return days;
+			},
+			getWeekday(year, month) {
+				let date = new Date(`${year}/${month}/01 00:00:00`);
+				return date.getDay();
+			},
+			checkRange(year) {
+				let overstep = false;
+				if (year < this.minYear || year > this.maxYear) {
+					uni.showToast({
+						title: "日期超出范围啦~",
+						icon: 'none'
+					})
+					overstep = true;
+				}
+				return overstep;
+			},
+			changeMonthHandler(isAdd) {
+				if (isAdd) {
+					let month = this.month + 1;
+					let year = month > 12 ? this.year + 1 : this.year;
+					if (!this.checkRange(year)) {
+						this.month = month > 12 ? 1 : month;
+						this.year = year;
+						this.changeData();
+					}
+
+				} else {
+					let month = this.month - 1;
+					let year = month < 1 ? this.year - 1 : this.year;
+					if (!this.checkRange(year)) {
+						this.month = month < 1 ? 12 : month;
+						this.year = year;
+						this.changeData();
+					}
+				}
+			},
+			changeYearHandler(isAdd) {
+				let year = isAdd ? this.year + 1 : this.year - 1;
+				if (!this.checkRange(year)) {
+					this.year = year;
+					this.changeData();
+				}
+			},
+			changeData() {
+				this.days = this.getMonthDay(this.year, this.month);
+				this.daysArr=this.generateArray(1,this.days)
+				this.weekday = this.getWeekday(this.year, this.month);
+				this.weekdayArr=this.generateArray(1,this.weekday)
+				this.showTitle = `${this.year}年${this.month}月`;
+				if (this.isChange && this.mode == 'date') {
+					this.btnFix(true);
+				}
+			},
+			dateClick: function(day) {
+				day += 1;
+				if (!this.openDisAbled(this.year, this.month, day)) {
+					this.day = day;
+					let date = `${this.year}-${this.month}-${day}`;
+					if (this.mode == 'date') {
+						this.activeDate = date;
+					} else {
+						let compare = new Date(date.replace(/\-/g, '/')).getTime() < new Date(this.startDate.replace(/\-/g, '/')).getTime()
+						if (this.isStart || compare) {
+							this.startDate = date;
+							this.startYear = this.year;
+							this.startMonth = this.month;
+							this.startDay = this.day;
+							this.endYear = 0;
+							this.endMonth = 0;
+							this.endDay = 0;
+							this.endDate = "";
+							this.activeDate = "";
+							this.isStart = false;
+						} else {
+							this.endDate = date;
+							this.endYear = this.year;
+							this.endMonth = this.month;
+							this.endDay = this.day;
+							this.isStart = true;
+						}
+					}
+				}
+			},
+			close() {
+				// 修改通过v-model绑定的父组件变量的值为false，从而隐藏日历弹窗
+				this.$emit('input', false);
+				this.$emit("update:modelValue", false);
+			},
+			getWeekText(date) {
+				date = new Date(`${date.replace(/\-/g, '/')} 00:00:00`);
+				let week = date.getDay();
+				return '星期' + ['日', '一', '二', '三', '四', '五', '六'][week];
+			},
+			btnFix(show) {
+				if (!show) {
+					this.close();
+				}
+				if (this.mode == 'date') {
+					let arr = this.activeDate.split('-')
+					let year = this.isChange ? this.year : Number(arr[0]);
+					let month = this.isChange ? this.month : Number(arr[1]);
+					let day = this.isChange ? this.day : Number(arr[2]);
+					//当前月有多少天
+					let days = this.getMonthDay(year, month);
+					let result = `${year}-${this.formatNum(month)}-${this.formatNum(day)}`;
+					let weekText = this.getWeekText(result);
+					let isToday = false;
+					if (`${year}-${month}-${day}` == this.today) {
+						//今天
+						isToday = true;
+					}
+					this.$emit('change', {
+						year: year,
+						month: month,
+						day: day,
+						days: days,
+						result: result,
+						week: weekText,
+						isToday: isToday,
+						// switch: show //是否是切换年月操作
+					});
+				} else {
+					if (!this.startDate || !this.endDate) return;
+					let startMonth = this.formatNum(this.startMonth);
+					let startDay = this.formatNum(this.startDay);
+					let startDate = `${this.startYear}-${startMonth}-${startDay}`;
+					let startWeek = this.getWeekText(startDate)
+
+					let endMonth = this.formatNum(this.endMonth);
+					let endDay = this.formatNum(this.endDay);
+					let endDate = `${this.endYear}-${endMonth}-${endDay}`;
+					let endWeek = this.getWeekText(endDate);
+					this.$emit('change', {
+						startYear: this.startYear,
+						startMonth: this.startMonth,
+						startDay: this.startDay,
+						startDate: startDate,
+						startWeek: startWeek,
+						endYear: this.endYear,
+						endMonth: this.endMonth,
+						endDay: this.endDay,
+						endDate: endDate,
+						endWeek: endWeek
+					});
+				}
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	.u-calendar {
+		color: $u-content-color;
+
+		&__header {
+			width: 100%;
+			box-sizing: border-box;
+			font-size: 30rpx;
+			background-color: #fff;
+			color: $u-main-color;
+
+			&__text {
+				margin-top: 30rpx;
+				padding: 0 60rpx;
+				@include vue-flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+
+		&__action {
+			padding: 40rpx 0 40rpx 0;
+
+			&__icon {
+				margin: 0 16rpx;
+			}
+
+			&__text {
+				padding: 0 16rpx;
+				color: $u-main-color;
+				font-size: 32rpx;
+				line-height: 32rpx;
+				font-weight: bold;
+			}
+		}
+
+		&__week-day {
+			@include vue-flex;
+			align-items: center;
+			justify-content: center;
+			padding: 6px 0;
+			overflow: hidden;
+
+			&__text {
+				flex: 1;
+				text-align: center;
+			}
+		}
+
+		&__content {
+			width: 100%;
+			@include vue-flex;
+			flex-wrap: wrap;
+			padding: 6px 0;
+			box-sizing: border-box;
+			background-color: #fff;
+			position: relative;
+
+			&--end-date {
+				border-top-right-radius: 8rpx;
+				border-bottom-right-radius: 8rpx;
+			}
+
+			&--start-date {
+				border-top-left-radius: 8rpx;
+				border-bottom-left-radius: 8rpx;
+			}
+
+			&__item {
+				width: 14.2857%;
+				@include vue-flex;
+				align-items: center;
+				justify-content: center;
+				padding: 6px 0;
+				overflow: hidden;
+				position: relative;
+				z-index: 2;
+
+				&__inner {
+					height: 84rpx;
+					@include vue-flex;
+					align-items: center;
+					justify-content: center;
+					flex-direction: column;
+					font-size: 32rpx;
+					position: relative;
+					border-radius: 50%;
+
+					&__desc {
+						width: 100%;
+						font-size: 24rpx;
+						line-height: 24rpx;
+						transform: scale(0.75);
+						transform-origin: center center;
+						position: absolute;
+						left: 0;
+						text-align: center;
+						bottom: 2rpx;
+					}
+				}
+
+				&__tips {
+					width: 100%;
+					font-size: 24rpx;
+					line-height: 24rpx;
+					position: absolute;
+					left: 0;
+					transform: scale(0.8);
+					transform-origin: center center;
+					text-align: center;
+					bottom: 8rpx;
+					z-index: 2;
+				}
+			}
+
+			&__bg-month {
+				position: absolute;
+				font-size: 130px;
+				line-height: 130px;
+				left: 50%;
+				top: 50%;
+				transform: translate(-50%, -50%);
+				color: #e4e7ed;
+				z-index: 1;
+			}
+		}
+
+		&__bottom {
+			width: 100%;
+			@include vue-flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			background-color: #fff;
+			padding: 0 40rpx 30rpx;
+			box-sizing: border-box;
+			font-size: 24rpx;
+			color: $u-tips-color;
+
+			&__choose {
+				height: 50rpx;
+			}
+
+			&__btn {
+				width: 100%;
+			}
+		}
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-car-keyboard/u-car-keyboard.vue b/uni_modules/vk-uview-ui/components/u-car-keyboard/u-car-keyboard.vue
new file mode 100644
index 0000000..e55db26
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-car-keyboard/u-car-keyboard.vue
@@ -0,0 +1,267 @@
+<template>
+	<view class="u-keyboard" @touchmove.stop.prevent="() => {}">
+		<view class="u-keyboard-grids">
+      <view class="u-keyboard-grids-item" v-for="(group, i) in abc ? EngKeyBoardList : areaList" :key="i">
+        <view :hover-stay-time="100" @touchstart="carInputClick(i, j)" hover-class="u-carinput-hover" class="u-keyboard-grids-btn"
+         v-for="(item, j) in group" :key="j">
+          {{ item }}
+        </view>
+      </view>
+      <view @touchstart="backspaceClick" @touchend="clearTimer" :hover-stay-time="100" class="u-keyboard-back"
+       hover-class="u-hover-class">
+        <u-icon :size="38" name="backspace" :bold="true"></u-icon>
+      </view>
+      <view :hover-stay-time="100" class="u-keyboard-change" hover-class="u-carinput-hover" @click="changeCarInputMode">
+        <text class="zh" :class="[!abc ? 'active' : 'inactive']">中</text>
+        /
+        <text class="en" :class="[abc ? 'active' : 'inactive']">英</text>
+      </view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "u-keyboard",
+    emits: ["change", "backspace"],
+		props: {
+			// 是否打乱键盘按键的顺序
+			random: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				// 车牌输入时，abc=true为输入车牌号码，bac=false为输入省份中文简称
+				abc: false
+			};
+		},
+		computed: {
+			areaList() {
+				let data = [
+					'京',
+					'沪',
+					'粤',
+					'津',
+					'冀',
+					'豫',
+					'云',
+					'辽',
+					'黑',
+					'湘',
+					'皖',
+					'鲁',
+					'苏',
+					'浙',
+					'赣',
+					'鄂',
+					'桂',
+					'甘',
+					'晋',
+					'陕',
+					'蒙',
+					'吉',
+					'闽',
+					'贵',
+					'渝',
+					'川',
+					'青',
+					'琼',
+					'宁',
+					'挂',
+					'藏',
+					'港',
+					'澳',
+					'新',
+					'使',
+					'学'
+				];
+				let tmp = [];
+				// 打乱顺序
+				if (this.random) data = this.$u.randomArray(data);
+				// 切割成二维数组
+				tmp[0] = data.slice(0, 10);
+				tmp[1] = data.slice(10, 20);
+				tmp[2] = data.slice(20, 30);
+				tmp[3] = data.slice(30, 36);
+				return tmp;
+			},
+			EngKeyBoardList() {
+				let data = [
+					1,
+					2,
+					3,
+					4,
+					5,
+					6,
+					7,
+					8,
+					9,
+					0,
+					'Q',
+					'W',
+					'E',
+					'R',
+					'T',
+					'Y',
+					'U',
+					'I',
+					'O',
+					'P',
+					'A',
+					'S',
+					'D',
+					'F',
+					'G',
+					'H',
+					'J',
+					'K',
+					'L',
+					'Z',
+					'X',
+					'C',
+					'V',
+					'B',
+					'N',
+					'M'
+				];
+				let tmp = [];
+				if (this.random) data = this.$u.randomArray(data);
+				tmp[0] = data.slice(0, 10);
+				tmp[1] = data.slice(10, 20);
+				tmp[2] = data.slice(20, 30);
+				tmp[3] = data.slice(30, 36);
+				return tmp;
+			}
+		},
+		methods: {
+			// 点击键盘按钮
+			carInputClick(i, j) {
+        let value = '';
+        // 不同模式，获取不同数组的值
+        if (this.abc) value = this.EngKeyBoardList[i][j];
+        else value = this.areaList[i][j];
+        if(!this.abc) this.abc = true;
+        this.$emit('change', value);
+        if(this.vibrate) uni.vibrateShort();
+			},
+			// 修改汽车牌键盘的输入模式，中文|英文
+			changeCarInputMode() {
+				this.abc = !this.abc;
+			},
+			// 修改汽车牌键盘的输入模式，中文|英文
+			updateCarInputMode(abc) {
+				this.abc = abc;
+			},
+			// 点击退格键
+			backspaceClick() {
+				let count = 1;
+				this.backspaceFn(count);
+				clearInterval(this.timer); //再次清空定时器，防止重复注册定时器
+				this.timer = null;
+				this.timer = setInterval(() => {
+					count++;
+					this.backspaceFn(count);
+				}, 250);
+			},
+			backspaceFn(count){
+				this.$emit('backspace',count);
+			},
+			clearTimer() {
+				clearInterval(this.timer);
+				this.timer = null;
+			},
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-keyboard-grids {
+		background: rgb(215, 215, 217);
+		padding: 24rpx 0;
+		position: relative;
+	}
+
+	.u-keyboard-grids-item {
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.u-keyboard-grids-btn {
+		text-decoration: none;
+		width: 62rpx;
+		flex: 0 0 64rpx;
+		height: 80rpx;
+		/* #ifndef APP-NVUE */
+		display: inline-flex;		
+		/* #endif */
+		font-size: 36rpx;
+		text-align: center;
+		line-height: 80rpx;
+		background-color: #fff;
+		margin: 8rpx 5rpx;
+		border-radius: 8rpx;
+		box-shadow: 0 2rpx 0rpx #888992;
+		font-weight: 500;
+		justify-content: center;
+	}
+
+	.u-carinput-hover {
+		background-color: rgb(185, 188, 195) !important;
+	}
+
+	.u-keyboard-back {
+		position: absolute;
+		width: 96rpx;
+		right: 22rpx;
+		bottom: 32rpx;
+		height: 80rpx;
+		background-color: rgb(185, 188, 195);
+		@include vue-flex;
+		align-items: center;
+		border-radius: 8rpx;
+		justify-content: center;
+		box-shadow: 0 2rpx 0rpx #888992;
+	}
+
+	.u-keyboard-change {
+		font-size: 24rpx;
+		box-shadow: 0 2rpx 0rpx #888992;
+		position: absolute;
+		width: 96rpx;
+		left: 22rpx;
+		line-height: 1;
+		bottom: 32rpx;
+		height: 80rpx;
+		background-color: #ffffff;
+		@include vue-flex;
+		align-items: center;
+		border-radius: 8rpx;
+		justify-content: center;
+	}
+
+	.u-keyboard-change .inactive.zh {
+		transform: scale(0.85) translateY(-10rpx);
+	}
+
+	.u-keyboard-change .inactive.en {
+		transform: scale(0.85) translateY(10rpx);
+	}
+
+	.u-keyboard-change .active {
+		color: rgb(237, 112, 64);
+		font-size: 30rpx;
+	}
+
+	.u-keyboard-change .zh {
+		transform: translateY(-10rpx);
+	}
+
+	.u-keyboard-change .en {
+		transform: translateY(10rpx);
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-card/u-card.vue b/uni_modules/vk-uview-ui/components/u-card/u-card.vue
new file mode 100644
index 0000000..03f9924
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-card/u-card.vue
@@ -0,0 +1,300 @@
+<template>
+	<view
+		class="u-card"
+		@tap.stop="click"
+		:class="{ 'u-border': border, 'u-card-full': full, 'u-card--border': borderRadius > 0 }"
+		:style="{
+			borderRadius: borderRadius + 'rpx',
+			margin: margin,
+			boxShadow: boxShadow
+		}"
+	>
+		<view
+			v-if="showHead"
+			class="u-card__head"
+			:style="[{padding: padding + 'rpx'}, headStyle]"
+			:class="{
+				'u-border-bottom': headBorderBottom
+			}"
+			@tap="headClick"
+		>
+			<view v-if="!$slots.head" class="u-flex u-row-between">
+				<view class="u-card__head--left u-flex u-line-1" v-if="title">
+					<image
+						:src="thumb"
+						class="u-card__head--left__thumb"
+						mode="aspectFill"
+						v-if="thumb"
+						:style="{
+							height: thumbWidth + 'rpx',
+							width: thumbWidth + 'rpx',
+							borderRadius: thumbCircle ? '100rpx' : '6rpx'
+						}"
+					></image>
+					<text
+						class="u-card__head--left__title u-line-1"
+						:style="{
+							fontSize: titleSize + 'rpx',
+							color: titleColor
+						}"
+					>
+						{{ title }}
+					</text>
+				</view>
+				<view class="u-card__head--right u-line-1" v-if="subTitle">
+					<text
+						class="u-card__head__title__text"
+						:style="{
+							fontSize: subTitleSize + 'rpx',
+							color: subTitleColor
+						}"
+					>
+						{{ subTitle }}
+					</text>
+				</view>
+			</view>
+			<slot name="head" v-else />
+		</view>
+		<view @tap="bodyClick" class="u-card__body" :style="[{padding: padding + 'rpx'}, bodyStyle]"><slot name="body" /></view>
+		<view
+			v-if="showFoot"
+			class="u-card__foot"
+			 @tap="footClick"
+			:style="[{padding: $slots.foot ? padding + 'rpx' : 0}, footStyle]"
+			:class="{
+				'u-border-top': footBorderTop
+			}"
+		>
+			<slot name="foot" />
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * card 卡片
+ * @description 卡片组件一般用于多个列表条目，且风格统一的场景
+ * @tutorial https://www.uviewui.com/components/card.html
+ * @property {Boolean} full 卡片与屏幕两侧是否留空隙（默认false）
+ * @property {String} title 头部左边的标题
+ * @property {String} title-color 标题颜色（默认#303133）
+ * @property {String | Number} title-size 标题字体大小，单位rpx（默认30）
+ * @property {String} sub-title 头部右边的副标题
+ * @property {String} sub-title-color 副标题颜色（默认#909399）
+ * @property {String | Number} sub-title-size 副标题字体大小（默认26）
+ * @property {Boolean} border 是否显示边框（默认true）
+ * @property {String | Number} index 用于标识点击了第几个卡片
+ * @property {String} box-shadow 卡片外围阴影，字符串形式（默认none）
+ * @property {String} margin 卡片与屏幕两边和上下元素的间距，需带单位，如"30rpx 20rpx"（默认30rpx）
+ * @property {String | Number} border-radius 卡片整体的圆角值，单位rpx（默认16）
+ * @property {Object} head-style 头部自定义样式，对象形式
+ * @property {Object} body-style 中部自定义样式，对象形式
+ * @property {Object} foot-style 底部自定义样式，对象形式
+ * @property {Boolean} head-border-bottom 是否显示头部的下边框（默认true）
+ * @property {Boolean} foot-border-top 是否显示底部的上边框（默认true）
+ * @property {Boolean} show-head 是否显示头部（默认true）
+ * @property {Boolean} show-head 是否显示尾部（默认true）
+ * @property {String} thumb 缩略图路径，如设置将显示在标题的左边，不建议使用相对路径
+ * @property {String | Number} thumb-width 缩略图的宽度，高等于宽，单位rpx（默认60）
+ * @property {Boolean} thumb-circle 缩略图是否为圆形（默认false）
+ * @event {Function} click 整个卡片任意位置被点击时触发
+ * @event {Function} head-click 卡片头部被点击时触发
+ * @event {Function} body-click 卡片主体部分被点击时触发
+ * @event {Function} foot-click 卡片底部部分被点击时触发
+ * @example <u-card padding="30" title="card"></u-card>
+ */
+export default {
+	name: 'u-card',
+  emits: ["click", "head-click", "body-click", "foot-click"],
+	props: {
+		// 与屏幕两侧是否留空隙
+		full: {
+			type: Boolean,
+			default: false
+		},
+		// 标题
+		title: {
+			type: String,
+			default: ''
+		},
+		// 标题颜色
+		titleColor: {
+			type: String,
+			default: '#303133'
+		},
+		// 标题字体大小，单位rpx
+		titleSize: {
+			type: [Number, String],
+			default: '30'
+		},
+		// 副标题
+		subTitle: {
+			type: String,
+			default: ''
+		},
+		// 副标题颜色
+		subTitleColor: {
+			type: String,
+			default: '#909399'
+		},
+		// 副标题字体大小，单位rpx
+		subTitleSize: {
+			type: [Number, String],
+			default: '26'
+		},
+		// 是否显示外部边框，只对full=false时有效(卡片与边框有空隙时)
+		border: {
+			type: Boolean,
+			default: true
+		},
+		// 用于标识点击了第几个
+		index: {
+			type: [Number, String, Object],
+			default: ''
+		},
+		// 用于隔开上下左右的边距，带单位的写法，如："30rpx 30rpx"，"20rpx 20rpx 30rpx 30rpx"
+		margin: {
+			type: String,
+			default: '30rpx'
+		},
+		// card卡片的圆角
+		borderRadius: {
+			type: [Number, String],
+			default: '16'
+		},
+		// 头部自定义样式，对象形式
+		headStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 主体自定义样式，对象形式
+		bodyStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 底部自定义样式，对象形式
+		footStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 头部是否下边框
+		headBorderBottom: {
+			type: Boolean,
+			default: true
+		},
+		// 底部是否有上边框
+		footBorderTop: {
+			type: Boolean,
+			default: true
+		},
+		// 标题左边的缩略图
+		thumb: {
+			type: String,
+			default: ''
+		},
+		// 缩略图宽高，单位rpx
+		thumbWidth: {
+			type: [String, Number],
+			default: '60'
+		},
+		// 缩略图是否为圆形
+		thumbCircle: {
+			type: Boolean,
+			default: false
+		},
+		// 给head，body，foot的内边距
+		padding: {
+			type: [String, Number],
+			default: '30'
+		},
+		// 是否显示头部
+		showHead: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示尾部
+		showFoot: {
+			type: Boolean,
+			default: true
+		},
+		// 卡片外围阴影，字符串形式
+		boxShadow: {
+			type: String,
+			default: 'none'
+		}
+	},
+	data() {
+		return {};
+	},
+	methods: {
+		click() {
+			this.$emit('click', this.index);
+		},
+		headClick() {
+			this.$emit('head-click', this.index);
+		},
+		bodyClick() {
+			this.$emit('body-click', this.index);
+		},
+		footClick() {
+			this.$emit('foot-click', this.index);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-card {
+	position: relative;
+	overflow: hidden;
+	font-size: 28rpx;
+	background-color: #ffffff;
+	box-sizing: border-box;
+
+	&-full {
+		// 如果是与屏幕之间不留空隙，应该设置左右边距为0
+		margin-left: 0 !important;
+		margin-right: 0 !important;
+		width: 100%;
+	}
+
+	&--border:after {
+		border-radius: 16rpx;
+	}
+
+	&__head {
+		&--left {
+			color: $u-main-color;
+
+			&__thumb {
+				margin-right: 16rpx;
+			}
+
+			&__title {
+				max-width: 400rpx;
+			}
+		}
+
+		&--right {
+			color: $u-tips-color;
+			margin-left: 6rpx;
+		}
+	}
+
+	&__body {
+		color: $u-content-color;
+	}
+
+	&__foot {
+		color: $u-tips-color;
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-cell-group/u-cell-group.vue b/uni_modules/vk-uview-ui/components/u-cell-group/u-cell-group.vue
new file mode 100644
index 0000000..3fbca72
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-cell-group/u-cell-group.vue
@@ -0,0 +1,70 @@
+<template>
+	<view class="u-cell-box">
+		<view class="u-cell-title" v-if="title" :style="[titleStyle]">
+			{{title}}
+		</view>
+		<view class="u-cell-item-box" :class="{'u-border-bottom u-border-top': border}">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * cellGroup 单元格父组件Group
+	 * @description cell单元格一般用于一组列表的情况，比如个人中心页，设置页等。搭配u-cell-item
+	 * @tutorial https://www.uviewui.com/components/cell.html
+	 * @property {String} title 分组标题
+	 * @property {Boolean} border 是否显示外边框（默认true）
+	 * @property {Object} title-style 分组标题的的样式，对象形式，如{'font-size': '24rpx'} 或 {'fontSize': '24rpx'}
+	 * @example <u-cell-group title="设置喜好">
+	 */
+	export default {
+		name: "u-cell-group",
+		props: {
+			// 分组标题
+			title: {
+				type: String,
+				default: ''
+			},
+			// 是否显示分组list上下边框
+			border: {
+				type: Boolean,
+				default: true
+			},
+			// 分组标题的样式，对象形式，注意驼峰属性写法
+			// 类似 {'font-size': '24rpx'} 和 {'fontSize': '24rpx'}
+			titleStyle: {
+				type: Object,
+				default () {
+					return {};
+				}
+			}
+		},
+		data() {
+			return {
+				index: 0,
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-cell-box {
+		width: 100%;
+	}
+
+	.u-cell-title {
+		padding: 30rpx 32rpx 10rpx 32rpx;
+		font-size: 30rpx;
+		text-align: left;
+		color: $u-tips-color;
+	}
+
+	.u-cell-item-box {
+		background-color: #FFFFFF;
+		flex-direction: row;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-cell-item/u-cell-item.vue b/uni_modules/vk-uview-ui/components/u-cell-item/u-cell-item.vue
new file mode 100644
index 0000000..b512d80
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-cell-item/u-cell-item.vue
@@ -0,0 +1,317 @@
+<template>
+	<view
+		@tap="click"
+		class="u-cell"
+		:class="{ 'u-border-bottom': borderBottom, 'u-border-top': borderTop, 'u-col-center': center, 'u-cell--required': required }"
+		hover-stay-time="150"
+		:hover-class="hoverClass"
+		:style="{
+			backgroundColor: bgColor
+		}"
+	>
+		<u-icon :size="iconSize" :name="icon" v-if="icon" :custom-style="iconStyle" class="u-cell__left-icon-wrap"></u-icon>
+		<view class="u-flex" v-else>
+			<slot name="icon"></slot>
+		</view>
+		<view
+			class="u-cell_title"
+			:style="[
+				{
+					width: titleWidth ? titleWidth + 'rpx' : 'auto'
+				},
+				titleStyle
+			]"
+		>
+			<block v-if="title !== ''">{{ title }}</block>
+			<slot name="title" v-else></slot>
+
+			<view class="u-cell__label" v-if="label || $slots.label" :style="[labelStyle]">
+				<block v-if="label !== ''">{{ label }}</block>
+				<slot name="label" v-else></slot>
+			</view>
+		</view>
+
+		<view class="u-cell__value" :style="[valueStyle]">
+			<block class="u-cell__value" v-if="value !== ''">{{ value }}</block>
+			<slot v-else></slot>
+		</view>
+		<view class="u-flex u-cell_right" v-if="$slots['right-icon']">
+			<slot name="right-icon"></slot>
+		</view>
+		<u-icon v-if="arrow" name="arrow-right" :style="[arrowStyle]" class="u-icon-wrap u-cell__right-icon-wrap"></u-icon>
+	</view>
+</template>
+
+<script>
+/**
+ * cellItem 单元格Item
+ * @description cell单元格一般用于一组列表的情况，比如个人中心页，设置页等。搭配u-cell-group使用
+ * @tutorial https://www.uviewui.com/components/cell.html
+ * @property {String} title 左侧标题
+ * @property {String} icon 左侧图标名，只支持uView内置图标，见Icon 图标
+ * @property {Object} icon-style 左边图标的样式，对象形式
+ * @property {String} value 右侧内容
+ * @property {String} label 标题下方的描述信息
+ * @property {Boolean} border-bottom 是否显示cell的下边框（默认true）
+ * @property {Boolean} border-top 是否显示cell的上边框（默认false）
+ * @property {Boolean} center 是否使内容垂直居中（默认false）
+ * @property {String} hover-class 是否开启点击反馈，none为无效果（默认true）
+ * // @property {Boolean} border-gap border-bottom为true时，Cell列表中间的条目的下边框是否与左边有一个间隔（默认true）
+ * @property {Boolean} arrow 是否显示右侧箭头（默认true）
+ * @property {Boolean} required 箭头方向，可选值（默认right）
+ * @property {Boolean} arrow-direction 是否显示左边表示必填的星号（默认false）
+ * @property {Object} title-style 标题样式，对象形式
+ * @property {Object} value-style 右侧内容样式，对象形式
+ * @property {Object} label-style 标题下方描述信息的样式，对象形式
+ * @property {String} bg-color 背景颜色（默认transparent）
+ * @property {String Number} index 用于在click事件回调中返回，标识当前是第几个Item
+ * @property {String Number} title-width 标题的宽度，单位rpx
+ * @example <u-cell-item icon="integral-fill" title="会员等级" value="新版本"></u-cell-item>
+ */
+export default {
+	name: 'u-cell-item',
+	emits: ["click"],
+	props: {
+		// 左侧图标名称(只能uView内置图标)，或者图标src
+		icon: {
+			type: String,
+			default: ''
+		},
+		// 左侧标题
+		title: {
+			type: [String, Number],
+			default: ''
+		},
+		// 右侧内容
+		value: {
+			type: [String, Number],
+			default: ''
+		},
+		// 标题下方的描述信息
+		label: {
+			type: [String, Number],
+			default: ''
+		},
+		// 是否显示下边框
+		borderBottom: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示上边框
+		borderTop: {
+			type: Boolean,
+			default: false
+		},
+		// 多个cell中，中间的cell显示下划线时，下划线是否给一个到左边的距离
+		// 1.4.0版本废除此参数，默认边框由border-top和border-bottom提供，此参数会造成干扰
+		// borderGap: {
+		// 	type: Boolean,
+		// 	default: true
+		// },
+		// 是否开启点击反馈，即点击时cell背景为灰色，none为无效果
+		hoverClass: {
+			type: String,
+			default: 'u-cell-hover'
+		},
+		// 是否显示右侧箭头
+		arrow: {
+			type: Boolean,
+			default: true
+		},
+		// 内容是否垂直居中
+		center: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示左边表示必填的星号
+		required: {
+			type: Boolean,
+			default: false
+		},
+		// 标题的宽度，单位rpx
+		titleWidth: {
+			type: [Number, String],
+			default: ''
+		},
+		// 右侧箭头方向，可选值：right|up|down，默认为right
+		arrowDirection: {
+			type: String,
+			default: 'right'
+		},
+		// 控制标题的样式
+		titleStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 右侧显示内容的样式
+		valueStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 描述信息的样式
+		labelStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 背景颜色
+		bgColor: {
+			type: String,
+			default: 'transparent'
+		},
+		// 用于识别被点击的是第几个cell
+		index: {
+			type: [String, Number],
+			default: ''
+		},
+		// 是否使用lable插槽
+		useLabelSlot: {
+			type: Boolean,
+			default: false
+		},
+		// 左边图标的大小，单位rpx，只对传入icon字段时有效
+		iconSize: {
+			type: [Number, String],
+			default: 34
+		},
+		// 左边图标的样式，对象形式
+		iconStyle: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+	},
+	data() {
+		return {
+
+		};
+	},
+	computed: {
+		arrowStyle() {
+			let style = {};
+			if (this.arrowDirection == 'up') style.transform = 'rotate(-90deg)';
+			else if (this.arrowDirection == 'down') style.transform = 'rotate(90deg)';
+			else style.transform = 'rotate(0deg)';
+			return style;
+		}
+	},
+	methods: {
+		click() {
+			this.$emit('click', this.index);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+.u-cell {
+	@include vue-flex;
+	align-items: center;
+	position: relative;
+	/* #ifndef APP-NVUE */
+	box-sizing: border-box;
+	/* #endif */
+	width: 100%;
+	padding: 10rpx 10rpx 10rpx 10rpx ;
+	font-size: 30rpx;
+	line-height: 60rpx;
+	color: $u-content-color;
+	background-color: #fff;
+	text-align: left;
+}
+
+.u-cell_title {
+	font-size: 30rpx;
+}
+
+.u-cell__left-icon-wrap {
+	margin-right: 10rpx;
+	font-size: 32rpx;
+}
+
+.u-cell__right-icon-wrap {
+	margin-left: 10rpx;
+	color: #969799;
+	font-size: 28rpx;
+}
+
+.u-cell__left-icon-wrap,
+.u-cell__right-icon-wrap {
+	@include vue-flex;
+	align-items: center;
+	height: 48rpx;
+}
+
+.u-cell-border:after {
+	position: absolute; 
+	/* #ifndef APP-NVUE */
+	box-sizing: border-box;
+	content: ' ';
+	pointer-events: none;
+	border-bottom: 1px solid $u-border-color;
+	/* #endif */
+	right: 0;
+	left: 0;
+	top: 0;
+	transform: scaleY(0.5);
+}
+
+.u-cell-border {
+	position: relative;
+}
+
+.u-cell__label {
+	margin-top: 6rpx;
+	font-size: 26rpx;
+	line-height: 36rpx;
+	color: $u-tips-color;
+	/* #ifndef APP-NVUE */
+	word-wrap: break-word;
+	/* #endif */
+}
+
+.u-cell__value {
+	overflow: hidden;
+	text-align: right;
+	/* #ifndef APP-NVUE */
+	vertical-align: middle;
+	/* #endif */
+	color: $u-tips-color;
+	font-size: 26rpx;
+}
+
+.u-cell__title,
+.u-cell__value {
+	flex: 1;
+}
+
+.u-cell--required {
+	/* #ifndef APP-NVUE */
+	overflow: visible;
+	/* #endif */
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-cell--required:before {
+	position: absolute;
+	/* #ifndef APP-NVUE */
+	content: '*';
+	/* #endif */
+	left: 8px;
+	margin-top: 4rpx;
+	font-size: 14px;
+	color: $u-type-error;
+}
+
+.u-cell_right {
+	line-height: 1;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-checkbox-group/u-checkbox-group.vue b/uni_modules/vk-uview-ui/components/u-checkbox-group/u-checkbox-group.vue
new file mode 100644
index 0000000..18c39e7
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-checkbox-group/u-checkbox-group.vue
@@ -0,0 +1,178 @@
+<template>
+	<view class="u-checkbox-group u-clearfix" :class="uFromData.inputAlign == 'right' ? 'flex-end' : ''"><slot></slot></view>
+</template>
+
+<script>
+import Emitter from "../../libs/util/emitter.js";
+/**
+ * checkboxGroup 开关选择器父组件Group
+ * @description 复选框组件一般用于需要多个选择的场景，该组件功能完整，使用方便
+ * @tutorial https://www.uviewui.com/components/checkbox.html
+ * @property {String Number} max 最多能选中多少个checkbox（默认999）
+ * @property {String Number} size 组件整体的大小，单位rpx（默认40）
+ * @property {Boolean} disabled 是否禁用所有checkbox（默认false）
+ * @property {String Number} icon-size 图标大小，单位rpx（默认20）
+ * @property {Boolean} label-disabled 是否禁止点击文本操作checkbox(默认false)
+ * @property {String} width 宽度，需带单位
+ * @property {String} width 宽度，需带单位
+ * @property {String} shape 外观形状，shape-方形，circle-圆形(默认circle)
+ * @property {Boolean} wrap 是否每个checkbox都换行（默认false）
+ * @property {String} active-color 选中时的颜色，应用到所有子Checkbox组件（默认#2979ff）
+ * @event {Function} change 任一个checkbox状态发生变化时触发，回调为一个对象
+ * @example <u-checkbox-group></u-checkbox-group>
+ */
+export default {
+	name: "u-checkbox-group",
+	emits: ["update:modelValue", "input", "change"],
+	mixins: [Emitter],
+	props: {
+		// 匹配某一个radio组件，如果某个radio的name值等于此值，那么这个radio就被会选中
+		value: {
+			type: [String, Number, Array, Boolean],
+			default: ""
+		},
+		modelValue: {
+			type: [String, Number, Array, Boolean],
+			default: ""
+		},
+		// 最多能选中多少个checkbox
+		max: {
+			type: [Number, String],
+			default: 999
+		},
+		// 所有选中项的 name
+		// value: {
+		// 	default: Array,
+		// 	default() {
+		// 		return []
+		// 	}
+		// },
+		// 是否禁用所有复选框
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 在表单内提交时的标识符
+		name: {
+			type: [Boolean, String],
+			default: ""
+		},
+		// 是否禁止点击提示语选中复选框
+		labelDisabled: {
+			type: Boolean,
+			default: false
+		},
+		// 形状，square为方形，circle为圆型
+		shape: {
+			type: String,
+			default: "square"
+		},
+		// 选中状态下的颜色
+		activeColor: {
+			type: String,
+			default: "#2979ff"
+		},
+		// 组件的整体大小
+		size: {
+			type: [String, Number],
+			default: 34
+		},
+		// 每个checkbox占u-checkbox-group的宽度
+		width: {
+			type: String,
+			default: "auto"
+		},
+		// 是否每个checkbox都换行
+		wrap: {
+			type: Boolean,
+			default: false
+		},
+		// 图标的大小，单位rpx
+		iconSize: {
+			type: [String, Number],
+			default: 20
+		}
+	},
+	data() {
+		return {
+			values: [],
+			uFromData: {
+				inputAlign: "left"
+			}
+		};
+	},
+	created() {
+		// 如果将children定义在data中，在微信小程序会造成循环引用而报错
+		this.children = [];
+	},
+	mounted() {
+		// 支付宝、头条小程序不支持provide/inject，所以使用这个方法获取整个父组件，在created定义，避免循环应用
+		let parent = this.$u.$parent.call(this, "u-form");
+		if (parent) {
+			Object.keys(this.uFromData).map(key => {
+				this.uFromData[key] = parent[key];
+			});
+		}
+	},
+	methods: {
+		emitEvent(obj) {
+			let values = this.values || [];
+			if (obj.value) {
+				let index = values.indexOf(obj.name);
+				if (index === -1) {
+					values.push(obj.name);
+				}
+			} else {
+				let index = values.indexOf(obj.name);
+				if (index > -1) {
+					values.splice(index, 1);
+				}
+			}
+
+			this.$emit("change", values);
+			// 通过emit事件，设置父组件通过v-model双向绑定的值
+			this.$emit("input", values);
+			this.$emit("update:modelValue", values);
+			// 发出事件，用于在表单组件中嵌入checkbox的情况，进行验证
+			// 由于头条小程序执行迟钝，故需要用几十毫秒的延时
+			setTimeout(() => {
+				// 将当前的值发送到 u-form-item 进行校验
+				this.dispatch("u-form-item", "onFieldChange", values);
+			}, 60);
+		},
+		_emitEvent(obj) {
+			let values = this.values || [];
+			if (obj.value) {
+				let index = values.indexOf(obj.name);
+				if (index === -1) {
+					values.push(obj.name);
+				}
+			} else {
+				let index = values.indexOf(obj.name);
+				if (index > -1) {
+					values.splice(index, 1);
+				}
+			}
+			//this.$emit("change", values);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-checkbox-group {
+	/* #ifndef MP || APP-NVUE */
+	display: inline-flex;
+	flex-wrap: wrap;
+	/* #endif */
+}
+.u-checkbox-group.flex-end {
+	/* #ifndef APP-NVUE */
+	display: inline-flex;
+	justify-content: flex-end;
+	flex-wrap: wrap;
+	/* #endif */
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-checkbox/u-checkbox.vue b/uni_modules/vk-uview-ui/components/u-checkbox/u-checkbox.vue
new file mode 100644
index 0000000..a0498fe
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-checkbox/u-checkbox.vue
@@ -0,0 +1,322 @@
+<template>
+	<view class="u-checkbox" :style="[checkboxStyle]">
+		<view class="u-checkbox__icon-wrap" @tap="toggle" :class="[iconClass]" :style="[iconStyle]">
+			<u-icon class="u-checkbox__icon-wrap__icon" name="checkbox-mark" :size="checkboxIconSize" :color="iconColor" />
+		</view>
+		<view
+			class="u-checkbox__label"
+			@tap="onClickLabel"
+			:style="{
+				fontSize: $u.addUnit(labelSize)
+			}"
+		>
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * checkbox 复选框
+ * @description 该组件需要搭配checkboxGroup组件使用，以便用户进行操作时，获得当前复选框组的选中情况。
+ * @tutorial https://www.uviewui.com/components/checkbox.html
+ * @property {String Number} icon-size 图标大小，单位rpx（默认20）
+ * @property {String Number} label-size label字体大小，单位rpx（默认28）
+ * @property {String Number} name checkbox组件的标示符
+ * @property {String} shape 形状，外观形状，shape-方形，circle-圆形(默认circle)
+ * @property {Boolean} disabled 是否禁用
+ * @property {Boolean} label-disabled 是否禁止点击文本操作checkbox
+ * @property {String} active-color 选中时的颜色，如设置CheckboxGroup的active-color将失效
+ * @event {Function} change 某个checkbox状态发生变化时触发，回调为一个对象
+ * @example <u-checkbox v-model="checked" :disabled="false">天涯</u-checkbox>
+ */
+export default {
+	name: "u-checkbox",
+	emits: ["update:modelValue", "input", "change"],
+	props: {
+		// 是否为选中状态
+		value: {
+			type: Boolean,
+			default: false
+		},
+		modelValue: {
+			type: Boolean,
+			default: false
+		},
+		// checkbox的名称
+		name: {
+			type: [String, Number],
+			default: ""
+		},
+		// 形状，square为方形，circle为圆型
+		shape: {
+			type: String,
+			default: ""
+		},
+		// 是否禁用
+		disabled: {
+			type: [String, Boolean],
+			default: ""
+		},
+		// 是否禁止点击提示语选中复选框
+		labelDisabled: {
+			type: [String, Boolean],
+			default: ""
+		},
+		// 选中状态下的颜色，如设置此值，将会覆盖checkboxGroup的activeColor值
+		activeColor: {
+			type: String,
+			default: ""
+		},
+		// 图标的大小，单位rpx
+		iconSize: {
+			type: [String, Number],
+			default: ""
+		},
+		// label的字体大小，rpx单位
+		labelSize: {
+			type: [String, Number],
+			default: ""
+		},
+		// 组件的整体大小
+		size: {
+			type: [String, Number],
+			default: ""
+		}
+	},
+	data() {
+		return {
+			parentDisabled: false,
+			newParams: {}
+		};
+	},
+	created() {
+		// 支付宝小程序不支持provide/inject，所以使用这个方法获取整个父组件，在created定义，避免循环应用
+		this.parent = this.$u.$parent.call(this, "u-checkbox-group");
+		// 如果存在u-checkbox-group，将本组件的this塞进父组件的children中
+		this.parent && this.parent.children.push(this);
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		// 是否禁用，如果父组件u-checkbox-group禁用的话，将会忽略子组件的配置
+		isDisabled() {
+			return this.disabled !== "" ? this.disabled : this.parent ? this.parent.disabled : false;
+		},
+		// 是否禁用label点击
+		isLabelDisabled() {
+			return this.labelDisabled !== "" ? this.labelDisabled : this.parent ? this.parent.labelDisabled : false;
+		},
+		// 组件尺寸，对应size的值，默认值为34rpx
+		checkboxSize() {
+			return this.size ? this.size : this.parent ? this.parent.size : 34;
+		},
+		// 组件的勾选图标的尺寸，默认20
+		checkboxIconSize() {
+			return this.iconSize ? this.iconSize : this.parent ? this.parent.iconSize : 20;
+		},
+		// 组件选中激活时的颜色
+		elActiveColor() {
+			return this.activeColor ? this.activeColor : this.parent ? this.parent.activeColor : "primary";
+		},
+		// 组件的形状
+		elShape() {
+			return this.shape ? this.shape : this.parent ? this.parent.shape : "square";
+		},
+		iconStyle() {
+			let style = {};
+			// 既要判断是否手动禁用，还要判断用户v-model绑定的值，如果绑定为false，那么也无法选中
+			if (this.elActiveColor && this.valueCom && !this.isDisabled) {
+				style.borderColor = this.elActiveColor;
+				style.backgroundColor = this.elActiveColor;
+			}
+			style.width = this.$u.addUnit(this.checkboxSize);
+			style.height = this.$u.addUnit(this.checkboxSize);
+			return style;
+		},
+		// checkbox内部的勾选图标，如果选中状态，为白色，否则为透明色即可
+		iconColor() {
+			return this.valueCom ? "#ffffff" : "transparent";
+		},
+		iconClass() {
+			let classes = [];
+			classes.push("u-checkbox__icon-wrap--" + this.elShape);
+			if (this.valueCom == true) classes.push("u-checkbox__icon-wrap--checked");
+			if (this.isDisabled) classes.push("u-checkbox__icon-wrap--disabled");
+			if (this.valueCom && this.isDisabled) classes.push("u-checkbox__icon-wrap--disabled--checked");
+			// 支付宝小程序无法动态绑定一个数组类名，否则解析出来的结果会带有","，而导致失效
+			return classes.join(" ");
+		},
+		checkboxStyle() {
+			let style = {};
+			if (this.parent && this.parent.width) {
+				style.width = this.parent.width;
+				// #ifdef MP
+				// 各家小程序因为它们特殊的编译结构，使用float布局
+				style.float = "left";
+				// #endif
+				// #ifndef MP
+				// H5和APP使用flex布局
+				style.flex = `0 0 ${this.parent.width}`;
+				// #endif
+			}
+			if (this.parent && this.parent.wrap) {
+				style.width = "100%";
+				// #ifndef MP
+				// H5和APP使用flex布局，将宽度设置100%，即可自动换行
+				style.flex = "0 0 100%";
+				// #endif
+			}
+			return style;
+		}
+	},
+	mounted() {
+		this._emitEvent();
+	},
+	watch: {
+		valueCom: {
+			handler: function(newVal, oldVal) {
+				this._emitEvent();
+			}
+		}
+	},
+	methods: {
+		_emitEvent() {
+			let value = this.valueCom;
+			let obj = {
+				value,
+				name: this.name
+			};
+			// 执行父组件u-checkbox-group的事件方法
+			if (this.parent && this.parent.emitEvent) this.parent._emitEvent(obj);
+		},
+		onClickLabel() {
+			if (!this.isLabelDisabled && !this.isDisabled) {
+				this.setValue();
+			}
+		},
+		toggle() {
+			if (!this.isDisabled) {
+				this.setValue();
+			}
+		},
+		emitEvent() {
+			let obj = {
+				value: !this.valueCom,
+				name: this.name
+			};
+			this.$emit("change", obj);
+			// 执行父组件u-checkbox-group的事件方法
+			if (this.parent && this.parent.emitEvent) this.parent.emitEvent(obj);
+		},
+		// 设置input的值，这里通过input事件，设置通过v-model绑定的组件的值
+		setValue() {
+			let value = this.valueCom;
+			// 判断是否超过了可选的最大数量
+			let checkedNum = 0;
+			if (this.parent && this.parent.children) {
+				// 只要父组件的某一个子元素的value为true，就加1(已有的选中数量)
+				this.parent.children.map(val => {
+					if (val.value) checkedNum++;
+				});
+			}
+			// 如果原来为选中状态，那么可以取消
+			if (value == true) {
+				this.emitEvent();
+				this.$emit("input", !value);
+				this.$emit("update:modelValue", !value);
+			} else {
+				// 如果超出最多可选项，提示
+				if (this.parent && checkedNum >= this.parent.max) {
+					return this.$u.toast(`最多可选${this.parent.max}项`);
+				}
+				// 如果原来为未选中状态，需要选中的数量少于父组件中设置的max值，才可以选中
+				this.emitEvent();
+				this.$emit("input", !value);
+				this.$emit("update:modelValue", !value);
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-checkbox {
+	/* #ifndef APP-NVUE */
+	display: inline-flex;
+	/* #endif */
+	align-items: center;
+	overflow: hidden;
+	user-select: none;
+	line-height: 1.8;
+
+	&__icon-wrap {
+		color: $u-content-color;
+		flex: none;
+		display: -webkit-flex;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+		width: 42rpx;
+		height: 42rpx;
+		color: transparent;
+		text-align: center;
+		transition-property: color, border-color, background-color;
+		font-size: 20px;
+		border: 1px solid #c8c9cc;
+		transition-duration: 0.2s;
+
+		/* #ifdef MP-TOUTIAO */
+		// 头条小程序兼容性问题，需要设置行高为0，否则图标偏下
+		&__icon {
+			line-height: 0;
+		}
+		/* #endif */
+
+		&--circle {
+			border-radius: 100%;
+		}
+
+		&--square {
+			border-radius: 6rpx;
+		}
+
+		&--checked {
+			color: #fff;
+			background-color: $u-type-primary;
+			border-color: $u-type-primary;
+		}
+
+		&--disabled {
+			background-color: #ebedf0;
+			border-color: #c8c9cc;
+		}
+
+		&--disabled--checked {
+			color: #c8c9cc !important;
+		}
+	}
+
+	&__label {
+		word-wrap: break-word;
+		margin-left: 10rpx;
+		margin-right: 24rpx;
+		color: $u-content-color;
+		font-size: 30rpx;
+
+		&--disabled {
+			color: #c8c9cc;
+		}
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-circle-progress/u-circle-progress.vue b/uni_modules/vk-uview-ui/components/u-circle-progress/u-circle-progress.vue
new file mode 100644
index 0000000..46e7c18
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-circle-progress/u-circle-progress.vue
@@ -0,0 +1,220 @@
+<template>
+	<view
+		class="u-circle-progress"
+		:style="{
+			width: widthPx + 'px',
+			height: widthPx + 'px',
+			backgroundColor: bgColor
+		}"
+	>
+		<!-- 支付宝小程序不支持canvas-id属性，必须用id属性 -->
+		<canvas
+			class="u-canvas-bg"
+			:canvas-id="elBgId"
+			:id="elBgId"
+			:style="{
+				width: widthPx + 'px',
+				height: widthPx + 'px'
+			}"
+		></canvas>
+		<canvas
+			class="u-canvas"
+			:canvas-id="elId"
+			:id="elId"
+			:style="{
+				width: widthPx + 'px',
+				height: widthPx + 'px'
+			}"
+		></canvas>
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+/**
+ * circleProgress 环形进度条
+ * @description 展示操作或任务的当前进度，比如上传文件，是一个圆形的进度条。注意：此组件的percent值只能动态增加，不能动态减少。
+ * @tutorial https://www.uviewui.com/components/circleProgress.html
+ * @property {String Number} percent 圆环进度百分比值，为数值类型，0-100
+ * @property {String} inactive-color 圆环的底色，默认为灰色(该值无法动态变更)（默认#ececec）
+ * @property {String} active-color 圆环激活部分的颜色(该值无法动态变更)（默认#19be6b）
+ * @property {String Number} width 整个圆环组件的宽度，高度默认等于宽度值，单位rpx（默认200）
+ * @property {String Number} border-width 圆环的边框宽度，单位rpx（默认14）
+ * @property {String Number} duration 整个圆环执行一圈的时间，单位ms（默认呢1500）
+ * @property {String} type 如设置，active-color值将会失效
+ * @property {String} bg-color 整个组件背景颜色，默认为白色
+ * @example <u-circle-progress active-color="#2979ff" :percent="80"></u-circle-progress>
+ */
+export default {
+	name: 'u-circle-progress',
+	props: {
+		// 圆环进度百分比值
+		percent: {
+			type: Number,
+			default: 0,
+			// 限制值在0到100之间
+			validator: val => {
+				return val >= 0 && val <= 100;
+			}
+		},
+		// 底部圆环的颜色（灰色的圆环）
+		inactiveColor: {
+			type: String,
+			default: '#ececec'
+		},
+		// 圆环激活部分的颜色
+		activeColor: {
+			type: String,
+			default: '#19be6b'
+		},
+		// 圆环线条的宽度，单位rpx
+		borderWidth: {
+			type: [Number, String],
+			default: 14
+		},
+		// 整个圆形的宽度，单位rpx
+		width: {
+			type: [Number, String],
+			default: 200
+		},
+		// 整个圆环执行一圈的时间，单位ms
+		duration: {
+			type: [Number, String],
+			default: 1500
+		},
+		// 主题类型
+		type: {
+			type: String,
+			default: ''
+		},
+		// 整个圆环进度区域的背景色
+		bgColor: {
+			type: String,
+			default: '#ffffff'
+		}
+	},
+	data() {
+		return {
+			// #ifdef MP-WEIXIN
+			elBgId: 'uCircleProgressBgId', // 微信小程序中不能使用this.$u.guid()形式动态生成id值，否则会报错
+			elId: 'uCircleProgressElId',
+			// #endif
+			// #ifndef MP-WEIXIN
+			elBgId: this.$u.guid(), // 非微信端的时候，需用动态的id，否则一个页面多个圆形进度条组件数据会混乱
+			elId: this.$u.guid(),
+			// #endif
+			widthPx: uni.upx2px(this.width), // 转成px后的整个组件的背景宽度
+			borderWidthPx: uni.upx2px(this.borderWidth), // 转成px后的圆环的宽度
+			startAngle: -Math.PI / 2, // canvas画圆的起始角度，默认为3点钟方向，定位到12点钟方向
+			progressContext: null, // 活动圆的canvas上下文
+			newPercent: 0, // 当动态修改进度值的时候，保存进度值的变化前后值，用于比较用
+			oldPercent: 0 // 当动态修改进度值的时候，保存进度值的变化前后值，用于比较用
+		};
+	},
+	watch: {
+		percent(nVal, oVal = 0) {
+			if (nVal > 100) nVal = 100;
+			if (nVal < 0) oVal = 0;
+			// 此值其实等于this.percent，命名一个新
+			this.newPercent = nVal;
+			this.oldPercent = oVal;
+			setTimeout(() => {
+				// 无论是百分比值增加还是减少，需要操作还是原来的旧的百分比值
+				// 将此值减少或者新增到新的百分比值
+				this.drawCircleByProgress(oVal);
+			}, 50);
+		}
+	},
+	created() {
+		// 赋值，用于加载后第一个画圆使用
+		this.newPercent = this.percent;
+		this.oldPercent = 0;
+	},
+	computed: {
+		// 有type主题时，优先起作用
+		circleColor() {
+			if (['success', 'error', 'info', 'primary', 'warning'].indexOf(this.type) >= 0) return this.$u.color[this.type];
+			else return this.activeColor;
+		}
+	},
+	mounted() {
+		// 在h5端，必须要做一点延时才起作用，this.$nextTick()无效(HX2.4.7)
+		setTimeout(() => {
+			this.drawProgressBg();
+			this.drawCircleByProgress(this.oldPercent);
+		}, 50);
+	},
+	methods: {
+		drawProgressBg() {
+			let ctx = uni.createCanvasContext(this.elBgId, this);
+			ctx.setLineWidth(this.borderWidthPx); // 设置圆环宽度
+			ctx.setStrokeStyle(this.inactiveColor); // 线条颜色
+			ctx.beginPath(); // 开始描绘路径
+			// 设置一个原点(110,110)，半径为100的圆的路径到当前路径
+			let radius = this.widthPx / 2;
+			ctx.arc(radius, radius, radius - this.borderWidthPx, 0, 2 * Math.PI, false);
+			ctx.stroke(); // 对路径进行描绘
+			ctx.draw();
+		},
+		drawCircleByProgress(progress) {
+			// 第一次操作进度环时将上下文保存到了this.data中，直接使用即可
+			let ctx = this.progressContext;
+			if (!ctx) {
+				ctx = uni.createCanvasContext(this.elId, this);
+				this.progressContext = ctx;
+			}
+			// 表示进度的两端为圆形
+			ctx.setLineCap('round');
+			// 设置线条的宽度和颜色
+			ctx.setLineWidth(this.borderWidthPx);
+			ctx.setStrokeStyle(this.circleColor);
+			// 将总过渡时间除以100，得出每修改百分之一进度所需的时间
+			let time = Math.floor(this.duration / 100);
+			// 结束角的计算依据为：将2π分为100份，乘以当前的进度值，得出终止点的弧度值，加起始角，为整个圆从默认的
+			// 3点钟方向开始画图，转为更好理解的12点钟方向开始作图，这需要起始角和终止角同时加上this.startAngle值
+			let endAngle = ((2 * Math.PI) / 100) * progress + this.startAngle;
+			ctx.beginPath();
+			// 半径为整个canvas宽度的一半
+			let radius = this.widthPx / 2;
+			ctx.arc(radius, radius, radius - this.borderWidthPx, this.startAngle, endAngle, false);
+			ctx.stroke();
+			ctx.draw();
+			// 如果变更后新值大于旧值，意味着增大了百分比
+			if (this.newPercent > this.oldPercent) {
+				// 每次递增百分之一
+				progress++;
+				// 如果新增后的值，大于需要设置的值百分比值，停止继续增加
+				if (progress > this.newPercent) return;
+			} else {
+				// 同理于上面
+				progress--;
+				if (progress < this.newPercent) return;
+			}
+			setTimeout(() => {
+				// 定时器，每次操作间隔为time值，为了让进度条有动画效果
+				this.drawCircleByProgress(progress);
+			}, time);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+.u-circle-progress {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+	align-items: center;
+	justify-content: center;
+}
+
+.u-canvas-bg {
+	position: absolute;
+}
+
+.u-canvas {
+	position: absolute;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-col/u-col.vue b/uni_modules/vk-uview-ui/components/u-col/u-col.vue
new file mode 100644
index 0000000..fc47dfa
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-col/u-col.vue
@@ -0,0 +1,157 @@
+<template>
+	<view class="u-col" :class="[
+		'u-col-' + span
+	]" :style="{
+		padding: `0 ${Number(gutter)/2 + 'rpx'}`,
+		marginLeft: 100 / 12 * offset + '%',
+		flex: `0 0 ${100 / 12 * span}%`,
+		alignItems: uAlignItem,
+		justifyContent: uJustify,
+		textAlign: textAlign
+	}"
+	 @tap="click">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	/**
+	 * col 布局单元格
+	 * @description 通过基础的 12 分栏，迅速简便地创建布局（搭配<u-row>使用）
+	 * @tutorial https://www.uviewui.com/components/layout.html
+	 * @property {String Number} span 栅格占据的列数，总12等分（默认0）
+	 * @property {String} text-align 文字水平对齐方式（默认left）
+	 * @property {String Number} offset 分栏左边偏移，计算方式与span相同（默认0）
+	 * @example <u-col span="3"><view class="demo-layout bg-purple"></view></u-col>
+	 */
+	export default {
+		name: "u-col",
+		emits: ["click"],
+		props: {
+			// 占父容器宽度的多少等分，总分为12份
+			span: {
+				type: [Number, String],
+				default: 12
+			},
+			// 指定栅格左侧的间隔数(总12栏)
+			offset: {
+				type: [Number, String],
+				default: 0
+			},
+			// 水平排列方式，可选值为`start`(或`flex-start`)、`end`(或`flex-end`)、`center`、`around`(或`space-around`)、`between`(或`space-between`)
+			justify: {
+				type: String,
+				default: 'start'
+			},
+			// 垂直对齐方式，可选值为top、center、bottom
+			align: {
+				type: String,
+				default: 'center'
+			},
+			// 文字对齐方式
+			textAlign: {
+				type: String,
+				default: 'left'
+			},
+			// 是否阻止事件传播
+			stop: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				gutter: 20, // 给col添加间距，左右边距各占一半，从父组件u-row获取
+			}
+		},
+		created() {
+			this.parent = false;
+		},
+		mounted() {
+			// 获取父组件实例，并赋值给对应的参数
+			this.parent = this.$u.$parent.call(this, 'u-row');
+			if (this.parent) {
+				this.gutter = this.parent.gutter;
+			}
+		},
+		computed: {
+			uJustify() {
+				if (this.justify == 'end' || this.justify == 'start') return 'flex-' + this.justify;
+				else if (this.justify == 'around' || this.justify == 'between') return 'space-' + this.justify;
+				else return this.justify;
+			},
+			uAlignItem() {
+				if (this.align == 'top') return 'flex-start';
+				if (this.align == 'bottom') return 'flex-end';
+				else return this.align;
+			}
+		},
+		methods: {
+			click(e) {
+				this.$emit('click',e);
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	.u-col {
+		/* #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO */
+		float: left;
+		/* #endif */
+	}
+
+	.u-col-0 {
+		width: 0;
+	}
+
+	.u-col-1 {
+		width: calc(100%/12);
+	}
+
+	.u-col-2 {
+		width: calc(100%/12 * 2);
+	}
+
+	.u-col-3 {
+		width: calc(100%/12 * 3);
+	}
+
+	.u-col-4 {
+		width: calc(100%/12 * 4);
+	}
+
+	.u-col-5 {
+		width: calc(100%/12 * 5);
+	}
+
+	.u-col-6 {
+		width: calc(100%/12 * 6);
+	}
+
+	.u-col-7 {
+		width: calc(100%/12 * 7);
+	}
+
+	.u-col-8 {
+		width: calc(100%/12 * 8);
+	}
+
+	.u-col-9 {
+		width: calc(100%/12 * 9);
+	}
+
+	.u-col-10 {
+		width: calc(100%/12 * 10);
+	}
+
+	.u-col-11 {
+		width: calc(100%/12 * 11);
+	}
+
+	.u-col-12 {
+		width: calc(100%/12 * 12);
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-collapse-item/u-collapse-item.vue b/uni_modules/vk-uview-ui/components/u-collapse-item/u-collapse-item.vue
new file mode 100644
index 0000000..963e98f
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-collapse-item/u-collapse-item.vue
@@ -0,0 +1,206 @@
+<template>
+	<view class="u-collapse-item" :style="[itemStyle]">
+		<view :hover-stay-time="200" class="u-collapse-head" @tap.stop="headClick" :hover-class="hoverClass" :style="[headStyle]">
+			<block v-if="!$slots['title-all']">
+				<view v-if="!$slots['title']" class="u-collapse-title u-line-1" :style="[{ textAlign: align ? align : 'left' },
+					isShow && activeStyle && !arrow ? activeStyle : '']">
+					{{ title }}
+				</view>
+				<slot v-else name="title" />
+				<view class="u-icon-wrap">
+					<u-icon v-if="arrow" :color="arrowColor" :class="{ 'u-arrow-down-icon-active': isShow }"
+					 class="u-arrow-down-icon" name="arrow-down"></u-icon>
+				</view>
+			</block>
+			<slot v-else name="title-all" />
+		</view>
+		<view class="u-collapse-body" :style="[{
+				height: isShow ? height + 'px' : '0'
+			}]">
+			<view class="u-collapse-content" :id="elId" :style="[bodyStyle]">
+				<slot></slot>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * collapseItem 手风琴Item
+	 * @description 通过折叠面板收纳内容区域（搭配u-collapse使用）
+	 * @tutorial https://www.uviewui.com/components/collapse.html
+	 * @property {String} title 面板标题
+	 * @property {String Number} index 主要用于事件的回调，标识那个Item被点击
+	 * @property {Boolean} disabled 面板是否可以打开或收起（默认false）
+	 * @property {Boolean} open 设置某个面板的初始状态是否打开（默认false）
+	 * @property {String Number} name 唯一标识符，如不设置，默认用当前collapse-item的索引值
+	 * @property {String} align 标题的对齐方式（默认left）
+	 * @property {Object} active-style 不显示箭头时，可以添加当前选择的collapse-item活动样式，对象形式
+	 * @event {Function} change 某个item被打开或者收起时触发
+	 * @example <u-collapse-item :title="item.head" v-for="(item, index) in itemList" :key="index">{{item.body}}</u-collapse-item>
+	 */
+	export default {
+		name: "u-collapse-item",
+    emits: ["change"],
+		props: {
+			// 标题
+			title: {
+				type: String,
+				default: ''
+			},
+			// 标题的对齐方式
+			align: {
+				type: String,
+				default: 'left'
+			},
+			// 是否可以点击收起
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// collapse显示与否
+			open: {
+				type: Boolean,
+				default: false
+			},
+			// 唯一标识符
+			name: {
+				type: [Number, String],
+				default: ''
+			},
+			//活动样式
+			activeStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 标识当前为第几个
+			index: {
+				type: [String, Number],
+				default: ''
+			}
+		},
+		data() {
+			return {
+				isShow: false,
+				elId: this.$u.guid(),
+				height: 0, // body内容的高度
+				headStyle: {}, // 头部样式，对象形式
+				bodyStyle: {}, // 主体部分样式
+				itemStyle: {}, // 每个item的整体样式
+				arrowColor: '', // 箭头的颜色
+				hoverClass: '', // 头部按下时的效果样式类
+				arrow: true, // 是否显示右侧箭头
+
+			};
+		},
+		watch: {
+			open(val) {
+				this.isShow = val;
+			}
+		},
+		created() {
+			this.parent = false;
+			// 获取u-collapse的信息，放在u-collapse是为了方便，不用每个u-collapse-item写一遍
+			this.isShow = this.open;
+		},
+		methods: {
+			// 异步获取内容，或者动态修改了内容时，需要重新初始化
+			init() {
+				this.parent = this.$u.$parent.call(this, 'u-collapse');
+				if(this.parent) {
+					this.nameSync = this.name ? this.name : this.parent.childrens.length;
+					// 不存在时才添加本实例
+					!this.parent.childrens.includes(this) && this.parent.childrens.push(this);
+					this.headStyle = this.parent.headStyle;
+					this.bodyStyle = this.parent.bodyStyle;
+					this.arrowColor = this.parent.arrowColor;
+					this.hoverClass = this.parent.hoverClass;
+					this.arrow = this.parent.arrow;
+					this.itemStyle = this.parent.itemStyle;
+				}
+				this.$nextTick(() => {
+					this.queryRect();
+				});
+			},
+			// 点击collapsehead头部
+			headClick() {
+				if (this.disabled) return;
+				if (this.parent && this.parent.accordion == true) {
+					this.parent.childrens.map(val => {
+						// 自身不设置为false，因为后面有this.isShow = !this.isShow;处理了
+						if (this != val) {
+							val.isShow = false;
+						}
+					});
+				}
+
+				this.isShow = !this.isShow;
+				// 触发本组件的事件
+				this.$emit('change', {
+					index: this.index,
+					show: this.isShow
+				})
+				// 只有在打开时才发出事件
+				if (this.isShow) this.parent && this.parent.onChange();
+				this.$forceUpdate();
+			},
+			// 查询内容高度
+			queryRect() {
+				// $uGetRect为uView自带的节点查询简化方法，详见文档介绍：https://www.uviewui.com/js/getRect.html
+				// 组件内部一般用this.$uGetRect，对外的为this.$u.getRect，二者功能一致，名称不同
+				this.$uGetRect('#' + this.elId).then(res => {
+					this.height = res.height;
+				})
+			}
+		},
+		mounted() {
+			this.init();
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-collapse-head {
+		position: relative;
+		@include vue-flex;
+		justify-content: space-between;
+		align-items: center;
+		color: $u-main-color;
+		font-size: 30rpx;
+		line-height: 1;
+		padding: 24rpx 0;
+		text-align: left;
+	}
+
+	.u-collapse-title {
+		flex: 1;
+		overflow: hidden;
+	}
+
+	.u-arrow-down-icon {
+		transition: all 0.3s;
+		margin-right: 20rpx;
+		margin-left: 14rpx;
+	}
+
+	.u-arrow-down-icon-active {
+		transform: rotate(180deg);
+		transform-origin: center center;
+	}
+
+	.u-collapse-body {
+		overflow: hidden;
+		transition: all 0.3s;
+	}
+
+	.u-collapse-content {
+		overflow: hidden;
+		font-size: 28rpx;
+		color: $u-tips-color;
+		text-align: left;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-collapse/u-collapse.vue b/uni_modules/vk-uview-ui/components/u-collapse/u-collapse.vue
new file mode 100644
index 0000000..f6e4bf0
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-collapse/u-collapse.vue
@@ -0,0 +1,100 @@
+<template>
+	<view class="u-collapse">
+		<slot />
+	</view>
+</template>
+
+<script>
+	/**
+	 * collapse 手风琴
+	 * @description 通过折叠面板收纳内容区域
+	 * @tutorial https://www.uviewui.com/components/collapse.html
+	 * @property {Boolean} accordion 是否手风琴模式（默认true）
+	 * @property {Boolean} arrow 是否显示标题右侧的箭头（默认true）
+	 * @property {String} arrow-color 标题右侧箭头的颜色（默认#909399）
+	 * @property {Object} head-style 标题自定义样式，对象形式
+	 * @property {Object} body-style 主体自定义样式，对象形式
+	 * @property {String} hover-class 样式类名，按下时有效（默认u-hover-class）
+	 * @event {Function} change 当前激活面板展开时触发(如果是手风琴模式，参数activeNames类型为String，否则为Array)
+	 * @example <u-collapse></u-collapse>
+	 */
+	export default {
+		name:"u-collapse",
+    emits: ["change"],
+		props: {
+			// 是否手风琴模式
+			accordion: {
+				type: Boolean,
+				default: true
+			},
+			// 头部的样式
+			headStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 主体的样式
+			bodyStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 每一个item的样式
+			itemStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 是否显示右侧的箭头
+			arrow: {
+				type: Boolean,
+				default: true
+			},
+			// 箭头的颜色
+			arrowColor: {
+				type: String,
+				default: '#909399'
+			},
+			// 标题部分按压时的样式类，"none"为无效果
+			hoverClass: {
+				type: String,
+				default: 'u-hover-class'
+			}
+		},
+		created() {
+			this.childrens = []
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			// 重新初始化一次内部的所有子元素的高度计算，用于异步获取数据渲染的情况
+			init() {
+				this.childrens.forEach((vm, index) => {
+					vm.init();
+				})
+			},
+			// collapse item被点击，由collapse item调用父组件方法
+			onChange() {
+				let activeItem = [];
+				this.childrens.forEach((vm, index) => {
+					if (vm.isShow) {
+						activeItem.push(vm.nameSync);
+					}
+				})
+				// 如果是手风琴模式，只有一个匹配结果，也即activeItem长度为1，将其转为字符串
+				if (this.accordion) activeItem = activeItem.join('');
+				this.$emit('change', activeItem);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-column-notice/u-column-notice.vue b/uni_modules/vk-uview-ui/components/u-column-notice/u-column-notice.vue
new file mode 100644
index 0000000..709ca5c
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-column-notice/u-column-notice.vue
@@ -0,0 +1,238 @@
+<template>
+	<view
+		class="u-notice-bar"
+		:style="{
+			background: computeBgColor,
+			padding: padding
+		}"
+		:class="[
+			type ? `u-type-${type}-light-bg` : ''
+		]"
+	>
+		<view class="u-icon-wrap">
+			<u-icon class="u-left-icon" v-if="volumeIcon" name="volume-fill" :size="volumeSize" :color="computeColor"></u-icon>
+		</view>
+		<swiper :disable-touch="disableTouch" @change="change" :autoplay="autoplay && playState == 'play'" :vertical="vertical" circular :interval="duration" class="u-swiper">
+			<swiper-item v-for="(item, index) in list" :key="index" class="u-swiper-item">
+				<view
+					class="u-news-item u-line-1"
+					:style="[textStyle]"
+					@tap="click(index)"
+					:class="['u-type-' + type]"
+				>
+					{{ item }}
+				</view>
+			</swiper-item>
+		</swiper>
+		<view class="u-icon-wrap">
+			<u-icon @click="getMore" class="u-right-icon" v-if="moreIcon" name="arrow-right" :size="26" :color="computeColor"></u-icon>
+			<u-icon @click="close" class="u-right-icon" v-if="closeIcon" name="close" :size="24" :color="computeColor"></u-icon>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+  emits: ["close", "getMore", "end"],
+	props: {
+		// 显示的内容，数组
+		list: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 显示的主题，success|error|primary|info|warning
+		type: {
+			type: String,
+			default: 'warning'
+		},
+		// 是否显示左侧的音量图标
+		volumeIcon: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示右侧的右箭头图标
+		moreIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示右侧的关闭图标
+		closeIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 是否自动播放
+		autoplay: {
+			type: Boolean,
+			default: true
+		},
+		// 文字颜色，各图标也会使用文字颜色
+		color: {
+			type: String,
+			default: ''
+		},
+		// 背景颜色
+		bgColor: {
+			type: String,
+			default: ''
+		},
+		// 滚动方向，row-水平滚动，column-垂直滚动
+		direction: {
+			type: String,
+			default: 'row'
+		},
+		// 是否显示
+		show: {
+			type: Boolean,
+			default: true
+		},
+		// 字体大小，单位rpx
+		fontSize: {
+			type: [Number, String],
+			default: 26
+		},
+		// 滚动一个周期的时间长，单位ms
+		duration: {
+			type: [Number, String],
+			default: 2000
+		},
+		// 音量喇叭的大小
+		volumeSize: {
+			type: [Number, String],
+			default: 34
+		},
+		// 水平滚动时的滚动速度，即每秒滚动多少rpx，这有利于控制文字无论多少时，都能有一个恒定的速度
+		speed: {
+			type: Number,
+			default: 160
+		},
+		// 水平滚动时，是否采用衔接形式滚动
+		isCircular: {
+			type: Boolean,
+			default: true
+		},
+		// 滚动方向，horizontal-水平滚动，vertical-垂直滚动
+		mode: {
+			type: String,
+			default: 'horizontal'
+		},
+		// 播放状态，play-播放，paused-暂停
+		playState: {
+			type: String,
+			default: 'play'
+		},
+		// 是否禁止用手滑动切换
+		// 目前HX2.6.11，只支持App 2.5.5+、H5 2.5.5+、支付宝小程序、字节跳动小程序
+		disableTouch: {
+			type: Boolean,
+			default: true
+		},
+		// 通知的边距
+		padding: {
+			type: [Number, String],
+			default: '18rpx 24rpx'
+		}
+	},
+	computed: {
+		// 计算字体颜色，如果没有自定义的，就用uview主题颜色
+		computeColor() {
+			if (this.color) return this.color;
+			// 如果是无主题，就默认使用content-color
+			else if(this.type == 'none') return '#606266';
+			else return this.type;
+		},
+		// 文字内容的样式
+		textStyle() {
+			let style = {};
+			if (this.color) style.color = this.color;
+			else if(this.type == 'none') style.color = '#606266';
+			style.fontSize = this.fontSize + 'rpx';
+			return style;
+		},
+		// 垂直或者水平滚动
+		vertical() {
+			if(this.mode == 'horizontal') return false;
+			else return true;
+		},
+		// 计算背景颜色
+		computeBgColor() {
+			if (this.bgColor) return this.bgColor;
+			else if(this.type == 'none') return 'transparent';
+		}
+	},
+	data() {
+		return {
+			// animation: false
+		};
+	},
+	methods: {
+		// 点击通告栏
+		click(index) {
+			this.$emit('click', index);
+		},
+		// 点击关闭按钮
+		close() {
+			this.$emit('close');
+		},
+		// 点击更多箭头按钮
+		getMore() {
+			this.$emit('getMore');
+		},
+		change(e) {
+			let index = e.detail.current;
+			if(index == this.list.length - 1) {
+				this.$emit('end');
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-notice-bar {
+	width: 100%;
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+	flex-wrap: nowrap;
+	padding: 18rpx 24rpx;
+	overflow: hidden;
+}
+
+.u-swiper {
+	font-size: 26rpx;
+	height: 32rpx;
+	@include vue-flex;
+	align-items: center;
+	flex: 1;
+	margin-left: 12rpx;
+}
+
+.u-swiper-item {
+	@include vue-flex;
+	align-items: center;
+	overflow: hidden;
+}
+
+.u-news-item {
+	overflow: hidden;
+}
+
+.u-right-icon {
+	margin-left: 12rpx;
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+	align-items: center;
+}
+
+.u-left-icon {
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+	align-items: center;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-count-down/u-count-down.vue b/uni_modules/vk-uview-ui/components/u-count-down/u-count-down.vue
new file mode 100644
index 0000000..0d7cc21
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-count-down/u-count-down.vue
@@ -0,0 +1,175 @@
+<template>
+	<view class="u-count-down">
+		<slot>
+			<text class="u-count-down__text" :style="customStyle">{{ formattedTime }}</text>
+		</slot>
+	</view>
+</template>
+
+<script>
+import { isSameSecond, parseFormat, parseTimeData } from "./utils";
+/**
+ * u-count-down 倒计时
+ * @description 该组件一般使用于某个活动的截止时间上，通过数字的变化，给用户明确的时间感受，提示用户进行某一个行为操作。
+ * @tutorial https://uviewui.com/components/countDown.html
+ * @property {String | Number}	timestamp		倒计时时长，单位ms （默认 0 ）
+ * @property {String}			format		时间格式，DD-日，HH-时，mm-分，ss-秒，SSS-毫秒  （默认 'HH:mm:ss' ）
+ * @property {Boolean}			autoStart	是否自动开始倒计时 （默认 true ）
+ * @event {Function} end 倒计时结束时触发
+ * @event {Function} change 倒计时变化时触发
+ * @event {Function} start	开始倒计时
+ * @event {Function} pause	暂停倒计时
+ * @event {Function} reset	重设倒计时，若 auto-start 为 true，重设后会自动开始倒计时
+ * @example <u-count-down :timestamp="timestamp"></u-count-down>
+ */
+export default {
+	name: "u-count-down",  
+	emits: ["change", "end", "finish"],
+	props: {
+		// 倒计时时长，单位ms
+		timestamp: {
+			type: [String, Number],
+			default: 0
+		},
+		// 时间格式，DD-日，HH-时，mm-分，ss-秒，SSS-毫秒
+		format: {
+			type: String,
+			default: "DD:HH:mm:ss"
+		},
+		// 是否自动开始倒计时
+		autoStart: {
+			type: Boolean,
+			default: true
+		},
+		customStyle: {
+			type: [String, Object],
+			default: ""
+		}
+	},
+	data() {
+		return {
+			timer: null,
+			// 各单位(天，时，分等)剩余时间
+			timeData: parseTimeData(0),
+			// 格式化后的时间，如"03:23:21"
+			formattedTime: "0",
+			// 倒计时是否正在进行中
+			runing: false,
+			endTime: 0, // 结束的毫秒时间戳
+			remainTime: 0 // 剩余的毫秒时间
+		};
+	},
+	watch: {
+		timestamp(n) {
+			this.reset();
+		},
+		format(newVal, oldVal) {
+			this.pause();
+			this.start();
+		}
+	},
+	mounted() {
+		this.init();
+	},
+	methods: {
+		init() {
+			this.reset();
+		},
+		// 开始倒计时
+		start() {
+			if (this.runing) return;
+			// 标识为进行中
+			this.runing = true;
+			// 结束时间戳 = 此刻时间戳 + 剩余的时间
+			this.endTime = Date.now() + this.remainTime;
+			this.toTick();
+		},
+		// 根据是否展示毫秒，执行不同操作函数
+		toTick() {
+			if (this.format.indexOf("SSS") > -1) {
+				this.microTick();
+			} else {
+				this.macroTick();
+			}
+		},
+		macroTick() {
+			this.clearTimeout();
+			// 每隔一定时间，更新一遍定时器的值
+			// 同时此定时器的作用也能带来毫秒级的更新
+			this.timer = setTimeout(() => {
+				// 获取剩余时间
+				const remain = this.getRemainTime();
+				// 重设剩余时间
+				if (!isSameSecond(remain, this.remainTime) || remain === 0) {
+					this.setRemainTime(remain);
+				}
+				// 如果剩余时间不为0，则继续检查更新倒计时
+				if (this.remainTime !== 0) {
+					this.macroTick();
+				}
+			}, 30);
+		},
+		microTick() {
+			this.clearTimeout();
+			this.timer = setTimeout(() => {
+				this.setRemainTime(this.getRemainTime());
+				if (this.remainTime !== 0) {
+					this.microTick();
+				}
+			}, 30);
+		},
+		// 获取剩余的时间
+		getRemainTime() {
+			// 取最大值，防止出现小于0的剩余时间值
+			return Math.max(this.endTime - Date.now(), 0);
+		},
+		// 设置剩余的时间
+		setRemainTime(remain) {
+			this.remainTime = remain;
+			// 根据剩余的毫秒时间，得出该有天，小时，分钟等的值，返回一个对象
+			const timeData = parseTimeData(remain);
+			this.$emit("change", timeData);
+			// 得出格式化后的时间
+			this.formattedTime = parseFormat(this.format, timeData);
+			// 如果时间已到，停止倒计时
+			if (remain <= 0) {
+				this.pause(); 
+				this.$emit("end");
+				this.$emit("finish");
+			}
+		},
+		// 重置倒计时
+		reset() {
+			this.pause();
+			this.remainTime = this.timestamp;
+			this.setRemainTime(this.remainTime);
+			if (this.autoStart) {
+				this.start();
+			}
+		},
+		// 暂停倒计时
+		pause() {
+			this.runing = false;
+			this.clearTimeout();
+		},
+		// 清空定时器
+		clearTimeout() {
+			clearTimeout(this.timer);
+			this.timer = null;
+		}
+	},
+	// #ifndef VUE3
+	beforeDestroy() {
+		this.clearTimeout();
+	},
+	// #endif
+	
+	// #ifdef VUE3
+	beforeUnmount() {
+		this.clearTimeout();
+	},
+	// #endif
+};
+</script>
+
+<style lang="scss"></style>
diff --git a/uni_modules/vk-uview-ui/components/u-count-down/utils.js b/uni_modules/vk-uview-ui/components/u-count-down/utils.js
new file mode 100644
index 0000000..8c75005
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-count-down/utils.js
@@ -0,0 +1,62 @@
+// 补0，如1 -> 01
+function padZero(num, targetLength = 2) {
+    let str = `${num}`
+    while (str.length < targetLength) {
+        str = `0${str}`
+    }
+    return str
+}
+const SECOND = 1000
+const MINUTE = 60 * SECOND
+const HOUR = 60 * MINUTE
+const DAY = 24 * HOUR
+export function parseTimeData(time) {
+    const days = Math.floor(time / DAY)
+    const hours = Math.floor((time % DAY) / HOUR)
+    const minutes = Math.floor((time % HOUR) / MINUTE)
+    const seconds = Math.floor((time % MINUTE) / SECOND)
+    const milliseconds = Math.floor(time % SECOND)
+    return {
+        days,
+        hours,
+        minutes,
+        seconds,
+        milliseconds
+    }
+}
+export function parseFormat(format, timeData) {
+    let {
+        days,
+        hours,
+        minutes,
+        seconds,
+        milliseconds
+    } = timeData
+    // 如果格式化字符串中不存在DD(天)，则将天的时间转为小时中去
+    if (format.indexOf('DD') === -1) {
+        hours += days * 24
+    } else {
+        // 对天补0
+        format = format.replace('DD', padZero(days))
+    }
+    // 其他同理于DD的格式化处理方式
+    if (format.indexOf('HH') === -1) {
+        minutes += hours * 60
+    } else {
+        format = format.replace('HH', padZero(hours))
+    }
+    if (format.indexOf('mm') === -1) {
+        seconds += minutes * 60
+    } else {
+        format = format.replace('mm', padZero(minutes))
+    }
+    if (format.indexOf('ss') === -1) {
+        milliseconds += seconds * 1000
+    } else {
+        format = format.replace('ss', padZero(seconds))
+    }
+    return format.replace('SSS', padZero(milliseconds, 3))
+}
+export function isSameSecond(time1, time2) {
+    return Math.floor(time1 / 1000) === Math.floor(time2 / 1000)
+}
diff --git a/uni_modules/vk-uview-ui/components/u-count-to/u-count-to.vue b/uni_modules/vk-uview-ui/components/u-count-to/u-count-to.vue
new file mode 100644
index 0000000..1825072
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-count-to/u-count-to.vue
@@ -0,0 +1,266 @@
+<template>
+	<view
+		class="u-count-num"
+		:style="{
+			fontSize: fontSize + 'rpx',
+			fontWeight: bold ? 'bold' : 'normal',
+			color: color
+		}"
+	>
+		{{ displayValueCom }}
+	</view>
+</template>
+
+<script>
+/**
+ * countTo 数字滚动
+ * @description 该组件一般用于需要滚动数字到某一个值的场景，目标要求是一个递增的值。
+ * @tutorial https://www.uviewui.com/components/countTo.html
+ * @property {String Number} nullVal 空值或NaN时显示的值，默认 - 
+ * @property {String Number} start-val 开始值
+ * @property {String Number} end-val 结束值
+ * @property {String Number} duration 滚动过程所需的时间，单位ms（默认2000）
+ * @property {Boolean} autoplay 是否自动开始滚动（默认true）
+ * @property {String Number} decimals 要显示的小数位数，见官网说明（默认0）
+ * @property {Boolean} use-easing 滚动结束时，是否缓动结尾，见官网说明（默认true）
+ * @property {String} separator 千位分隔符，见官网说明
+ * @property {String} color 字体颜色（默认#303133）
+ * @property {String Number} font-size 字体大小，单位rpx（默认50）
+ * @property {Boolean} bold 字体是否加粗（默认false）
+ * @event {Function} end 数值滚动到目标值时触发
+ * @example <u-count-to ref="uCountTo" :end-val="endVal" :autoplay="autoplay"></u-count-to>
+ */
+export default {
+	name: "u-count-to",
+	emits: ["end"],
+	props: {
+		// 没有值时显示
+		nullVal: {
+			type: [Number, String],
+			default: "-"
+		},
+		// 开始的数值，默认从0增长到某一个数
+		startVal: {
+			type: [Number, String],
+			default: 0
+		},
+		// 要滚动的目标数值，必须
+		endVal: {
+			type: [Number, String],
+			default: 0,
+			required: true
+		},
+		// 滚动到目标数值的动画持续时间，单位为毫秒（ms）
+		duration: {
+			type: [Number, String],
+			default: 2000
+		},
+		// 设置数值后是否自动开始滚动
+		autoplay: {
+			type: Boolean,
+			default: true
+		},
+		// 要显示的小数位数
+		decimals: {
+			type: [Number, String],
+			default: 0
+		},
+		// 是否在即将到达目标数值的时候，使用缓慢滚动的效果
+		useEasing: {
+			type: Boolean,
+			default: true
+		},
+		// 十进制分割
+		decimal: {
+			type: [Number, String],
+			default: "."
+		},
+		// 字体颜色
+		color: {
+			type: String,
+			default: "#303133"
+		},
+		// 字体大小
+		fontSize: {
+			type: [Number, String],
+			default: 50
+		},
+		// 是否加粗字体
+		bold: {
+			type: Boolean,
+			default: false
+		},
+		// 千位分隔符，类似金额的分割(￥23,321.05中的",")
+		separator: {
+			type: String,
+			default: ""
+		}
+	},
+	data() {
+		return {
+			localStartVal: this.startVal,
+			displayValue: this.formatNumber(this.startVal),
+			printVal: null,
+			paused: false, // 是否暂停
+			localDuration: Number(this.duration),
+			startTime: null, // 开始的时间
+			timestamp: null, // 时间戳
+			remaining: null, // 停留的时间
+			rAF: null,
+			lastTime: 0 // 上一次的时间
+		};
+	},
+	computed: {
+		countDown() {
+			return this.startVal > this.endVal;
+		},
+		displayValueCom() {
+			let str;
+			let { displayValue, nullVal, endVal } = this;
+			if (isNaN(endVal)) {
+				str = nullVal;
+			} else {
+				str = displayValue;
+			}
+			return str;
+		}
+	},
+	watch: {
+		startVal() {
+			this.autoplay && this.start();
+		},
+		endVal() {
+			this.autoplay && this.start();
+		}
+	},
+	mounted() {
+		this.autoplay && this.start();
+	},
+	methods: {
+		easingFn(t, b, c, d) {
+			return (c * (-Math.pow(2, (-10 * t) / d) + 1) * 1024) / 1023 + b;
+		},
+		requestAnimationFrame(callback) {
+			const currTime = new Date().getTime();
+			// 为了使setTimteout的尽可能的接近每秒60帧的效果
+			const timeToCall = Math.max(0, 16 - (currTime - this.lastTime));
+			const id = setTimeout(() => {
+				callback(currTime + timeToCall);
+			}, timeToCall);
+			this.lastTime = currTime + timeToCall;
+			return id;
+		},
+
+		cancelAnimationFrame(id) {
+			clearTimeout(id);
+		},
+		// 开始滚动数字
+		start() {
+			this.localStartVal = this.startVal;
+			this.startTime = null;
+			this.localDuration = this.duration;
+			this.paused = false;
+			this.rAF = this.requestAnimationFrame(this.count);
+		},
+		// 暂定状态，重新再开始滚动；或者滚动状态下，暂停
+		reStart() {
+			if (this.paused) {
+				this.resume();
+				this.paused = false;
+			} else {
+				this.stop();
+				this.paused = true;
+			}
+		},
+		// 暂停
+		stop() {
+			this.cancelAnimationFrame(this.rAF);
+		},
+		// 重新开始(暂停的情况下)
+		resume() {
+			this.startTime = null;
+			this.localDuration = this.remaining;
+			this.localStartVal = this.printVal;
+			this.requestAnimationFrame(this.count);
+		},
+		// 重置
+		reset() {
+			this.startTime = null;
+			this.cancelAnimationFrame(this.rAF);
+			this.displayValue = this.formatNumber(this.startVal);
+		},
+		count(timestamp) {
+			if (!this.startTime) this.startTime = timestamp;
+			this.timestamp = timestamp;
+			const progress = timestamp - this.startTime;
+			this.remaining = this.localDuration - progress;
+			if (this.useEasing) {
+				if (this.countDown) {
+					this.printVal = this.localStartVal - this.easingFn(progress, 0, this.localStartVal - this.endVal, this.localDuration);
+				} else {
+					this.printVal = this.easingFn(progress, this.localStartVal, this.endVal - this.localStartVal, this.localDuration);
+				}
+			} else {
+				if (this.countDown) {
+					this.printVal = this.localStartVal - (this.localStartVal - this.endVal) * (progress / this.localDuration);
+				} else {
+					this.printVal = this.localStartVal + (this.endVal - this.localStartVal) * (progress / this.localDuration);
+				}
+			}
+			if (this.countDown) {
+				this.printVal = this.printVal < this.endVal ? this.endVal : this.printVal;
+			} else {
+				this.printVal = this.printVal > this.endVal ? this.endVal : this.printVal;
+			}
+			this.displayValue = this.formatNumber(this.printVal);
+			if (progress < this.localDuration) {
+				this.rAF = this.requestAnimationFrame(this.count);
+			} else {
+				this.$emit("end");
+			}
+		},
+		// 判断是否数字
+		isNumber(val) {
+			return !isNaN(parseFloat(val));
+		},
+		formatNumber(num) {
+			// 将num转为Number类型，因为其值可能为字符串数值，调用toFixed会报错
+			num = Number(num);
+			num = num.toFixed(Number(this.decimals));
+			num += "";
+			const x = num.split(".");
+			let x1 = x[0];
+			const x2 = x.length > 1 ? this.decimal + x[1] : "";
+			const rgx = /(\d+)(\d{3})/;
+			if (this.separator && !this.isNumber(this.separator)) {
+				while (rgx.test(x1)) {
+					x1 = x1.replace(rgx, "$1" + this.separator + "$2");
+				}
+			}
+			return x1 + x2;
+		},
+		// #ifndef VUE3
+		destroyed() {
+			this.cancelAnimationFrame(this.rAF);
+		},
+		// #endif
+
+		// #ifdef VUE3
+		unmounted() {
+			this.cancelAnimationFrame(this.rAF);
+		}
+		// #endif
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-count-num {
+	/* #ifndef APP-NVUE */
+	display: inline-flex;
+	/* #endif */
+	text-align: center;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-divider/u-divider.vue b/uni_modules/vk-uview-ui/components/u-divider/u-divider.vue
new file mode 100644
index 0000000..6f8d7e6
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-divider/u-divider.vue
@@ -0,0 +1,153 @@
+<template>
+	<view class="u-divider" :style="{
+		height: height == 'auto' ? 'auto' : height + 'rpx',
+		backgroundColor: bgColor,
+		marginBottom: marginBottom + 'rpx',
+		marginTop: marginTop + 'rpx'
+	}" @tap="click">
+		<view class="u-divider-line" :class="[type ? 'u-divider-line--bordercolor--' + type : '']" :style="[lineStyle]"></view>
+		<view v-if="useSlot" class="u-divider-text" :style="{
+			color: color,
+			fontSize: fontSize + 'rpx'
+		}"><slot /></view>
+		<view class="u-divider-line" :class="[type ? 'u-divider-line--bordercolor--' + type : '']" :style="[lineStyle]"></view>
+	</view>
+</template>
+
+<script>
+/**
+ * divider 分割线
+ * @description 区隔内容的分割线，一般用于页面底部"没有更多"的提示。
+ * @tutorial https://www.uviewui.com/components/divider.html
+ * @property {String Number} half-width 文字左或右边线条宽度，数值或百分比，数值时单位为rpx
+ * @property {String} border-color 线条颜色，优先级高于type（默认#dcdfe6）
+ * @property {String} color 文字颜色（默认#909399）
+ * @property {String Number} fontSize 字体大小，单位rpx（默认26）
+ * @property {String} bg-color 整个divider的背景颜色（默认呢#ffffff）
+ * @property {String Number} height 整个divider的高度，单位rpx（默认40）
+ * @property {String} type 将线条设置主题色（默认primary）
+ * @property {Boolean} useSlot 是否使用slot传入内容，如果不传入，中间不会有空隙（默认true）
+ * @property {String Number} margin-top 与前一个组件的距离，单位rpx（默认0）
+ * @property {String Number} margin-bottom 与后一个组件的距离，单位rpx（0）
+ * @event {Function} click divider组件被点击时触发
+ * @example <u-divider color="#fa3534">长河落日圆</u-divider>
+ */
+export default {
+	name: 'u-divider',
+	props: {
+		// 单一边divider横线的宽度(数值)，单位rpx。或者百分比
+		halfWidth: {
+			type: [Number, String],
+			default: 150
+		},
+		// divider横线的颜色，如设置，
+		borderColor: {
+			type: String,
+			default: '#dcdfe6'
+		},
+		// 主题色，可以是primary|info|success|warning|error之一值
+		type: {
+			type: String,
+			default: 'primary'
+		},
+		// 文字颜色
+		color: {
+			type: String,
+			default: '#909399'
+		},
+		// 文字大小，单位rpx
+		fontSize: {
+			type: [Number, String],
+			default: 26
+		},
+		// 整个divider的背景颜色
+		bgColor: {
+			type: String,
+			default: '#ffffff'
+		},
+		// 整个divider的高度单位rpx
+		height: {
+			type: [Number, String],
+			default: 'auto'
+		},
+		// 上边距
+		marginTop: {
+			type: [String, Number],
+			default: 0
+		},
+		// 下边距
+		marginBottom: {
+			type: [String, Number],
+			default: 0
+		},
+		// 是否使用slot传入内容，如果不用slot传入内容，先的中间就不会有空隙
+		useSlot: {
+			type: Boolean,
+			default: true
+		}
+	},
+	computed: {
+		lineStyle() {
+			let style = {};
+			if(String(this.halfWidth).indexOf('%') != -1) style.width = this.halfWidth;
+			else style.width = this.halfWidth + 'rpx';
+			// borderColor优先级高于type值
+			if(this.borderColor) style.borderColor = this.borderColor;
+			return style;
+		}
+	},
+	methods: {
+		click() {
+			this.$emit('click');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+.u-divider {
+	width: 100%;
+	position: relative;
+	text-align: center;
+	@include vue-flex;
+	justify-content: center;
+	align-items: center;
+	overflow: hidden;
+	flex-direction: row;
+}
+
+.u-divider-line {
+	border-bottom: 1px solid $u-border-color;
+	transform: scale(1, 0.5);
+	transform-origin: center;
+	
+	&--bordercolor--primary {
+		border-color: $u-type-primary;
+	}
+	
+	&--bordercolor--success {
+		border-color: $u-type-success;
+	}
+	
+	&--bordercolor--error {
+		border-color: $u-type-primary;
+	}
+	
+	&--bordercolor--info {
+		border-color: $u-type-info;
+	}
+	
+	&--bordercolor--warning {
+		border-color: $u-type-warning;
+	}
+}
+
+.u-divider-text {
+	white-space: nowrap;
+	padding: 0 16rpx;
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-dropdown-item/u-dropdown-item.vue b/uni_modules/vk-uview-ui/components/u-dropdown-item/u-dropdown-item.vue
new file mode 100644
index 0000000..6ed9301
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-dropdown-item/u-dropdown-item.vue
@@ -0,0 +1,148 @@
+<template>
+	<view class="u-dropdown-item" v-if="active" @touchmove.stop.prevent="() => {}" @tap.stop.prevent="() => {}">
+		<block v-if="!$slots.default && !$slots.$default">
+			<scroll-view scroll-y="true" :style="{
+					height: $u.addUnit(height)
+				}">
+				<view class="u-dropdown-item__options">
+					<u-cell-group>
+						<u-cell-item @click="cellClick(item.value)" :arrow="false" :title="item.label"
+							v-for="(item, index) in options" :key="index" :title-style="{
+								color: value === item.value ? activeColor : inactiveColor
+							}">
+							<u-icon v-if="valueCom === item.value" name="checkbox-mark" :color="activeColor" size="32">
+							</u-icon>
+						</u-cell-item>
+					</u-cell-group>
+				</view>
+			</scroll-view>
+		</block>
+		<slot v-else />
+	</view>
+</template>
+
+<script>
+	/**
+	 * dropdown-item 下拉菜单
+	 * @description 该组件一般用于向下展开菜单，同时可切换多个选项卡的场景
+	 * @tutorial http://uviewui.com/components/dropdown.html
+	 * @property {String | Number} v-model 双向绑定选项卡选择值
+	 * @property {String} title 菜单项标题
+	 * @property {Array[Object]} options 选项数据，如果传入了默认slot，此参数无效
+	 * @property {Boolean} disabled 是否禁用此选项卡（默认false）
+	 * @property {String | Number} duration 选项卡展开和收起的过渡时间，单位ms（默认300）
+	 * @property {String | Number} height 弹窗下拉内容的高度(内容超出将会滚动)（默认auto）
+	 * @example <u-dropdown-item title="标题"></u-dropdown-item>
+	 */
+	export default {
+		name: "u-dropdown-item",
+		emits: ["update:modelValue", "input", "change"],
+		props: {
+			// 当前选中项的value值
+			value: {
+				type: [Number, String, Array],
+				default: ""
+			},
+			modelValue: {
+				type: [Number, String, Array],
+				default: ""
+			},
+			// 菜单项标题
+			title: {
+				type: [String, Number],
+				default: ""
+			},
+			// 选项数据，如果传入了默认slot，此参数无效
+			options: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			// 是否禁用此菜单项
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 下拉弹窗的高度
+			height: {
+				type: [Number, String],
+				default: "auto"
+			}
+		},
+		data() {
+			return {
+				active: false, // 当前项是否处于展开状态
+				activeColor: "#2979ff", // 激活时左边文字和右边对勾图标的颜色
+				inactiveColor: "#606266" // 未激活时左边文字和右边对勾图标的颜色
+			};
+		},
+		computed: {
+			valueCom() {
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+			},
+			// 监听props是否发生了变化，有些值需要传递给父组件u-dropdown，无法双向绑定
+			propsChange() {
+				return `${this.title}-${this.disabled}`;
+			}
+		},
+		watch: {
+			propsChange(n) {
+				// 当值变化时，通知父组件重新初始化，让父组件执行每个子组件的init()方法
+				// 将所有子组件数据重新整理一遍
+				if (this.parent) this.parent.init();
+			}
+		},
+		created() {
+			// 父组件的实例
+			this.parent = false;
+		},
+		methods: {
+			init() {
+				// 获取父组件u-dropdown
+				let parent = this.$u.$parent.call(this, "u-dropdown");
+				if (parent) {
+					this.parent = parent;
+					// 将子组件的激活颜色配置为父组件设置的激活和未激活时的颜色
+					this.activeColor = parent.activeColor;
+					this.inactiveColor = parent.inactiveColor;
+					// 将本组件的this，放入到父组件的children数组中，让父组件可以操作本(子)组件的方法和属性
+					// push进去前，显判断是否已经存在了本实例，因为在子组件内部数据变化时，会通过父组件重新初始化子组件
+					let exist = parent.children.find(val => {
+						return this === val;
+					});
+					if (!exist) parent.children.push(this);
+					if (parent.children.length == 1) this.active = true;
+					// 父组件无法监听children的变化，故将子组件的title，传入父组件的menuList数组中
+					parent.menuList.push({
+						title: this.title,
+						disabled: this.disabled
+					});
+				}
+			},
+			// cell被点击
+			cellClick(value) {
+				// 修改通过v-model绑定的值
+				this.$emit("input", value);
+				this.$emit("update:modelValue", value);
+				// 通知父组件(u-dropdown)收起菜单
+				this.parent.close();
+				// 发出事件，抛出当前勾选项的value
+				this.$emit("change", value);
+			}
+		},
+		mounted() {
+			this.init();
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-dropdown/u-dropdown.vue b/uni_modules/vk-uview-ui/components/u-dropdown/u-dropdown.vue
new file mode 100644
index 0000000..b9438b4
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-dropdown/u-dropdown.vue
@@ -0,0 +1,299 @@
+<template>
+	<view class="u-dropdown">
+		<view class="u-dropdown__menu" :style="{
+			height: $u.addUnit(height)
+		}" :class="{
+			'u-border-bottom': borderBottom
+		}">
+			<view class="u-dropdown__menu__item" v-for="(item, index) in menuList" :key="index" @tap.stop="menuClick(index)">
+				<view class="u-flex">
+					<text class="u-dropdown__menu__item__text" :style="{
+						color: item.disabled ? '#c0c4cc' : (index === current || highlightIndex == index) ? activeColor : inactiveColor,
+						fontSize: $u.addUnit(titleSize)
+					}">{{item.title}}</text>
+					<view class="u-dropdown__menu__item__arrow" :class="{
+						'u-dropdown__menu__item__arrow--rotate': index === current
+					}">
+						<u-icon :custom-style="{display: 'flex'}" :name="menuIcon" :size="$u.addUnit(menuIconSize)" :color="index === current || highlightIndex == index ? activeColor : '#c0c4cc'"></u-icon>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="u-dropdown__content" :style="[contentStyle, {
+			transition: `opacity ${duration / 1000}s linear`,
+			top: $u.addUnit(height),
+			height: contentHeight + 'px'
+		}]"
+		 @tap="maskClick" @touchmove.stop.prevent>
+			<view @tap.stop.prevent class="u-dropdown__content__popup" :style="[popupStyle]">
+				<slot></slot>
+			</view>
+			<view class="u-dropdown__content__mask"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * dropdown 下拉菜单
+	 * @description 该组件一般用于向下展开菜单，同时可切换多个选项卡的场景
+	 * @tutorial http://uviewui.com/components/dropdown.html
+	 * @property {String} active-color 标题和选项卡选中的颜色（默认#2979ff）
+	 * @property {String} inactive-color 标题和选项卡未选中的颜色（默认#606266）
+	 * @property {Boolean} close-on-click-mask 点击遮罩是否关闭菜单（默认true）
+	 * @property {Boolean} close-on-click-self 点击当前激活项标题是否关闭菜单（默认true）
+	 * @property {String | Number} duration 选项卡展开和收起的过渡时间，单位ms（默认300）
+	 * @property {String | Number} height 标题菜单的高度，单位任意（默认80）
+	 * @property {String | Number} border-radius 菜单展开内容下方的圆角值，单位任意（默认0）
+	 * @property {Boolean} border-bottom 标题菜单是否显示下边框（默认false）
+	 * @property {String | Number} title-size 标题的字体大小，单位任意，数值默认为rpx单位（默认28）
+	 * @event {Function} open 下拉菜单被打开时触发
+	 * @event {Function} close 下拉菜单被关闭时触发
+	 * @example <u-dropdown></u-dropdown>
+	 */
+	export default {
+		name: 'u-dropdown',
+    emits: ["open", "close"],
+		props: {
+			// 菜单标题和选项的激活态颜色
+			activeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 菜单标题和选项的未激活态颜色
+			inactiveColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 点击遮罩是否关闭菜单
+			closeOnClickMask: {
+				type: Boolean,
+				default: true
+			},
+			// 点击当前激活项标题是否关闭菜单
+			closeOnClickSelf: {
+				type: Boolean,
+				default: true
+			},
+			// 过渡时间
+			duration: {
+				type: [Number, String],
+				default: 300
+			},
+			// 标题菜单的高度，单位任意，数值默认为rpx单位
+			height: {
+				type: [Number, String],
+				default: 80
+			},
+			// 是否显示下边框
+			borderBottom: {
+				type: Boolean,
+				default: false
+			},
+			// 标题的字体大小
+			titleSize: {
+				type: [Number, String],
+				default: 28
+			},
+			// 下拉出来的内容部分的圆角值
+			borderRadius: {
+				type: [Number, String],
+				default: 0
+			},
+			// 菜单右侧的icon图标
+			menuIcon: {
+				type: String,
+				default: 'arrow-down'
+			},
+			// 菜单右侧图标的大小
+			menuIconSize: {
+				type: [Number, String],
+				default: 26
+			}
+		},
+		data() {
+			return {
+				showDropdown: true, // 是否打开下来菜单,
+				menuList: [], // 显示的菜单
+				active: false, // 下拉菜单的状态
+				// 当前是第几个菜单处于激活状态，小程序中此处不能写成false或者""，否则后续将current赋值为0，
+				// 无能的TX没有使用===而是使用==判断，导致程序认为前后二者没有变化，从而不会触发视图更新
+				current: 99999,
+				// 外层内容的样式，初始时处于底层，且透明
+				contentStyle: {
+					zIndex: -1,
+					opacity: 0
+				},
+				// 让某个菜单保持高亮的状态
+				highlightIndex: 99999,
+				contentHeight: 0
+			}
+		},
+		computed: {
+			// 下拉出来部分的样式
+			popupStyle() {
+				let style = {};
+				// 进行Y轴位移，展开状态时，恢复原位。收齐状态时，往上位移100%，进行隐藏
+				style.transform = `translateY(${this.active ? 0 : '-100%'})`
+				style['transition-duration'] = this.duration / 1000 + 's';
+				style.borderRadius = `0 0 ${this.$u.addUnit(this.borderRadius)} ${this.$u.addUnit(this.borderRadius)}`;
+				return style;
+			}
+		},
+		created() {
+			// 引用所有子组件(u-dropdown-item)的this，不能在data中声明变量，否则在微信小程序会造成循环引用而报错
+			this.children = [];
+		},
+		mounted() {
+			this.getContentHeight();
+		},
+		methods: {
+			init() {
+				// 当某个子组件内容变化时，触发父组件的init，父组件再让每一个子组件重新初始化一遍
+				// 以保证数据的正确性
+				this.menuList = [];
+				this.children.map(child => {
+					child.init();
+				})
+			},
+			// 点击菜单
+			menuClick(index) {
+				// 判断是否被禁用
+				if (this.menuList[index].disabled) return;
+				// 如果点击时的索引和当前激活项索引相同，意味着点击了激活项，需要收起下拉菜单
+				if (index === this.current && this.closeOnClickSelf) {
+					this.close();
+					// 等动画结束后，再移除下拉菜单中的内容，否则直接移除，也就没有下拉菜单收起的效果了
+					setTimeout(() => {
+						this.children[index].active = false;
+					}, this.duration)
+					return;
+				}
+				this.open(index);
+			},
+			// 打开下拉菜单
+			open(index) {
+				// 重置高亮索引，否则会造成多个菜单同时高亮
+				// this.highlightIndex = 9999;
+				// 展开时，设置下拉内容的样式
+				this.contentStyle = {
+					zIndex: 11,
+				}
+				// 标记展开状态以及当前展开项的索引
+				this.active = true;
+				this.current = index;
+				// 历遍所有的子元素，将索引匹配的项标记为激活状态，因为子元素是通过v-if控制切换的
+				// 之所以不是因display: none，是因为nvue没有display这个属性
+				this.children.map((val, idx) => {
+					val.active = index == idx ? true : false;
+				})
+				this.$emit('open', this.current);
+			},
+			// 设置下拉菜单处于收起状态
+			close() {
+				this.$emit('close', this.current);
+				// 设置为收起状态，同时current归位，设置为空字符串
+				this.active = false;
+				this.current = 99999;
+				// 下拉内容的样式进行调整，不透明度设置为0
+				this.contentStyle = {
+					zIndex: -1,
+					opacity: 0
+				}
+			},
+			// 点击遮罩
+			maskClick() {
+				// 如果不允许点击遮罩，直接返回
+				if (!this.closeOnClickMask) return;
+				this.close();
+			},
+			// 外部手动设置某个菜单高亮
+			highlight(index = undefined) {
+				this.highlightIndex = index !== undefined ? index : 99999;
+			},
+			// 获取下拉菜单内容的高度
+			getContentHeight() {
+				// 这里的原理为，因为dropdown组件是相对定位的，它的下拉出来的内容，必须给定一个高度
+				// 才能让遮罩占满菜单一下，直到屏幕底部的高度
+				// this.$u.sys()为uView封装的获取设备信息的方法
+				let windowHeight = this.$u.sys().windowHeight;
+				this.$uGetRect('.u-dropdown__menu').then(res => {
+					// 这里获取的是dropdown的尺寸，在H5上，uniapp获取尺寸是有bug的(以前提出修复过，后来又出现了此bug，目前hx2.8.11版本)
+					// H5端bug表现为元素尺寸的top值为导航栏底部到到元素的上边沿的距离，但是元素的bottom值确是导航栏顶部到元素底部的距离
+					// 二者是互相矛盾的，本质原因是H5端导航栏非原生，uni的开发者大意造成
+					// 这里取菜单栏的botton值合理的，不能用res.top，否则页面会造成滚动
+					this.contentHeight = windowHeight - res.bottom;
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	.u-dropdown {
+		flex: 1;
+		width: 100%;
+		position: relative;
+
+		&__menu {
+			@include vue-flex;
+			position: relative;
+			z-index: 11;
+			height: 80rpx;
+
+			&__item {
+				flex: 1;
+				@include vue-flex;
+				justify-content: center;
+				align-items: center;
+
+				&__text {
+					font-size: 28rpx;
+					color: $u-content-color;
+				}
+
+				&__arrow {
+					margin-left: 6rpx;
+					transition: transform .3s;
+					align-items: center;
+					@include vue-flex;
+
+					&--rotate {
+						transform: rotate(180deg);
+					}
+				}
+			}
+		}
+
+		&__content {
+			position: absolute;
+			z-index: 8;
+			width: 100%;
+			left: 0px;
+			bottom: 0;
+			overflow: hidden;
+			
+
+			&__mask {
+				position: absolute;
+				z-index: 9;
+				background: rgba(0, 0, 0, .3);
+				width: 100%;
+				left: 0;
+				top: 0;
+				bottom: 0;
+			}
+
+			&__popup {
+				position: relative;
+				z-index: 10;
+				transition: all 0.3s;
+				transform: translate3D(0, -100%, 0);
+				overflow: hidden;
+			}
+		}
+
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-empty/u-empty.vue b/uni_modules/vk-uview-ui/components/u-empty/u-empty.vue
new file mode 100644
index 0000000..2c77b24
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-empty/u-empty.vue
@@ -0,0 +1,193 @@
+<template>
+	<view class="u-empty" v-if="show" :style="{
+		marginTop: marginTop + 'rpx'
+	}">
+		<u-icon
+			:name="src ? src : 'empty-' + mode"
+			:custom-style="iconStyle"
+			:label="text ? text : icons[mode]"
+			label-pos="bottom"
+			:label-color="color"
+			:label-size="fontSize"
+			:size="iconSize"
+			:color="iconColor"
+			margin-top="14"
+		></u-icon>
+		<view class="u-slot-wrap">
+			<slot name="bottom"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * empty 内容为空
+	 * @description 该组件用于需要加载内容，但是加载的第一页数据就为空，提示一个"没有内容"的场景， 我们精心挑选了十几个场景的图标，方便您使用。
+	 * @tutorial https://www.uviewui.com/components/empty.html
+	 * @property {String} color 文字颜色（默认#c0c4cc）
+	 * @property {String} text 文字提示（默认“无内容”）
+	 * @property {String} src 自定义图标路径，如定义，mode参数会失效
+	 * @property {String Number} font-size 提示文字的大小，单位rpx（默认28）
+	 * @property {String} mode 内置的图标，见官网说明（默认data）
+	 * @property {String Number} img-width 图标的宽度，单位rpx（默认240）
+	 * @property {String} img-height 图标的高度，单位rpx（默认auto）
+	 * @property {String Number} margin-top 组件距离上一个元素之间的距离（默认0）
+	 * @property {Boolean} show 是否显示组件（默认true）
+	 * @event {Function} click 点击组件时触发
+	 * @event {Function} close 点击关闭按钮时触发
+	 * @example <u-empty text="所谓伊人，在水一方" mode="list"></u-empty>
+	 */
+	export default {
+		name: "u-empty",
+		props: {
+			// 图标路径
+			src: {
+				type: String,
+				default: ''
+			},
+			// 提示文字
+			text: {
+				type: String,
+				default: ''
+			},
+			// 文字颜色
+			color: {
+				type: String,
+				default: '#c0c4cc'
+			},
+			// 图标的颜色
+			iconColor: {
+				type: String,
+				default: '#c0c4cc'
+			},
+			// 图标的大小
+			iconSize: {
+				type: [String, Number],
+				default: 120
+			},
+			// 文字大小，单位rpx
+			fontSize: {
+				type: [String, Number],
+				default: 26
+			},
+			// 选择预置的图标类型
+			mode: {
+				type: String,
+				default: 'data'
+			},
+			//  图标宽度，单位rpx
+			imgWidth: {
+				type: [String, Number],
+				default: 120
+			},
+			// 图标高度，单位rpx
+			imgHeight: {
+				type: [String, Number],
+				default: 'auto'
+			},
+			// 是否显示组件
+			show: {
+				type: Boolean,
+				default: true
+			},
+			// 组件距离上一个元素之间的距离
+			marginTop: {
+				type: [String, Number],
+				default: 0
+			},
+			iconStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				icons: {
+					car: '购物车为空',
+					page: '页面不存在',
+					search: '没有搜索结果',
+					address: '没有收货地址',
+					wifi: '没有WiFi',
+					order: '订单为空',
+					coupon: '没有优惠券',
+					favor: '暂无收藏',
+					permission: '无权限',
+					history: '无历史记录',
+					news: '无新闻列表',
+					message: '消息列表为空',
+					list: '列表为空',
+					data: '数据为空'
+				},
+				// icons: [{
+				// 	icon: 'car',
+				// 	text: '购物车为空'
+				// },{
+				// 	icon: 'page',
+				// 	text: '页面不存在'
+				// },{
+				// 	icon: 'search',
+				// 	text: '没有搜索结果'
+				// },{
+				// 	icon: 'address',
+				// 	text: '没有收货地址'
+				// },{
+				// 	icon: 'wifi',
+				// 	text: '没有WiFi'
+				// },{
+				// 	icon: 'order',
+				// 	text: '订单为空'
+				// },{
+				// 	icon: 'coupon',
+				// 	text: '没有优惠券'
+				// },{
+				// 	icon: 'favor',
+				// 	text: '暂无收藏'
+				// },{
+				// 	icon: 'permission',
+				// 	text: '无权限'
+				// },{
+				// 	icon: 'history',
+				// 	text: '无历史记录'
+				// },{
+				// 	icon: 'news',
+				// 	text: '无新闻列表'
+				// },{
+				// 	icon: 'message',
+				// 	text: '消息列表为空'
+				// },{
+				// 	icon: 'list',
+				// 	text: '列表为空'
+				// },{
+				// 	icon: 'data',
+				// 	text: '数据为空'
+				// }],
+
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	.u-empty {
+		@include vue-flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+	}
+
+	.u-image {
+		margin-bottom: 20rpx;
+	}
+
+	.u-slot-wrap {
+		@include vue-flex;
+		justify-content: center;
+		align-items: center;
+		margin-top: 20rpx;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-field/u-field.vue b/uni_modules/vk-uview-ui/components/u-field/u-field.vue
new file mode 100644
index 0000000..efa31e6
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-field/u-field.vue
@@ -0,0 +1,402 @@
+<template>
+	<view class="u-field" :class="{'u-border-top': borderTop, 'u-border-bottom': borderBottom }">
+		<view class="u-field-inner" :class="[type == 'textarea' ? 'u-textarea-inner' : '', 'u-label-postion-' + labelPosition]">
+			<view class="u-label" :class="[required ? 'u-required' : '']" :style="{
+				justifyContent: justifyContent, 
+				flex: labelPosition == 'left' ? `0 0 ${labelWidth}rpx` : '1'
+			}">
+				<view class="u-icon-wrap" v-if="icon">
+					<u-icon size="32" :custom-style="iconStyle" :name="icon" :color="iconColor" class="u-icon"></u-icon>
+				</view>
+				<slot name="icon"></slot>
+				<text class="u-label-text" :class="[$slots.icon || icon ? 'u-label-left-gap' : '']">{{ label }}</text>
+			</view>
+			<view class="fild-body">
+				<view class="u-flex-1 u-flex" :style="[inputWrapStyle]">
+					<textarea v-if="type == 'textarea'" class="u-flex-1 u-textarea-class" :style="[fieldStyle]" :value="valueCom"
+					 :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled" :maxlength="inputMaxlength"
+					 :focus="focus" :autoHeight="autoHeight" :fixed="fixed" @input="onInput" @blur="onBlur" @focus="onFocus" @confirm="onConfirm"
+					 @tap="fieldClick" />
+					<input
+						v-else
+						:style="[fieldStyle]"
+						:type="type"
+						class="u-flex-1 u-field__input-wrap"
+						:value="valueCom"
+						:password="password || type === 'password'"
+						:placeholder="placeholder"
+						:placeholderStyle="placeholderStyle"
+						:disabled="disabled"
+						:maxlength="inputMaxlength"
+						:focus="focus"
+						:confirmType="confirmType"
+						@focus="onFocus"
+						@blur="onBlur"
+						@input="onInput"
+						@confirm="onConfirm"
+						@tap="fieldClick"
+					/>
+				</view>
+				<u-icon :size="clearSize" v-if="clearable && valueCom != '' && focused" name="close-circle-fill" color="#c0c4cc" class="u-clear-icon" @click="onClear"/>
+				<view class="u-button-wrap"><slot name="right" /></view>
+				<u-icon v-if="rightIcon" @click="rightIconClick" :name="rightIcon" color="#c0c4cc" :style="[rightIconStyle]" size="26" class="u-arror-right" />
+			</view>
+		</view>
+		<view v-if="errorMessage !== false && errorMessage != ''" class="u-error-message" :style="{
+			paddingLeft: labelWidth + 'rpx'
+		}">{{ errorMessage }}</view>
+	</view>
+</template>
+
+<script>
+/**
+ * field 输入框
+ * @description 借助此组件，可以实现表单的输入， 有"text"和"textarea"类型的，此外，借助uView的picker和actionSheet组件可以快速实现上拉菜单，时间，地区选择等， 为表单解决方案的利器。
+ * @tutorial https://www.uviewui.com/components/field.html
+ * @property {String} type 输入框的类型（默认text）
+ * @property {String} icon label左边的图标，限uView的图标名称
+ * @property {Object} icon-style 左边图标的样式，对象形式
+ * @property {Boolean} right-icon 输入框右边的图标名称，限uView的图标名称（默认false）
+ * @property {Boolean} required 是否必填，左边您显示红色"*"号（默认false）
+ * @property {String} label 输入框左边的文字提示
+ * @property {Boolean} password 是否密码输入方式(用点替换文字)，type为text时有效（默认false）
+ * @property {Boolean} clearable 是否显示右侧清空内容的图标控件(输入框有内容，且获得焦点时才显示)，点击可清空输入框内容（默认true）
+ * @property {Number String} label-width label的宽度，单位rpx（默认130）
+ * @property {String} label-align label的文字对齐方式（默认left）
+ * @property {Object} field-style 自定义输入框的样式，对象形式
+ * @property {Number | String} clear-size 清除图标的大小，单位rpx（默认30）
+ * @property {String} input-align 输入框内容对齐方式（默认left）
+ * @property {Boolean} border-bottom 是否显示field的下边框（默认true）
+ * @property {Boolean} border-top 是否显示field的上边框（默认false）
+ * @property {String} icon-color 左边通过icon配置的图标的颜色（默认#606266）
+ * @property {Boolean} auto-height 是否自动增高输入区域，type为textarea时有效（默认true）
+ * @property {String Boolean} error-message 显示的错误提示内容，如果为空字符串或者false，则不显示错误信息
+ * @property {String} placeholder 输入框的提示文字
+ * @property {String} placeholder-style placeholder的样式(内联样式，字符串)，如"color: #ddd"
+ * @property {Boolean} focus 是否自动获得焦点（默认false）
+ * @property {Boolean} fixed 如果type为textarea，且在一个"position:fixed"的区域，需要指明为true（默认false）
+ * @property {Boolean} disabled 是否不可输入（默认false）
+ * @property {Number String} maxlength 最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
+ * @property {String} confirm-type 设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
+ * @event {Function} input 输入框内容发生变化时触发
+ * @event {Function} focus 输入框获得焦点时触发
+ * @event {Function} blur 输入框失去焦点时触发
+ * @event {Function} confirm 点击完成按钮时触发
+ * @event {Function} right-icon-click 通过right-icon生成的图标被点击时触发
+ * @event {Function} click 输入框被点击或者通过right-icon生成的图标被点击时触发，这样设计是考虑到传递右边的图标，一般都为需要弹出"picker"等操作时的场景，点击倒三角图标，理应发出此事件，见上方说明
+ * @example <u-field v-model="mobile" label="手机号" required :error-message="errorMessage"></u-field>
+ */
+export default {
+	name:"u-field",
+  emits: ["update:modelValue", "input", "focus", "blur", "confirm", "right-icon-click", "click"],
+	props: {
+    value: [Number, String],
+    modelValue: [Number, String],
+		icon: String,
+		rightIcon: String,
+		arrowDirection: {
+			type: String,
+			default: 'right'
+		},
+		required: Boolean,
+		label: String,
+		password: Boolean,
+		clearable: {
+			type: Boolean,
+			default: true
+		},
+		// 左边标题的宽度单位rpx
+		labelWidth: {
+			type: [Number, String],
+			default: 130
+		},
+		// 对齐方式，left|center|right
+		labelAlign: {
+			type: String,
+			default: 'left'
+		},
+		inputAlign: {
+			type: String,
+			default: 'left'
+		},
+		iconColor: {
+			type: String,
+			default: '#606266'
+		},
+		autoHeight: {
+			type: Boolean,
+			default: true
+		},
+		errorMessage: {
+			type: [String, Boolean],
+			default: ''
+		},
+		placeholder: String,
+		placeholderStyle: String,
+		focus: Boolean,
+		fixed: Boolean,
+		type: {
+			type: String,
+			default: 'text'
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		maxlength: {
+			type: [Number, String],
+			default: 140
+		},
+		confirmType: {
+			type: String,
+			default: 'done'
+		},
+		// lable的位置，可选为 left-左边，top-上边
+		labelPosition: {
+			type: String,
+			default: 'left'
+		},
+		// 输入框的自定义样式
+		fieldStyle: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		// 清除按钮的大小
+		clearSize: {
+			type: [Number, String],
+			default: 30
+		},
+		// lable左边的图标样式，对象形式
+		iconStyle: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		// 是否显示上边框
+		borderTop: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示下边框
+		borderBottom: {
+			type: Boolean,
+			default: true
+		},
+		// 是否自动去除两端的空格
+		trim: {
+			type: Boolean,
+			default: true
+		}
+	},
+	data() {
+		return {
+			focused: false,
+			itemIndex: 0,
+		};
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+		
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		inputWrapStyle() {
+			let style = {};
+			style.textAlign = this.inputAlign;
+			// 判断lable的位置，如果是left的话，让input左边两边有间隙
+			if(this.labelPosition == 'left') {
+				style.margin = `0 8rpx`;
+			} else {
+				// 如果lable是top的，input的左边就没必要有间隙了
+				style.marginRight = `8rpx`;
+			}
+			return style;
+		},
+		rightIconStyle() {
+			let style = {};
+			let arrowDirectionObj = {
+				"top": "-90deg",
+				"bottom": "90deg",
+				"left": "180deg",
+				"right": "0deg",
+			};
+			let deg = arrowDirectionObj[this.arrowDirection] || "0deg";
+			style.transform = 'rotate('+deg+')';
+			return style;
+		},
+		labelStyle() {
+			let style = {};
+			if(this.labelAlign == 'left') style.justifyContent = 'flext-start';
+			if(this.labelAlign == 'center') style.justifyContent = 'center';
+			if(this.labelAlign == 'right') style.justifyContent = 'flext-end';
+			return style;
+		},
+		// uni不支持在computed中写style.justifyContent = 'center'的形式，故用此方法
+		justifyContent() {
+			if(this.labelAlign == 'left') return 'flex-start';
+			if(this.labelAlign == 'center') return 'center';
+			if(this.labelAlign == 'right') return 'flex-end';
+		},
+		// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，给用户可以传入字符串数值
+		inputMaxlength() {
+			return Number(this.maxlength)
+		},
+		// label的位置
+		fieldInnerStyle() {
+			let style = {};
+			if(this.labelPosition == 'left') {
+				style.flexDirection = 'row';
+			} else {
+				style.flexDirection = 'column';
+			}
+			
+			return style;
+		}
+	},
+	methods: {
+		onInput(event) {
+			let value = event.detail.value;
+			// 判断是否去除空格
+			if(this.trim) value = this.$u.trim(value);
+			this.$emit('input', value);
+      this.$emit("update:modelValue", value);
+		},
+		onFocus(event) {
+			this.focused = true;
+			this.$emit('focus', event);
+		},
+		onBlur(event) {
+			// 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错
+			// 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时
+			setTimeout(() => {
+				this.focused = false;
+			}, 100)
+			this.$emit('blur', event);
+		},
+		onConfirm(e) {
+			this.$emit('confirm', e.detail.value);
+		},
+		onClear(event) {
+			this.$emit('input', '');
+      this.$emit("update:modelValue", '');
+		},
+		rightIconClick() {
+			this.$emit('right-icon-click');
+			this.$emit('click');
+		},
+		fieldClick() {
+			this.$emit('click');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+	
+.u-field {
+	font-size: 28rpx;
+	padding: 20rpx 28rpx;
+	text-align: left;
+	position: relative;
+	color: $u-main-color;
+}
+
+.u-field-inner {
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-textarea-inner {
+	align-items: flex-start;
+}
+
+.u-textarea-class {
+	min-height: 96rpx;
+	width: auto;
+	font-size: 28rpx;
+}
+
+.fild-body {
+	@include vue-flex;
+	flex: 1;
+	align-items: center;
+}
+
+.u-arror-right {
+	margin-left: 8rpx;
+}
+
+.u-label-text {
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+}
+
+.u-label-left-gap {
+	margin-left: 6rpx;
+}
+
+.u-label-postion-top {
+	flex-direction: column;
+	align-items: flex-start;
+}
+
+.u-label {
+	width: 130rpx;
+	flex: 1 1 130rpx;
+	text-align: left;
+	position: relative;
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-required::before {
+	content: '*';
+	position: absolute;
+	left: -16rpx;
+	font-size: 14px;
+	color: $u-type-error;
+	height: 9px;
+	line-height: 1;
+}
+
+.u-field__input-wrap {
+	position: relative;
+	overflow: hidden;
+	font-size: 28rpx;
+	height: 48rpx;
+	flex: 1;
+	width: auto;
+}
+
+.u-clear-icon {
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-error-message {
+	color: $u-type-error;
+	font-size: 26rpx;
+	text-align: left;
+}
+
+.placeholder-style {
+	color: rgb(150, 151, 153);
+}
+
+.u-input-class {
+	font-size: 28rpx;
+}
+
+.u-button-wrap {
+	margin-left: 8rpx;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-form-item/u-form-item.vue b/uni_modules/vk-uview-ui/components/u-form-item/u-form-item.vue
new file mode 100644
index 0000000..c893cfd
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-form-item/u-form-item.vue
@@ -0,0 +1,509 @@
+<template>
+	<view class="u-form-item" :class="{'u-border-bottom': elBorderBottom, 'u-form-item__border-bottom--error': validateState === 'error' && showError('border-bottom')}">
+		<view class="u-form-item__body" :style="{
+			flexDirection: elLabelPosition == 'left' ? 'row' : 'column'
+		}">
+			<!-- 微信小程序中，将一个参数设置空字符串，结果会变成字符串"true" -->
+			<view class="u-form-item--left" :style="{
+				width: uLabelWidth,
+				flex: `0 0 ${uLabelWidth}`,
+				marginBottom: elLabelPosition == 'left' ? 0 : '10rpx',
+			}">
+				<!-- 为了块对齐 -->
+				<view class="u-form-item--left__content" v-if="required || leftIcon || label">
+					<!-- nvue不支持伪元素before -->
+					<text v-if="required" class="u-form-item--left__content--required">*</text>
+					<view class="u-form-item--left__content__icon" v-if="leftIcon">
+						<u-icon :name="leftIcon" :custom-style="leftIconStyle"></u-icon>
+					</view>
+					<view class="u-form-item--left__content__label" :style="[elLabelStyle, {
+						'justify-content': elLabelAlign == 'left' ? 'flex-start' : elLabelAlign == 'center' ? 'center' : 'flex-end'
+					}]">
+						{{label}}
+					</view>
+				</view>
+			</view>
+			<view class="u-form-item--right u-flex">
+				<view class="u-form-item--right__content">
+					<view class="u-form-item--right__content__slot" :style="elLabelPosition == 'left' && elInputAlign == 'right' ? 'text-align:right;display: inline-block;line-height:initial;' : ''">
+						<slot />
+					</view>
+					<view class="u-form-item--right__content__icon u-flex" v-if="$slots.right || rightIcon">
+						<u-icon :custom-style="rightIconStyle" v-if="rightIcon" :name="rightIcon"></u-icon>
+						<slot name="right" />
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="u-form-item__message" v-if="validateState === 'error' && showError('message')" :style="{
+			paddingLeft: elLabelPosition == 'left' ? $u.addUnit(elLabelWidth) : '0',
+			textAlign: elInputAlign == 'right' ? 'right' : 'left'
+		}">{{validateMessage}}</view>
+	</view>
+</template>
+
+<script>
+	import Emitter from '../../libs/util/emitter.js';
+	import schema from '../../libs/util/async-validator';
+	// 去除警告信息
+	schema.warning = function() {};
+
+	/**
+	 * form-item 表单item
+	 * @description 此组件一般用于表单场景，可以配置Input输入框，Select弹出框，进行表单验证等。
+	 * @tutorial http://uviewui.com/components/form.html
+	 * @property {String} label 左侧提示文字
+	 * @property {Object} prop 表单域model对象的属性名，在使用 validate、resetFields 方法的情况下，该属性是必填的
+	 * @property {Boolean} border-bottom 是否显示表单域的下划线边框
+	 * @property {String} label-position 表单域提示文字的位置，left-左侧，top-上方
+	 * @property {String Number} label-width 提示文字的宽度，单位rpx（默认90）
+	 * @property {Object} label-style lable的样式，对象形式
+	 * @property {String} label-align lable的对齐方式
+	 * @property {String} right-icon 右侧自定义字体图标(限uView内置图标)或图片地址
+	 * @property {String} left-icon 左侧自定义字体图标(限uView内置图标)或图片地址
+	 * @property {Object} left-icon-style 左侧图标的样式，对象形式
+	 * @property {Object} right-icon-style 右侧图标的样式，对象形式
+	 * @property {Boolean} required 是否显示左边的"*"号，这里仅起展示作用，如需校验必填，请通过rules配置必填规则(默认false)
+	 * @example <u-form-item label="姓名"><u-input v-model="form.name" /></u-form-item>
+	 */
+
+	export default {
+		name: 'u-form-item',
+		mixins: [Emitter],
+		inject: {
+			uForm: {
+				default () {
+					return null
+				}
+			}
+		},
+		props: {
+			// input的label提示语
+			label: {
+				type: String,
+				default: ''
+			},
+			// 绑定的值
+			prop: {
+				type: String,
+				default: ''
+			},
+			// 是否显示表单域的下划线边框
+			borderBottom: {
+				type: [String, Boolean],
+				default: ''
+			},
+			// label的位置，left-左边，top-上边
+			labelPosition: {
+				type: String,
+				default: ''
+			},
+			// label的宽度，单位rpx
+			labelWidth: {
+				type: [String, Number],
+				default: ''
+			},
+			// lable的样式，对象形式
+			labelStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// lable字体的对齐方式
+			labelAlign: {
+				type: String,
+				default: ''
+			},
+			// 右侧图标
+			rightIcon: {
+				type: String,
+				default: ''
+			},
+			// 左侧图标
+			leftIcon: {
+				type: String,
+				default: ''
+			},
+			// 左侧图标的样式
+			leftIconStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 左侧图标的样式
+			rightIconStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 是否显示左边的必填星号，只作显示用，具体校验必填的逻辑，请在rules中配置
+			required: {
+				type: Boolean,
+				default: false
+			},
+			inputAlign:{
+				type: String,
+				default: ''
+			},
+		},
+		data() {
+			return {
+				initialValue: '', // 存储的默认值
+				// isRequired: false, // 是否必填，由于人性化考虑，必填"*"号通过props的required配置，不再通过rules的规则自动生成
+				validateState: '', // 是否校验成功
+				validateMessage: '', // 校验失败的提示语
+				// 有错误时的提示方式，message-提示信息，border-如果input设置了边框，变成呈红色，
+				errorType: ['message'],
+				fieldValue: '', // 获取当前子组件input的输入的值
+				// 父组件的参数，在computed计算中，无法得知this.parent发生变化，故将父组件的参数值，放到data中
+				parentData: {
+					borderBottom: true,
+					labelWidth: 90,
+					labelPosition: 'left',
+					labelStyle: {},
+					labelAlign: 'left',
+					inputAlign: 'left',
+				}
+			};
+		},
+		watch: {
+			validateState(val) {
+				this.broadcastInputError();
+			},
+			// 监听u-form组件的errorType的变化
+			"uForm.errorType"(val) {
+				this.errorType = val;
+				this.broadcastInputError();
+			},
+		},
+		computed: {
+			// 计算后的label宽度，由于需要多个判断，故放到computed中
+			uLabelWidth() {
+				// 如果用户设置label为空字符串(微信小程序空字符串最终会变成字符串的'true')，意味着要将label的位置宽度设置为auto
+				return this.elLabelPosition == 'left' ? (this.label === 'true' || this.label === '' ? 'auto' : this.$u.addUnit(this
+					.elLabelWidth)) : '100%';
+			},
+			showError() {
+				return type => {
+					// 如果errorType数组中含有none，或者toast提示类型
+					if (this.errorType.indexOf('none') >= 0) return false;
+					else if (this.errorType.indexOf(type) >= 0) return true;
+					else return false;
+				}
+			},
+			// label的宽度
+			elLabelWidth() {
+				// label默认宽度为90，优先使用本组件的值，如果没有(如果设置为0，也算是配置了值，依然起效)，则用u-form的值
+				return (this.labelWidth != 0 || this.labelWidth != '') ? this.labelWidth : (this.parentData.labelWidth ? this.parentData
+					.labelWidth :
+					90);
+			},
+			// label的样式
+			elLabelStyle() {
+				return Object.keys(this.labelStyle).length ? this.labelStyle : (this.parentData.labelStyle ? this.parentData.labelStyle :
+					{});
+			},
+			// label的位置，左侧或者上方
+			elLabelPosition() {
+				return this.labelPosition ? this.labelPosition : (this.parentData.labelPosition ? this.parentData.labelPosition :
+					'left');
+			},
+			// label的对齐方式
+			elLabelAlign() {
+				return this.labelAlign ? this.labelAlign : (this.parentData.labelAlign ? this.parentData.labelAlign : 'left');
+			},
+			// label的下划线
+			elBorderBottom() {
+				// 子组件的borderBottom默认为空字符串，如果不等于空字符串，意味着子组件设置了值，优先使用子组件的值
+				return this.borderBottom !== '' ? this.borderBottom : this.parentData.borderBottom ? this.parentData.borderBottom :
+					true;
+			},
+			elInputAlign() {
+				return this.inputAlign ? this.inputAlign : (this.parentData.inputAlign ? this.parentData.inputAlign : 'left');
+			},
+		},
+		methods: {
+			broadcastInputError() {
+				// 子组件发出事件，第三个参数为true或者false，true代表有错误
+				this.broadcast('u-input', 'onFormItemError', this.validateState === 'error' && this.showError('border'));
+			},
+			// 判断是否需要required校验
+			setRules() {
+				let that = this;
+				// 由于人性化考虑，必填"*"号通过props的required配置，不再通过rules的规则自动生成
+				// 从父组件u-form拿到当前u-form-item需要验证 的规则
+				// let rules = this.getRules();
+				// if (rules.length) {
+				// 	this.isRequired = rules.some(rule => {
+				// 		// 如果有必填项，就返回，没有的话，就是undefined
+				// 		return rule.required;
+				// 	});
+				// }
+				// #ifndef VUE3
+				// blur事件
+				this.$on('onFieldBlur', that.onFieldBlur);
+				// change事件
+				this.$on('onFieldChange', that.onFieldChange);
+				// #endif
+				// #ifdef VUE3
+
+				// #endif
+			},
+
+			// 从u-form的rules属性中，取出当前u-form-item的校验规则
+			getRules() {
+				// 父组件的所有规则
+				let rules = this.parent.rules;
+				rules = rules ? rules[this.prop] : [];
+				// 保证返回的是一个数组形式
+				return [].concat(rules || []);
+			},
+
+			// blur事件时进行表单校验
+			onFieldBlur() {
+				this.validation('blur');
+			},
+
+			// change事件进行表单校验
+			onFieldChange() {
+				this.validation('change');
+			},
+
+			// 过滤出符合要求的rule规则
+			getFilteredRule(triggerType = '') {
+				let rules = this.getRules();
+				// 整体验证表单时，triggerType为空字符串，此时返回所有规则进行验证
+				if (!triggerType) return rules;
+				// 历遍判断规则是否有对应的事件，比如blur，change触发等的事件
+				// 使用indexOf判断，是因为某些时候设置的验证规则的trigger属性可能为多个，比如['blur','change']
+				// 某些场景可能的判断规则，可能不存在trigger属性，故先判断是否存在此属性
+				return rules.filter(res => res.trigger && res.trigger.indexOf(triggerType) !== -1);
+			},
+
+			getData(dataObj, name, defaultValue) {
+				let newDataObj;
+				if (dataObj) {
+					newDataObj = JSON.parse(JSON.stringify(dataObj));
+					let k = "",
+						d = ".",
+						l = "[",
+						r = "]";
+					name = name.replace(/\s+/g, k) + d;
+					let tstr = k;
+					for (let i = 0; i < name.length; i++) {
+						let theChar = name.charAt(i);
+						if (theChar != d && theChar != l && theChar != r) {
+							tstr += theChar;
+						} else if (newDataObj) {
+							if (tstr != k) newDataObj = newDataObj[tstr];
+							tstr = k;
+						}
+					}
+				}
+				if (typeof newDataObj === "undefined" && typeof defaultValue !== "undefined") newDataObj = defaultValue;
+				return newDataObj;
+			},
+
+			setData(dataObj, name, value) {
+				// 通过正则表达式  查找路径数据
+				let dataValue;
+				if (typeof value === "object") {
+					dataValue = JSON.parse(JSON.stringify(value));
+				} else {
+					dataValue = value;
+				}
+				let regExp = new RegExp("([\\w$]+)|\\[(:\\d)\\]", "g");
+				const patten = name.match(regExp);
+				// 遍历路径  逐级查找  最后一级用于直接赋值
+				for (let i = 0; i < patten.length - 1; i++) {
+					let keyName = patten[i];
+					if (typeof dataObj[keyName] !== "object") dataObj[keyName] = {};
+					dataObj = dataObj[keyName];
+				}
+				// 最后一级
+				dataObj[patten[patten.length - 1]] = dataValue;
+			},
+
+			// 校验数据
+			validation(trigger, callback = () => {}) {
+				// 检验之间，先获取需要校验的值
+				//this.fieldValue = this.parent.model[this.prop];
+				// 修改支持a.b
+				this.fieldValue = this.getData(this.parent.model,this.prop);
+				// blur和change是否有当前方式的校验规则
+				let rules = this.getFilteredRule(trigger);
+				// 判断是否有验证规则，如果没有规则，也调用回调方法，否则父组件u-form会因为
+				// 对count变量的统计错误而无法进入上一层的回调
+				if (!rules || rules.length === 0) {
+					return callback('');
+				}
+				// 设置当前的装填，标识为校验中
+				this.validateState = 'validating';
+				// 调用async-validator的方法
+				let validator = new schema({
+					[this.prop]: rules
+				});
+				validator.validate({
+					[this.prop]: this.fieldValue
+				}, {
+					firstFields: true
+				}, (errors, fields) => {
+					// 记录状态和报错信息
+					this.validateState = !errors ? 'success' : 'error';
+					this.validateMessage = errors ? errors[0].message : '';
+					let field = errors ? errors[0].field : '';
+					// 调用回调方法
+					callback(this.validateMessage, {
+						state: this.validateState,
+						key: field,
+						msg: this.validateMessage
+					});
+				});
+			},
+
+			// 清空当前的u-form-item
+			resetField() {
+				//this.parent.model[this.prop] = this.initialValue;
+				this.setData(this.parent.model,this.prop,this.initialValue);
+				// 设置为`success`状态，只是为了清空错误标记
+				this.validateState = 'success';
+			}
+		},
+
+		// 组件创建完成时，将当前实例保存到u-form中
+		mounted() {
+			// 支付宝、头条小程序不支持provide/inject，所以使用这个方法获取整个父组件，在created定义，避免循环应用
+			this.parent = this.$u.$parent.call(this, 'u-form');
+			if (this.parent) {
+				// 历遍parentData中的属性，将parent中的同名属性赋值给parentData
+				Object.keys(this.parentData).map(key => {
+					this.parentData[key] = this.parent[key];
+				});
+				// 如果没有传入prop，或者uForm为空(如果u-form-input单独使用，就不会有uForm注入)，就不进行校验
+				if (this.prop) {
+					// 将本实例添加到父组件中
+					this.parent.fields.push(this);
+					this.errorType = this.parent.errorType;
+					// 设置初始值
+					this.initialValue = this.fieldValue;
+					// 添加表单校验，这里必须要写在$nextTick中，因为u-form的rules是通过ref手动传入的
+					// 不在$nextTick中的话，可能会造成执行此处代码时，父组件还没通过ref把规则给u-form，导致规则为空
+					this.$nextTick(() => {
+						this.setRules();
+					})
+				}
+			}
+		},
+		// #ifndef VUE3
+		// 组件销毁前，将实例从u-form的缓存中移除
+		beforeDestroy() {
+			// 如果当前没有prop的话表示当前不要进行删除（因为没有注入）
+			if (this.parent && this.prop) {
+				this.parent.fields.map((item, index) => {
+					if (item === this) this.parent.fields.splice(index, 1);
+				})
+			}
+		},
+		// #endif
+
+		// #ifdef VUE3
+		beforeUnmount() {
+			// 如果当前没有prop的话表示当前不要进行删除（因为没有注入）
+			if (this.parent && this.prop) {
+				this.parent.fields.map((item, index) => {
+					if (item === this) this.parent.fields.splice(index, 1);
+				})
+			}
+		},
+		// #endif
+
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-form-item {
+		@include vue-flex;
+		// align-items: flex-start;
+		padding: 20rpx 0;
+		font-size: 28rpx;
+		color: $u-main-color;
+		box-sizing: border-box;
+		line-height: $u-form-item-height;
+		flex-direction: column;
+
+		&__border-bottom--error:after {
+			border-color: $u-type-error;
+		}
+
+		&__body {
+			@include vue-flex;
+		}
+
+		&--left {
+			@include vue-flex;
+			align-items: center;
+
+			&__content {
+				position: relative;
+				@include vue-flex;
+				align-items: center;
+				padding-right: 10rpx;
+				flex: 1;
+
+				&__icon {
+					margin-right: 8rpx;
+				}
+
+				&--required {
+					position: absolute;
+					left: -16rpx;
+					vertical-align: middle;
+					color: $u-type-error;
+					padding-top: 6rpx;
+				}
+
+				&__label {
+					@include vue-flex;
+					align-items: center;
+					flex: 1;
+				}
+			}
+		}
+
+		&--right {
+			flex: 1;
+
+			&__content {
+				@include vue-flex;
+				align-items: center;
+				flex: 1;
+
+				&__slot {
+					flex: 1;
+					/* #ifndef MP */
+					@include vue-flex;
+					align-items: center;
+					/* #endif */
+				}
+
+				&__icon {
+					margin-left: 10rpx;
+					color: $u-light-color;
+					font-size: 30rpx;
+				}
+			}
+		}
+
+		&__message {
+			font-size: 24rpx;
+			line-height: 24rpx;
+			color: $u-type-error;
+			margin-top: 12rpx;
+		}
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-form/u-form.vue b/uni_modules/vk-uview-ui/components/u-form/u-form.vue
new file mode 100644
index 0000000..ce502ae
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-form/u-form.vue
@@ -0,0 +1,148 @@
+<template>
+	<view class="u-form"><slot /></view>
+</template>
+
+<script>
+	/**
+	 * form 表单
+	 * @description 此组件一般用于表单场景，可以配置Input输入框，Select弹出框，进行表单验证等。
+	 * @tutorial http://uviewui.com/components/form.html
+	 * @property {Object} model 表单数据对象
+	 * @property {Boolean} border-bottom 是否显示表单域的下划线边框
+	 * @property {String} label-position 表单域提示文字的位置，left-左侧，top-上方
+	 * @property {String Number} label-width 提示文字的宽度，单位rpx（默认90）
+	 * @property {Object} label-style lable的样式，对象形式
+	 * @property {String} label-align lable的对齐方式
+	 * @property {Object} rules 通过ref设置，见官网说明
+	 * @property {Array} error-type 错误的提示方式，数组形式，见上方说明(默认['message'])
+	 * @example <u-form :model="form" ref="uForm"></u-form>
+	 */
+
+export default {
+	name: 'u-form',
+	props: {
+		// 当前form的需要验证字段的集合
+		model: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 验证规则
+		// rules: {
+		// 	type: [Object, Function, Array],
+		// 	default() {
+		// 		return {};
+		// 	}
+		// },
+		// 有错误时的提示方式，message-提示信息，border-如果input设置了边框，变成呈红色，
+		// border-bottom-下边框呈现红色，none-无提示
+		errorType: {
+			type: Array,
+			default() {
+				return ['message', 'toast']
+			}
+		},
+		// 是否显示表单域的下划线边框
+		borderBottom: {
+			type: Boolean,
+			default: true
+		},
+		// label的位置，left-左边，top-上边
+		labelPosition: {
+			type: String,
+			default: 'left'
+		},
+		// label的宽度，单位rpx
+		labelWidth: {
+			type: [String, Number],
+			default: 90
+		},
+		// lable字体的对齐方式
+		labelAlign: {
+			type: String,
+			default: 'left'
+		},
+		// lable的样式，对象形式
+		labelStyle: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		// 表单内所有input的inputAlign属性的值
+		inputAlign: {
+			type: String,
+			default: 'left'
+		},
+		// 表单内所有input的clearable属性的值
+		clearable:{
+			type: Boolean,
+			default: true
+		}
+	},
+	provide() {
+		return {
+			uForm: this
+		};
+	},
+	data() {
+		return {
+			rules: {}
+		};
+	},
+	created() {
+		// 存储当前form下的所有u-form-item的实例
+		// 不能定义在data中，否则微信小程序会造成循环引用而报错
+		this.fields = [];
+	},
+	methods: {
+		setRules(rules) {
+			this.rules = rules;
+		},
+		// 清空所有u-form-item组件的内容，本质上是调用了u-form-item组件中的resetField()方法
+		resetFields() {
+			this.fields.map(field => {
+				field.resetField();
+			});
+		},
+		// 校验全部数据
+		validate(callback) {
+			return new Promise(resolve => {
+				// 对所有的u-form-item进行校验
+				let valid = true; // 默认通过
+				let count = 0; // 用于标记是否检查完毕
+				let errorArr = []; // 存放错误信息
+				let errorObjArr = []; // 存放错误信息对象
+				this.fields.map(field => {
+					// 调用每一个u-form-item实例的validation的校验方法
+					field.validation('', (errorMsg, errObj) => {
+						// 如果任意一个u-form-item校验不通过，就意味着整个表单不通过
+						if (errorMsg) {
+							valid = false;
+							errorArr.push(errorMsg);
+							errorObjArr.push(errObj)
+						}
+
+						// 当历遍了所有的u-form-item时，调用promise的then方法
+						if (++count === this.fields.length) {
+
+							resolve(valid, errorObjArr[0]); // 进入promise的then方法
+							// 判断是否设置了toast的提示方式，只提示最前面的表单域的第一个错误信息
+							if(this.errorType.indexOf('none') === -1 && this.errorType.indexOf('toast') >= 0 && errorArr.length) {
+								this.$u.toast(errorArr[0]);
+							}
+							// 调用回调方法
+							if (typeof callback == 'function') callback(valid, errorObjArr[0]);
+						}
+					});
+				});
+			});
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../libs/css/style.components.scss";
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-full-screen/u-full-screen.vue b/uni_modules/vk-uview-ui/components/u-full-screen/u-full-screen.vue
new file mode 100644
index 0000000..4f7e7d9
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-full-screen/u-full-screen.vue
@@ -0,0 +1,52 @@
+<template>
+	<u-modal v-model="show" :show-cancel-button="true" confirm-text="升级" title="发现新版本" @cancel="cancel" @confirm="confirm">
+		<view class="u-update-content">
+			<rich-text :nodes="content"></rich-text>
+		</view>
+	</u-modal>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false,
+				content: `
+					1. 修复badge组件的size参数无效问题<br>
+					2. 新增Modal模态框组件<br>
+					3. 新增压窗屏组件，可以在APP上以弹窗的形式遮盖导航栏和底部tabbar<br>
+					4. 修复键盘组件在微信小程序上遮罩无效的问题
+				`,
+			}
+		},
+		onReady() {
+			this.show = true;
+		},
+		methods: {
+			cancel() {
+				this.closeModal();
+			},
+			confirm() {
+				this.closeModal();
+			},
+			closeModal() {
+				uni.navigateBack();
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	
+	.u-full-content {
+		background-color: #00C777;
+	}
+	
+	.u-update-content {
+		font-size: 26rpx;
+		color: $u-content-color;
+		line-height: 1.7;
+		padding: 30rpx;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-gap/u-gap.vue b/uni_modules/vk-uview-ui/components/u-gap/u-gap.vue
new file mode 100644
index 0000000..6c01f94
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-gap/u-gap.vue
@@ -0,0 +1,54 @@
+<template>
+	<view class="u-gap" :style="[gapStyle]"></view>
+</template>
+
+<script>
+/**
+ * gap 间隔槽
+ * @description 该组件一般用于内容块之间的用一个灰色块隔开的场景，方便用户风格统一，减少工作量
+ * @tutorial https://www.uviewui.com/components/gap.html
+ * @property {String} bg-color 背景颜色（默认#f3f4f6）
+ * @property {String Number} height 分割槽高度，单位rpx（默认30）
+ * @property {String Number} margin-top 与前一个组件的距离，单位rpx（默认0）
+ * @property {String Number} margin-bottom 与后一个组件的距离，单位rpx（0）
+ * @example <u-gap height="80" bg-color="#bbb"></u-gap>
+ */
+export default {
+	name: "u-gap",
+	props: {
+		bgColor: {
+			type: String,
+			default: 'transparent ' // 背景透明
+		},
+		// 高度
+		height: {
+			type: [String, Number],
+			default: 30
+		},
+		// 与上一个组件的距离
+		marginTop: {
+			type: [String, Number],
+			default: 0
+		},
+		// 与下一个组件的距离
+		marginBottom: {
+			type: [String, Number],
+			default: 0
+		},
+	},
+	computed: {
+		gapStyle() {
+			return {
+				backgroundColor: this.bgColor,
+				height: this.height + 'rpx',
+				marginTop: this.marginTop + 'rpx',
+				marginBottom: this.marginBottom + 'rpx'
+			};
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-grid-item/u-grid-item.vue b/uni_modules/vk-uview-ui/components/u-grid-item/u-grid-item.vue
new file mode 100644
index 0000000..c5b3033
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-grid-item/u-grid-item.vue
@@ -0,0 +1,127 @@
+<template>
+	<view class="u-grid-item" :hover-class="parentData.hoverClass"
+	 :hover-stay-time="200" @tap="click" :style="{
+			background: bgColor,
+			width: width,
+		}">
+		<view class="u-grid-item-box" :style="[customStyle]" :class="[parentData.border ? 'u-border-right u-border-bottom' : '']">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * gridItem 提示
+	 * @description 宫格组件一般用于同时展示多个同类项目的场景，可以给宫格的项目设置徽标组件(badge)，或者图标等，也可以扩展为左右滑动的轮播形式。搭配u-grid使用
+	 * @tutorial https://www.uviewui.com/components/grid.html
+	 * @property {String} bg-color 宫格的背景颜色（默认#ffffff）
+	 * @property {String Number} index 点击宫格时，返回的值
+	 * @property {Object} custom-style 自定义样式，对象形式
+	 * @event {Function} click 点击宫格触发
+	 * @example <u-grid-item></u-grid-item>
+	 */
+	export default {
+		name: "u-grid-item",
+    emits: ["click"],
+		props: {
+			// 背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 点击时返回的index
+			index: {
+				type: [Number, String],
+				default: ''
+			},
+			// 自定义样式，对象形式
+			customStyle: {
+				type: Object,
+				default() {
+					return {
+						padding: '30rpx 0'
+					}
+				}
+			}
+		},
+		data() {
+			return {
+				parentData: {
+					hoverClass: '', // 按下去的时候，是否显示背景灰色
+					col: 3, // 父组件划分的宫格数
+					border: true, // 是否显示边框，根据父组件决定
+				}
+			};
+		},
+		created() {
+			// 父组件的实例
+			this.updateParentData();
+			// this.parent在updateParentData()中定义
+			this.parent.children.push(this);
+		},
+		computed: {
+			// 每个grid-item的宽度
+			width() {
+				return 100 / Number(this.parentData.col) + '%';
+			},
+		},
+		methods: {
+			// 获取父组件的参数
+			updateParentData() {
+				// 此方法写在mixin中
+				this.getParentData('u-grid');
+			},
+			click() {
+				this.$emit('click', this.index);
+				this.parent && this.parent.click(this.index);
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	
+	.u-grid-item {
+		box-sizing: border-box;
+		background: #fff;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		flex-direction: column;
+		
+		/* #ifdef MP */
+		position: relative;
+		float: left;
+		/* #endif */
+	}
+
+	.u-grid-item-hover {
+		background: #f7f7f7 !important;
+	}
+
+	.u-grid-marker-box {
+		position: absolute;
+		/* #ifndef APP-NVUE */
+		display: inline-flex;		
+		/* #endif */
+		line-height: 0;
+	}
+
+	.u-grid-marker-wrap {
+		position: absolute;
+	}
+
+	.u-grid-item-box {
+		padding: 30rpx 0;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		flex: 1;
+		width: 100%;
+		height: 100%;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-grid/u-grid.vue b/uni_modules/vk-uview-ui/components/u-grid/u-grid.vue
new file mode 100644
index 0000000..125b6f1
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-grid/u-grid.vue
@@ -0,0 +1,109 @@
+<template>
+	<view class="u-grid" :class="{'u-border-top u-border-left': border}" :style="[gridStyle]"><slot /></view>
+</template>
+
+<script>
+/**
+ * grid 宫格布局
+ * @description 宫格组件一般用于同时展示多个同类项目的场景，可以给宫格的项目设置徽标组件(badge)，或者图标等，也可以扩展为左右滑动的轮播形式。
+ * @tutorial https://www.uviewui.com/components/grid.html
+ * @property {String Number} col 宫格的列数（默认3）
+ * @property {Boolean} border 是否显示宫格的边框（默认true）
+ * @property {Boolean} hover-class 点击宫格的时候，是否显示按下的灰色背景（默认false）
+ * @event {Function} click 点击宫格触发
+ * @example <u-grid :col="3" @click="click"></u-grid>
+ */
+export default {
+	name: 'u-grid',
+  emits: ["click"],
+	props: {
+		// 分成几列
+		col: {
+			type: [Number, String],
+			default: 3
+		},
+		// 是否显示边框
+		border: {
+			type: Boolean,
+			default: true
+		},
+		// 宫格对齐方式，表现为数量少的时候，靠左，居中，还是靠右
+		align: {
+			type: String,
+			default: 'left'
+		},
+		// 宫格按压时的样式类，"none"为无效果
+		hoverClass: {
+			type: String,
+			default: 'u-hover-class'
+		}
+	},
+	data() {
+		return {
+			index: 0,
+		}
+	},
+	watch: {
+		// 当父组件需要子组件需要共享的参数发生了变化，手动通知子组件
+		parentData() {
+			if(this.children.length) {
+				this.children.map(child => {
+					// 判断子组件(u-radio)如果有updateParentData方法的话，就就执行(执行的结果是子组件重新从父组件拉取了最新的值)
+					typeof(child.updateParentData) == 'function' && child.updateParentData();
+				})
+			}
+		},
+	},
+	created() {
+		// 如果将children定义在data中，在微信小程序会造成循环引用而报错
+		this.children = [];
+	},
+	computed: {
+		// 计算父组件的值是否发生变化
+		parentData() {
+			return [this.hoverClass, this.col, this.size, this.border];
+		},
+		// 宫格对齐方式
+		gridStyle() {
+			let style = {};
+			switch(this.align) {
+				case 'left':
+					style.justifyContent = 'flex-start';
+					break;
+				case 'center':
+					style.justifyContent = 'center';
+					break;
+				case 'right':
+					style.justifyContent = 'flex-end';
+					break;
+				default: style.justifyContent = 'flex-start';
+			};
+			return style;
+		}
+	},
+	methods: {
+		click(index) {
+			this.$emit('click', index);
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../libs/css/style.components.scss";
+
+.u-grid {
+	width: 100%;
+	/* #ifdef MP */
+	position: relative;
+	box-sizing: border-box;
+	overflow: hidden;
+	/* #endif */
+	
+	/* #ifndef MP */
+	@include vue-flex;
+	flex-wrap: wrap;
+	align-items: center;
+	/* #endif */
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-icon/u-icon.vue b/uni_modules/vk-uview-ui/components/u-icon/u-icon.vue
new file mode 100644
index 0000000..ed95a9c
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-icon/u-icon.vue
@@ -0,0 +1,369 @@
+<template>
+	<view :style="[customStyle]" class="u-icon" @tap="click" :class="['u-icon--' + labelPos]">
+		<image class="u-icon__img" v-if="isImg" :src="name" :mode="imgMode" :style="[imgStyle]"></image>
+		<view
+			v-else
+			class="u-icon__icon"
+			:class="customClass"
+			:style="[iconStyle]"
+			:hover-class="hoverClass"
+			@touchstart="touchstart"
+		>
+			<text
+				v-if="showDecimalIcon"
+				:style="[decimalIconStyle]"
+				:class="decimalIconClass"
+				:hover-class="hoverClass"
+				class="u-icon__decimal"
+			></text>
+		</view>
+		<!-- 这里进行空字符串判断，如果仅仅是v-if="label"，可能会出现传递0的时候，结果也无法显示，微信小程序不传值默认为null，故需要增加null的判断 -->
+		<text
+			v-if="label !== '' && label !== null"
+			class="u-icon__label"
+			:style="{
+				color: labelColor,
+				fontSize: $u.addUnit(labelSize),
+				marginLeft: labelPos == 'right' ? $u.addUnit(marginLeft) : 0,
+				marginTop: labelPos == 'bottom' ? $u.addUnit(marginTop) : 0,
+				marginRight: labelPos == 'left' ? $u.addUnit(marginRight) : 0,
+				marginBottom: labelPos == 'top' ? $u.addUnit(marginBottom) : 0
+			}"
+		>
+			{{ label }}
+		</text>
+	</view>
+</template>
+
+<script>
+/**
+ * icon 图标
+ * @description 基于字体的图标集，包含了大多数常见场景的图标。
+ * @tutorial https://www.uviewui.com/components/icon.html
+ * @property {String} name 图标名称，见示例图标集
+ * @property {String} color 图标颜色（默认inherit）
+ * @property {String | Number} size 图标字体大小，单位rpx（默认32）
+ * @property {String | Number} label-size label字体大小，单位rpx（默认28）
+ * @property {String} label 图标右侧的label文字（默认28）
+ * @property {String} label-pos label文字相对于图标的位置，只能right或bottom（默认right）
+ * @property {String} label-color label字体颜色（默认#606266）
+ * @property {Object} custom-style icon的样式，对象形式
+ * @property {String} custom-prefix 自定义字体图标库时，需要写上此值
+ * @property {String | Number} margin-left label在右侧时与图标的距离，单位rpx（默认6）
+ * @property {String | Number} margin-top label在下方时与图标的距离，单位rpx（默认6）
+ * @property {String | Number} margin-bottom label在上方时与图标的距离，单位rpx（默认6）
+ * @property {String | Number} margin-right label在左侧时与图标的距离，单位rpx（默认6）
+ * @property {String} label-pos label相对于图标的位置，只能right或bottom（默认right）
+ * @property {String} index 一个用于区分多个图标的值，点击图标时通过click事件传出
+ * @property {String} hover-class 图标按下去的样式类，用法同uni的view组件的hover-class参数，详情见官网
+ * @property {String} width 显示图片小图标时的宽度
+ * @property {String} height 显示图片小图标时的高度
+ * @property {String} top 图标在垂直方向上的定位
+ * @property {String} top 图标在垂直方向上的定位
+ * @property {String} top 图标在垂直方向上的定位
+ * @property {Boolean} show-decimal-icon 是否为DecimalIcon
+ * @property {String} inactive-color 背景颜色，可接受主题色，仅Decimal时有效
+ * @property {String | Number} percent 显示的百分比，仅Decimal时有效
+ * @event {Function} click 点击图标时触发
+ * @example <u-icon name="photo" color="#2979ff" size="28"></u-icon>
+ */
+export default {
+	name: "u-icon",
+	emits: ["click", "touchstart"],
+	props: {
+		// 图标类名
+		name: {
+			type: String,
+			default: ""
+		},
+		// 图标颜色，可接受主题色
+		color: {
+			type: String,
+			default: ""
+		},
+		// 字体大小，单位rpx
+		size: {
+			type: [Number, String],
+			default: "inherit"
+		},
+		// 是否显示粗体
+		bold: {
+			type: Boolean,
+			default: false
+		},
+		// 点击图标的时候传递事件出去的index（用于区分点击了哪一个）
+		index: {
+			type: [Number, String],
+			default: ""
+		},
+		// 触摸图标时的类名
+		hoverClass: {
+			type: String,
+			default: ""
+		},
+		// 自定义扩展前缀，方便用户扩展自己的图标库
+		customPrefix: {
+			type: String,
+			default: "uicon"
+		},
+		// 图标右边或者下面的文字
+		label: {
+			type: [String, Number],
+			default: ""
+		},
+		// label的位置，只能右边或者下边
+		labelPos: {
+			type: String,
+			default: "right"
+		},
+		// label的大小
+		labelSize: {
+			type: [String, Number],
+			default: "28"
+		},
+		// label的颜色
+		labelColor: {
+			type: String,
+			default: "#606266"
+		},
+		// label与图标的距离(横向排列)
+		marginLeft: {
+			type: [String, Number],
+			default: "6"
+		},
+		// label与图标的距离(竖向排列)
+		marginTop: {
+			type: [String, Number],
+			default: "6"
+		},
+		// label与图标的距离(竖向排列)
+		marginRight: {
+			type: [String, Number],
+			default: "6"
+		},
+		// label与图标的距离(竖向排列)
+		marginBottom: {
+			type: [String, Number],
+			default: "6"
+		},
+		// 图片的mode
+		imgMode: {
+			type: String,
+			default: "widthFix"
+		},
+		// 自定义样式
+		customStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 用于显示图片小图标时，图片的宽度
+		width: {
+			type: [String, Number],
+			default: ""
+		},
+		// 用于显示图片小图标时，图片的高度
+		height: {
+			type: [String, Number],
+			default: ""
+		},
+		// 用于解决某些情况下，让图标垂直居中的用途
+		top: {
+			type: [String, Number],
+			default: 0
+		},
+		// 是否为DecimalIcon
+		showDecimalIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 背景颜色，可接受主题色，仅Decimal时有效
+		inactiveColor: {
+			type: String,
+			default: "#ececec"
+		},
+		// 显示的百分比，仅Decimal时有效
+		percent: {
+			type: [Number, String],
+			default: "50"
+		}
+	},
+	computed: {
+		customClass() {
+			let classes = [];
+			let { customPrefix, name } = this;
+			let index = name.indexOf("-icon-");
+			if (index > -1) {
+				customPrefix = name.substring(0, index + 5);
+				classes.push(name);
+			} else {
+				classes.push(`${customPrefix}-${name}`);
+			}
+			// uView的自定义图标类名为u-iconfont
+			if (customPrefix === "uicon") {
+				classes.push("u-iconfont");
+			} else {
+				classes.push(customPrefix);
+			}
+			// 主题色，通过类配置
+			if (
+				this.showDecimalIcon &&
+				this.inactiveColor &&
+				this.$u.config.type.includes(this.inactiveColor)
+			) {
+				classes.push("u-icon__icon--" + this.inactiveColor);
+			} else if (this.color && this.$u.config.type.includes(this.color))
+				classes.push("u-icon__icon--" + this.color);
+			// 阿里，头条，百度小程序通过数组绑定类名时，无法直接使用[a, b, c]的形式，否则无法识别
+			// 故需将其拆成一个字符串的形式，通过空格隔开各个类名
+			//#ifdef MP-ALIPAY || MP-TOUTIAO || MP-BAIDU
+			classes = classes.join(" ");
+			//#endif
+			return classes;
+		},
+		iconStyle() {
+			let style = {};
+			style = {
+				fontSize: this.size == "inherit" ? "inherit" : this.$u.addUnit(this.size),
+				fontWeight: this.bold ? "bold" : "normal",
+				// 某些特殊情况需要设置一个到顶部的距离，才能更好的垂直居中
+				top: this.$u.addUnit(this.top)
+			};
+			// 非主题色值时，才当作颜色值
+			if (
+				this.showDecimalIcon &&
+				this.inactiveColor &&
+				!this.$u.config.type.includes(this.inactiveColor)
+			) {
+				style.color = this.inactiveColor;
+			} else if (this.color && !this.$u.config.type.includes(this.color)) style.color = this.color;
+
+			return style;
+		},
+		// 判断传入的name属性，是否图片路径，只要带有"/"均认为是图片形式
+		isImg() {
+			return this.name.indexOf("/") !== -1;
+		},
+		imgStyle() {
+			let style = {};
+			// 如果设置width和height属性，则优先使用，否则使用size属性
+			style.width = this.width ? this.$u.addUnit(this.width) : this.$u.addUnit(this.size);
+			style.height = this.height ? this.$u.addUnit(this.height) : this.$u.addUnit(this.size);
+			return style;
+		},
+		decimalIconStyle() {
+			let style = {};
+			style = {
+				fontSize: this.size == "inherit" ? "inherit" : this.$u.addUnit(this.size),
+				fontWeight: this.bold ? "bold" : "normal",
+				// 某些特殊情况需要设置一个到顶部的距离，才能更好的垂直居中
+				top: this.$u.addUnit(this.top),
+				width: this.percent + "%"
+			};
+			// 非主题色值时，才当作颜色值
+			if (this.color && !this.$u.config.type.includes(this.color)) style.color = this.color;
+			return style;
+		},
+		decimalIconClass() {
+			let classes = [];
+			classes.push(this.customPrefix + "-" + this.name);
+			// uView的自定义图标类名为u-iconfont
+			if (this.customPrefix == "uicon") {
+				classes.push("u-iconfont");
+			} else {
+				classes.push(this.customPrefix);
+			}
+			// 主题色，通过类配置
+			if (this.color && this.$u.config.type.includes(this.color))
+				classes.push("u-icon__icon--" + this.color);
+			else classes.push("u-icon__icon--primary");
+			// 阿里，头条，百度小程序通过数组绑定类名时，无法直接使用[a, b, c]的形式，否则无法识别
+			// 故需将其拆成一个字符串的形式，通过空格隔开各个类名
+			//#ifdef MP-ALIPAY || MP-TOUTIAO || MP-BAIDU
+			classes = classes.join(" ");
+			//#endif
+			return classes;
+		}
+	},
+	methods: {
+		click() {
+			this.$emit("click", this.index);
+		},
+		touchstart() {
+			this.$emit("touchstart", this.index);
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../libs/css/style.components.scss";
+@import "../../iconfont.css";
+
+.u-icon {
+	display: inline-flex;
+	align-items: center;
+
+	&--left {
+		flex-direction: row-reverse;
+		align-items: center;
+	}
+
+	&--right {
+		flex-direction: row;
+		align-items: center;
+	}
+
+	&--top {
+		flex-direction: column-reverse;
+		justify-content: center;
+	}
+
+	&--bottom {
+		flex-direction: column;
+		justify-content: center;
+	}
+
+	&__icon {
+		position: relative;
+
+		&--primary {
+			color: $u-type-primary;
+		}
+
+		&--success {
+			color: $u-type-success;
+		}
+
+		&--error {
+			color: $u-type-error;
+		}
+
+		&--warning {
+			color: $u-type-warning;
+		}
+
+		&--info {
+			color: $u-type-info;
+		}
+	}
+
+	&__decimal {
+		position: absolute;
+		top: 0;
+		left: 0;
+		display: inline-block;
+		overflow: hidden;
+	}
+
+	&__img {
+		height: auto;
+		will-change: transform;
+	}
+
+	&__label {
+		line-height: 1;
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-image/u-image.vue b/uni_modules/vk-uview-ui/components/u-image/u-image.vue
new file mode 100644
index 0000000..a90adbc
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-image/u-image.vue
@@ -0,0 +1,269 @@
+<template>
+	<view class="u-image" @tap="onClick" :style="[wrapStyle, backgroundStyle]">
+		<image
+			v-if="!isError"
+			:src="src"
+			:mode="mode"
+			@error="onErrorHandler"
+			@load="onLoadHandler"
+			:lazy-load="lazyLoad"
+			class="u-image__image"
+			:show-menu-by-longpress="showMenuByLongpress"
+			:style="{
+				borderRadius: shape == 'circle' ? '50%' : $u.addUnit(borderRadius)
+			}"
+		></image>
+		<view
+			v-if="showLoading && loading"
+			class="u-image__loading"
+			:style="{
+				borderRadius: shape == 'circle' ? '50%' : $u.addUnit(borderRadius),
+				backgroundColor: bgColor
+			}"
+		>
+			<slot v-if="$slots.loading" name="loading" />
+			<u-icon v-else :name="loadingIcon" :width="width" :height="height"></u-icon>
+		</view>
+		<view
+			v-if="showError && isError && !loading"
+			class="u-image__error"
+			:style="{
+				borderRadius: shape == 'circle' ? '50%' : $u.addUnit(borderRadius)
+			}"
+		>
+			<slot v-if="$slots.error" name="error" />
+			<u-icon v-else :name="errorIcon" :width="width" :height="height"></u-icon>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * Image 图片
+ * @description 此组件为uni-app的image组件的加强版，在继承了原有功能外，还支持淡入动画、加载中、加载失败提示、圆角值和形状等。
+ * @tutorial https://uviewui.com/components/image.html
+ * @property {String} src 图片地址
+ * @property {String} mode 裁剪模式，见官网说明
+ * @property {String | Number} width 宽度，单位任意，如果为数值，则为rpx单位（默认100%）
+ * @property {String | Number} height 高度，单位任意，如果为数值，则为rpx单位（默认 auto）
+ * @property {String} shape 图片形状，circle-圆形，square-方形（默认square）
+ * @property {String | Number} border-radius 圆角值，单位任意，如果为数值，则为rpx单位（默认 0）
+ * @property {Boolean} lazy-load 是否懒加载，仅微信小程序、App、百度小程序、字节跳动小程序有效（默认 true）
+ * @property {Boolean} show-menu-by-longpress 是否开启长按图片显示识别小程序码菜单，仅微信小程序有效（默认 false）
+ * @property {String} loading-icon 加载中的图标，或者小图片（默认 photo）
+ * @property {String} error-icon 加载失败的图标，或者小图片（默认 error-circle）
+ * @property {Boolean} show-loading 是否显示加载中的图标或者自定义的slot（默认 true）
+ * @property {Boolean} show-error 是否显示加载错误的图标或者自定义的slot（默认 true）
+ * @property {Boolean} fade 是否需要淡入效果（默认 true）
+ * @property {String Number} width 传入图片路径时图片的宽度
+ * @property {String Number} height 传入图片路径时图片的高度
+ * @property {Boolean} webp 只支持网络资源，只对微信小程序有效（默认 false）
+ * @property {String | Number} duration 搭配fade参数的过渡时间，单位ms（默认 500）
+ * @event {Function} click 点击图片时触发
+ * @event {Function} error 图片加载失败时触发
+ * @event {Function} load 图片加载成功时触发
+ * @example <u-image width="100%" height="300rpx" :src="src"></u-image>
+ */
+export default {
+	name: 'u-image',
+  emits: ["click", "error", "load"],
+	props: {
+		// 图片地址
+		src: {
+			type: String,
+			default: ''
+		},
+		// 裁剪模式
+		mode: {
+			type: String,
+			default: 'aspectFill'
+		},
+		// 宽度，单位任意
+		width: {
+			type: [String, Number],
+			default: '100%'
+		},
+		// 高度，单位任意
+		height: {
+			type: [String, Number],
+			default: 'auto'
+		},
+		// 图片形状，circle-圆形，square-方形
+		shape: {
+			type: String,
+			default: 'square'
+		},
+		// 圆角，单位任意
+		borderRadius: {
+			type: [String, Number],
+			default: 0
+		},
+		// 是否懒加载，微信小程序、App、百度小程序、字节跳动小程序
+		lazyLoad: {
+			type: Boolean,
+			default: true
+		},
+		// 开启长按图片显示识别微信小程序码菜单
+		showMenuByLongpress: {
+			type: Boolean,
+			default: true
+		},
+		// 加载中的图标，或者小图片
+		loadingIcon: {
+			type: String,
+			default: 'photo'
+		},
+		// 加载失败的图标，或者小图片
+		errorIcon: {
+			type: String,
+			default: 'error-circle'
+		},
+		// 是否显示加载中的图标或者自定义的slot
+		showLoading: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示加载错误的图标或者自定义的slot
+		showError: {
+			type: Boolean,
+			default: true
+		},
+		// 是否需要淡入效果
+		fade: {
+			type: Boolean,
+			default: true
+		},
+		// 只支持网络资源，只对微信小程序有效
+		webp: {
+			type: Boolean,
+			default: false
+		},
+		// 过渡时间，单位ms
+		duration: {
+			type: [String, Number],
+			default: 500
+		},
+		// 背景颜色，用于深色页面加载图片时，为了和背景色融合
+		bgColor: {
+			type: String,
+			default: '#f3f4f6'
+		}
+	},
+	data() {
+		return {
+			// 图片是否加载错误，如果是，则显示错误占位图
+			isError: false,
+			// 初始化组件时，默认为加载中状态
+			loading: true,
+			// 不透明度，为了实现淡入淡出的效果
+			opacity: 1,
+			// 过渡时间，因为props的值无法修改，故需要一个中间值
+			durationTime: this.duration,
+			// 图片加载完成时，去掉背景颜色，因为如果是png图片，就会显示灰色的背景
+			backgroundStyle: {}
+		};
+	},
+	watch: {
+		src: {
+			immediate: true,
+			handler (n) {
+				if(!n) {
+					// 如果传入null或者''，或者false，或者undefined，标记为错误状态
+					this.isError = true;
+					this.loading = false;
+				} else {
+					this.isError = false;
+					this.loading = true;
+				}
+			}
+		}
+	},
+	computed: {
+		wrapStyle() {
+			let style = {};
+			// 通过调用addUnit()方法，如果有单位，如百分比，px单位等，直接返回，如果是纯粹的数值，则加上rpx单位
+			style.width = this.$u.addUnit(this.width);
+			style.height = this.$u.addUnit(this.height);
+			// 如果是配置了圆形，设置50%的圆角，否则按照默认的配置值
+			style.borderRadius = this.shape == 'circle' ? '50%' : this.$u.addUnit(this.borderRadius);
+			// 如果设置圆角，必须要有hidden，否则可能圆角无效
+			style.overflow = this.borderRadius > 0 ? 'hidden' : 'visible';
+			if (this.fade) {
+				style.opacity = this.opacity;
+				style.transition = `opacity ${Number(this.durationTime) / 1000}s ease-in-out`;
+			}
+			return style;
+		}
+	},
+	methods: {
+		// 点击图片
+		onClick() {
+			this.$emit('click');
+		},
+		// 图片加载失败
+		onErrorHandler(err) {
+			this.loading = false;
+			this.isError = true;
+			this.$emit('error', err);
+		},
+		// 图片加载完成，标记loading结束
+		onLoadHandler() {
+			this.loading = false;
+			this.isError = false;
+			this.$emit('load');
+			// 如果不需要动画效果，就不执行下方代码，同时移除加载时的背景颜色
+			// 否则无需fade效果时，png图片依然能看到下方的背景色
+			if (!this.fade) return this.removeBgColor();
+			// 原来opacity为1(不透明，是为了显示占位图)，改成0(透明，意味着该元素显示的是背景颜色，默认的灰色)，再改成1，是为了获得过渡效果
+			this.opacity = 0;
+			// 这里设置为0，是为了图片展示到背景全透明这个过程时间为0，延时之后延时之后重新设置为duration，是为了获得背景透明(灰色)
+			// 到图片展示的过程中的淡入效果
+			this.durationTime = 0;
+			// 延时50ms，否则在浏览器H5，过渡效果无效
+			setTimeout(() => {
+				this.durationTime = this.duration;
+				this.opacity = 1;
+				setTimeout(() => {
+					this.removeBgColor();
+				}, this.durationTime);
+			}, 50);
+		},
+		// 移除图片的背景色
+		removeBgColor() {
+			// 淡入动画过渡完成后，将背景设置为透明色，否则png图片会看到灰色的背景
+			this.backgroundStyle = {
+				backgroundColor: 'transparent'
+			};
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import '../../libs/css/style.components.scss';
+
+.u-image {
+	position: relative;
+	transition: opacity 0.5s ease-in-out;
+
+	&__image {
+		width: 100%;
+		height: 100%;
+	}
+
+	&__loading,
+	&__error {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		background-color: $u-bg-color;
+		color: $u-tips-color;
+		font-size: 46rpx;
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-index-anchor/u-index-anchor.vue b/uni_modules/vk-uview-ui/components/u-index-anchor/u-index-anchor.vue
new file mode 100644
index 0000000..5038827
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-index-anchor/u-index-anchor.vue
@@ -0,0 +1,89 @@
+<template>
+	<!-- 支付宝小程序使用$u.getRect()获取组件的根元素尺寸，所以在外面套一个"壳" -->
+	<view>
+		<view class="u-index-anchor-wrapper" :id="$u.guid()" :style="[wrapperStyle]">
+			<view class="u-index-anchor " :class="[active ? 'u-index-anchor--active' : '']" :style="[customAnchorStyle]">
+				<slot v-if="useSlot" />
+				<block v-else>
+					<text>{{ index }}</text>
+				</block>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * indexAnchor 索引列表锚点
+	 * @description 通过折叠面板收纳内容区域,搭配<u-index-anchor>使用
+	 * @tutorial https://www.uviewui.com/components/indexList.html#indexanchor-props
+	 * @property {Boolean} use-slot 是否使用自定义内容的插槽（默认false）
+	 * @property {String Number} index 索引字符，如果定义了use-slot，此参数自动失效
+	 * @property {Object} custStyle 自定义样式，对象形式，如"{color: 'red'}"
+	 * @event {Function} default 锚点位置显示内容，默认为索引字符
+	 * @example <u-index-anchor :index="item" />
+	 */
+	export default {
+		name: "u-index-anchor",
+		props: {
+			useSlot: {
+				type: Boolean,
+				default: false
+			},
+			index: {
+				type: String,
+				default: ''
+			},
+			customStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				active: false,
+				wrapperStyle: {},
+				anchorStyle: {}
+			}
+		},
+		created() {
+			this.parent = false;
+		},
+		mounted() {
+			this.parent = this.$u.$parent.call(this, 'u-index-list');
+			if(this.parent) {
+				this.parent.children.push(this);
+				this.parent.updateData();
+			}
+		},
+		computed: {
+			customAnchorStyle() {
+				return Object.assign(this.anchorStyle, this.customStyle);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-index-anchor {
+		box-sizing: border-box;
+		padding: 14rpx 24rpx;
+		color: #606266;
+		width: 100%;
+		font-weight: 500;
+		font-size: 28rpx;
+		line-height: 1.2;
+		background-color: rgb(245, 245, 245);
+	}
+
+	.u-index-anchor--active {
+		right: 0;
+		left: 0;
+		color: #2979ff;
+		background-color: #fff;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-index-list/u-index-list.vue b/uni_modules/vk-uview-ui/components/u-index-list/u-index-list.vue
new file mode 100644
index 0000000..30fcda0
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-index-list/u-index-list.vue
@@ -0,0 +1,315 @@
+<template>
+	<!-- 支付宝小程序使用$u.getRect()获取组件的根元素尺寸，所以在外面套一个"壳" -->
+	<view>
+		<view class="u-index-bar">
+			<slot />
+			<view v-if="showSidebar" class="u-index-bar__sidebar" @touchstart.stop.prevent="onTouchMove" @touchmove.stop.prevent="onTouchMove"
+			 @touchend.stop.prevent="onTouchStop" @touchcancel.stop.prevent="onTouchStop">
+				<view v-for="(item, index) in indexList" :key="index" class="u-index-bar__index" :style="{zIndex: zIndex + 1, color: activeAnchorIndex === index ? activeColor : ''}"
+				 :data-index="index">
+					{{ item }}
+				</view>
+			</view>
+			<view class="u-indexed-list-alert" v-if="touchmove && indexList[touchmoveIndex]" :style="{
+				zIndex: alertZIndex
+			}">
+				<text>{{indexList[touchmoveIndex]}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	var indexList = function() {
+		var indexList = [];
+		var charCodeOfA = 'A'.charCodeAt(0);
+		for (var i = 0; i < 26; i++) {
+			indexList.push(String.fromCharCode(charCodeOfA + i));
+		}
+		return indexList;
+	};
+
+	/**
+	 * indexList 索引列表
+	 * @description 通过折叠面板收纳内容区域,搭配<u-index-anchor>使用
+	 * @tutorial https://www.uviewui.com/components/indexList.html#indexanchor-props
+	 * @property {Number String} scroll-top 当前滚动高度，自定义组件无法获得滚动条事件，所以依赖接入方传入
+	 * @property {Array} index-list 索引字符列表，数组（默认A-Z）
+	 * @property {Number String} z-index 锚点吸顶时的层级（默认965）
+	 * @property {Boolean} sticky 是否开启锚点自动吸顶（默认true）
+	 * @property {Number String} offset-top 锚点自动吸顶时与顶部的距离（默认0）
+	 * @property {String} highlight-color 锚点和右边索引字符高亮颜色（默认#2979ff）
+	 * @event {Function} select 选中右边索引字符时触发
+	 * @example <u-index-list :scrollTop="scrollTop"></u-index-list>
+	 */
+	export default {
+		name: "u-index-list",
+		props: {
+			sticky: {
+				type: Boolean,
+				default: true
+			},
+			zIndex: {
+				type: [Number, String],
+				default: ''
+			},
+			scrollTop: {
+				type: [Number, String],
+				default: 0,
+			},
+			offsetTop: {
+				type: [Number, String],
+				default: 0
+			},
+			indexList: {
+				type: Array,
+				default () {
+					return indexList()
+				}
+			},
+			activeColor: {
+				type: String,
+				default: '#2979ff'
+			}
+		},
+		created() {
+			// #ifdef H5
+			this.stickyOffsetTop = this.offsetTop ? uni.upx2px(this.offsetTop) : 44;
+			// #endif
+			// #ifndef H5
+			this.stickyOffsetTop = this.offsetTop ? uni.upx2px(this.offsetTop) : 0;
+			// #endif
+			// 只能在created生命周期定义children，如果在data定义，会因为循环引用而报错
+			this.children = [];
+		},
+		data() {
+			return {
+				activeAnchorIndex: 0,
+				showSidebar: true,
+				// children: [],
+				touchmove: false,
+				touchmoveIndex: 0,
+			}
+		},
+		watch: {
+			scrollTop() {
+				this.updateData()
+			}
+		},
+		computed: {
+			// 弹出toast的z-index值
+			alertZIndex() {
+				return this.$u.zIndex.toast;
+			}
+		},
+		methods: {
+			updateData() {
+				this.timer && clearTimeout(this.timer);
+				this.timer = setTimeout(() => {
+					this.showSidebar = !!this.children.length;
+					this.setRect().then(() => {
+						this.onScroll();
+					});
+				}, 0);
+			},
+			setRect() {
+				return Promise.all([
+					this.setAnchorsRect(),
+					this.setListRect(),
+					this.setSiderbarRect()
+				]);
+			},
+			setAnchorsRect() {
+				return Promise.all(this.children.map((anchor, index) => anchor
+					.$uGetRect('.u-index-anchor-wrapper')
+					.then((rect) => {
+						Object.assign(anchor, {
+							height: rect.height,
+							top: rect.top
+						});
+					})));
+			},
+			setListRect() {
+				return this.$uGetRect('.u-index-bar').then((rect) => {
+					Object.assign(this, {
+						height: rect.height,
+						top: rect.top + this.scrollTop
+					});
+				});
+			},
+			setSiderbarRect() {
+				return this.$uGetRect('.u-index-bar__sidebar').then(rect => {
+					this.sidebar = {
+						height: rect.height,
+						top: rect.top
+					};
+				});
+			},
+			getActiveAnchorIndex() {
+				const {
+					children
+				} = this;
+				const {
+					sticky
+				} = this;
+				for (let i = this.children.length - 1; i >= 0; i--) {
+					const preAnchorHeight = i > 0 ? children[i - 1].height : 0;
+					const reachTop = sticky ? preAnchorHeight : 0;
+					if (reachTop >= children[i].top) {
+						return i;
+					}
+				}
+				return -1;
+			},
+			onScroll() {
+				const {
+					children = []
+				} = this;
+				if (!children.length) {
+					return;
+				}
+				const {
+					sticky,
+					stickyOffsetTop,
+					zIndex,
+					scrollTop,
+					activeColor
+				} = this;
+				const active = this.getActiveAnchorIndex();
+				this.activeAnchorIndex = active;
+				if (sticky) {
+					let isActiveAnchorSticky = false;
+					if (active !== -1) {
+						isActiveAnchorSticky =
+							children[active].top <= 0;
+					}
+					children.forEach((item, index) => {
+						if (index === active) {
+							let wrapperStyle = '';
+							let anchorStyle = {
+								color: `${activeColor}`
+							};
+							if (isActiveAnchorSticky) {
+								wrapperStyle = {
+									height: `${children[index].height}px`
+								};
+								anchorStyle = {
+									position: 'fixed',
+									top: `${stickyOffsetTop}px`,
+									zIndex: `${zIndex ? zIndex : this.$u.zIndex.indexListSticky}`,
+									color: `${activeColor}`
+								};
+							}
+							item.active = active;
+							item.wrapperStyle = wrapperStyle;
+							item.anchorStyle = anchorStyle;
+						} else if (index === active - 1) {
+							const currentAnchor = children[index];
+							const currentOffsetTop = currentAnchor.top;
+							const targetOffsetTop = index === children.length - 1 ?
+								this.top :
+								children[index + 1].top;
+							const parentOffsetHeight = targetOffsetTop - currentOffsetTop;
+							const translateY = parentOffsetHeight - currentAnchor.height;
+							const anchorStyle = {
+								position: 'relative',
+								transform: `translate3d(0, ${translateY}px, 0)`,
+								zIndex: `${zIndex ? zIndex : this.$u.zIndex.indexListSticky}`,
+								color: `${activeColor}`
+							};
+							item.active = active;
+							item.anchorStyle = anchorStyle;
+						} else {
+							item.active = false;
+							item.anchorStyle = '';
+							item.wrapperStyle = '';
+						}
+					});
+				}
+			},
+			onTouchMove(event) {
+				this.touchmove = true;
+				const sidebarLength = this.children.length;
+				const touch = event.touches[0];
+				const itemHeight = this.sidebar.height / sidebarLength;
+				let clientY = 0;
+				clientY = touch.clientY;
+				let index = Math.floor((clientY - this.sidebar.top) / itemHeight);
+				if (index < 0) {
+					index = 0;
+				} else if (index > sidebarLength - 1) {
+					index = sidebarLength - 1;
+				}
+				this.touchmoveIndex = index;
+				this.scrollToAnchor(index);
+			},
+			onTouchStop() {
+				this.touchmove = false;
+				this.scrollToAnchorIndex = null;
+			},
+			scrollToAnchor(index) {
+				if (this.scrollToAnchorIndex === index) {
+					return;
+				}
+				this.scrollToAnchorIndex = index;
+				const anchor = this.children.find((item) => item.index === this.indexList[index]);
+				if (anchor) {
+					this.$emit('select', anchor.index);
+					uni.pageScrollTo({
+						duration: 0,
+						scrollTop: anchor.top + this.scrollTop
+					});
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-index-bar {
+		position: relative
+	}
+
+	.u-index-bar__sidebar {
+		position: fixed;
+		top: 50%;
+		right: 0;
+		@include vue-flex;
+		flex-direction: column;
+		text-align: center;
+		transform: translateY(-50%);
+		user-select: none;
+		z-index: 99;
+	}
+
+	.u-index-bar__index {
+		font-weight: 500;
+		padding: 8rpx 18rpx;
+		font-size: 22rpx;
+		line-height: 1
+	}
+
+	.u-indexed-list-alert {
+		position: fixed;
+		width: 120rpx;
+		height: 120rpx;
+		right: 90rpx;
+		top: 50%;
+		margin-top: -60rpx;
+		border-radius: 24rpx;
+		font-size: 50rpx;
+		color: #fff;
+		background-color: rgba(0, 0, 0, 0.65);
+		@include vue-flex;
+		justify-content: center;
+		align-items: center;
+		padding: 0;
+		z-index: 9999999;
+	}
+
+	.u-indexed-list-alert text {
+		line-height: 50rpx;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-input/u-input.vue b/uni_modules/vk-uview-ui/components/u-input/u-input.vue
new file mode 100644
index 0000000..df0a12f
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-input/u-input.vue
@@ -0,0 +1,460 @@
+<template>
+	<view
+		class="u-input"
+		:class="{
+			'u-input--border': border,
+			'u-input--error': validateState
+		}"
+		:style="{
+			padding: padding ? padding : `0 ${border ? 20 : 0}rpx`,
+			borderColor: borderColor,
+			textAlign: inputAlignCom,
+			backgroundColor: backgroundColor,
+		}"
+		@tap.stop="inputClick"
+	>
+		<textarea
+			v-if="type == 'textarea'"
+			class="u-input__input u-input__textarea"
+			:style="[getStyle]"
+			:value="defaultValue"
+			:placeholder="placeholder"
+			:placeholderStyle="placeholderStyle"
+			:disabled="disabled"
+			:maxlength="inputMaxlength"
+			:fixed="fixed"
+			:focus="focus"
+			:autoHeight="autoHeight"
+			:selection-end="uSelectionEnd"
+			:selection-start="uSelectionStart"
+			:cursor-spacing="getCursorSpacing"
+			:show-confirm-bar="showConfirmbar"
+			:adjust-position="adjustPosition"
+			@input="handleInput"
+			@blur="handleBlur"
+			@focus="onFocus"
+			@confirm="onConfirm"
+		/>
+		<input
+			v-else
+			class="u-input__input"
+			:type="type == 'password' ? 'text' : type"
+			:style="[getStyle]"
+			:value="defaultValue"
+			:password="type == 'password' && !showPassword"
+			:placeholder="placeholder"
+			:placeholderStyle="placeholderStyle"
+			:disabled="disabled || type === 'select'"
+			:maxlength="inputMaxlength"
+			:focus="focus"
+			:confirmType="confirmType"
+			:cursor-spacing="getCursorSpacing"
+			:selection-end="uSelectionEnd"
+			:selection-start="uSelectionStart"
+			:show-confirm-bar="showConfirmbar"
+			:adjust-position="adjustPosition"
+			@focus="onFocus"
+			@blur="handleBlur"
+			@input="handleInput"
+			@confirm="onConfirm"
+		/>
+		<view class="u-input__right-icon u-flex">
+			<view
+				class="u-input__right-icon__clear u-input__right-icon__item"
+				@tap="onClear"
+				v-if="clearableCom && valueCom != '' && focused"
+			>
+				<u-icon size="32" name="close-circle-fill" color="#c0c4cc" />
+			</view>
+			<view
+				class="u-input__right-icon__clear u-input__right-icon__item"
+				v-if="passwordIcon && type == 'password'"
+			>
+				<u-icon
+					size="32"
+					:name="!showPassword ? 'eye' : 'eye-fill'"
+					color="#c0c4cc"
+					@click="showPassword = !showPassword"
+				/>
+			</view>
+			<view
+				class="u-input__right-icon--select u-input__right-icon__item"
+				v-if="type == 'select'"
+				:class="{
+					'u-input__right-icon--select--reverse': selectOpen
+				}"
+			>
+				<u-icon name="arrow-down-fill" size="26" color="#c0c4cc"></u-icon>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import Emitter from "../../libs/util/emitter.js";
+
+/**
+ * input 输入框
+ * @description 此组件为一个输入框，默认没有边框和样式，是专门为配合表单组件u-form而设计的，利用它可以快速实现表单验证，输入内容，下拉选择等功能。
+ * @tutorial http://uviewui.com/components/input.html
+ * @property {String} type 模式选择，见官网说明
+ * @property {Boolean} clearable 是否显示右侧的清除图标(默认true)
+ * @property {} v-model 用于双向绑定输入框的值
+ * @property {String} input-align 输入框文字的对齐方式(默认left)
+ * @property {String} placeholder placeholder显示值(默认 '请输入内容')
+ * @property {Boolean} disabled 是否禁用输入框(默认false)
+ * @property {String Number} maxlength 输入框的最大可输入长度(默认140)
+ * @property {String Number} selection-start 光标起始位置，自动聚焦时有效，需与selection-end搭配使用（默认-1）
+ * @property {String Number} maxlength 光标结束位置，自动聚焦时有效，需与selection-start搭配使用（默认-1）
+ * @property {String Number} cursor-spacing 指定光标与键盘的距离，单位px(默认0)
+ * @property {String} placeholderStyle placeholder的样式，字符串形式，如"color: red;"(默认 "color: #c0c4cc;")
+ * @property {String} confirm-type 设置键盘右下角按钮的文字，仅在type为text时生效(默认done)
+ * @property {Object} custom-style 自定义输入框的样式，对象形式
+ * @property {Boolean} focus 是否自动获得焦点(默认false)
+ * @property {Boolean} fixed 如果type为textarea，且在一个"position:fixed"的区域，需要指明为true(默认false)
+ * @property {Boolean} password-icon type为password时，是否显示右侧的密码查看图标(默认true)
+ * @property {Boolean} border 是否显示边框(默认false)
+ * @property {String} border-color 输入框的边框颜色(默认#dcdfe6)
+ * @property {Boolean} auto-height 是否自动增高输入区域，type为textarea时有效(默认true)
+ * @property {String Number} height 高度，单位rpx(text类型时为70，textarea时为100)
+ * @example <u-input v-model="value" :type="type" :border="border" />
+ */
+export default {
+	name: "u-input",
+	emits: ["update:modelValue", "input", "change", "blur", "focus", "click", "touchstart"],
+	mixins: [Emitter],
+	props: {
+		value: {
+			type: [String, Number],
+			default: ""
+		},
+		modelValue: {
+			type: [String, Number],
+			default: ""
+		},
+		// 输入框的类型，textarea，text，number
+		type: {
+			type: String,
+			default: "text"
+		},
+		inputAlign: {
+			type: String,
+			default: ""
+		},
+		placeholder: {
+			type: String,
+			default: "请输入内容"
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		maxlength: {
+			type: [Number, String],
+			default: 140
+		},
+		placeholderStyle: {
+			type: String,
+			default: "color: #c0c4cc;"
+		},
+		confirmType: {
+			type: String,
+			default: "done"
+		},
+		// 输入框的自定义样式
+		customStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 如果 textarea 是在一个 position:fixed 的区域，需要显示指定属性 fixed 为 true
+		fixed: {
+			type: Boolean,
+			default: false
+		},
+		// 是否自动获得焦点
+		focus: {
+			type: Boolean,
+			default: false
+		},
+		// 密码类型时，是否显示右侧的密码图标
+		passwordIcon: {
+			type: Boolean,
+			default: true
+		},
+		// input|textarea是否显示边框
+		border: {
+			type: Boolean,
+			default: false
+		},
+		// 输入框的边框颜色
+		borderColor: {
+			type: String,
+			default: "#dcdfe6"
+		},
+		autoHeight: {
+			type: Boolean,
+			default: true
+		},
+		// type=select时，旋转右侧的图标，标识当前处于打开还是关闭select的状态
+		// open-打开，close-关闭
+		selectOpen: {
+			type: Boolean,
+			default: false
+		},
+		// 高度，单位rpx
+		height: {
+			type: [Number, String],
+			default: ""
+		},
+		// 是否可清空
+		clearable: {
+			type: [Boolean, String],
+		},
+		// 指定光标与键盘的距离，单位 px
+		cursorSpacing: {
+			type: [Number, String],
+			default: 0
+		},
+		// 光标起始位置，自动聚焦时有效，需与selection-end搭配使用
+		selectionStart: {
+			type: [Number, String],
+			default: -1
+		},
+		// 光标结束位置，自动聚焦时有效，需与selection-start搭配使用
+		selectionEnd: {
+			type: [Number, String],
+			default: -1
+		},
+		// 是否自动去除两端的空格
+		trim: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示键盘上方带有”完成“按钮那一栏
+		showConfirmbar: {
+			type: Boolean,
+			default: true
+		},
+		// 弹出键盘时是否自动调节高度，uni-app默认值是true
+		adjustPosition: {
+			type: Boolean,
+			default: true
+		},
+		// input的背景色
+		backgroundColor: {
+			type: String,
+		},
+		// input的padding
+		padding: {
+			type: String,
+		},
+	},
+	data() {
+		return {
+			defaultValue: "",
+			inputHeight: 70, // input的高度
+			textareaHeight: 100, // textarea的高度
+			validateState: false, // 当前input的验证状态，用于错误时，边框是否改为红色
+			focused: false, // 当前是否处于获得焦点的状态
+			showPassword: false, // 是否预览密码
+			lastValue: "" ,// 用于头条小程序，判断@input中，前后的值是否发生了变化，因为头条中文下，按下键没有输入内容，也会触发@input时间
+			uForm:{
+				inputAlign: "",
+				clearable: ""
+			}
+		};
+	},
+	watch: {
+		valueCom(nVal, oVal) {
+			this.defaultValue = nVal;
+			// 当值发生变化，且为select类型时(此时input被设置为disabled，不会触发@input事件)，模拟触发@input事件
+			if (nVal != oVal && this.type == "select")
+				this.handleInput({
+					detail: {
+						value: nVal
+					}
+				});
+		}
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		inputAlignCom(){
+			return this.inputAlign || this.uForm.inputAlign || "left";
+		},
+		clearableCom(){
+			if (typeof this.clearable == "boolean") return this.clearable;
+			if (typeof this.uForm.clearable == "boolean") return this.uForm.clearable;
+			return true;
+		},
+		// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，给用户可以传入字符串数值
+		inputMaxlength() {
+			return Number(this.maxlength);
+		},
+		getStyle() {
+			let style = {};
+			// 如果没有自定义高度，就根据type为input还是textare来分配一个默认的高度
+			style.minHeight = this.height
+				? this.height + "rpx"
+				: this.type == "textarea"
+				? this.textareaHeight + "rpx"
+				: this.inputHeight + "rpx";
+			style = Object.assign(style, this.customStyle);
+			return style;
+		},
+		//
+		getCursorSpacing() {
+			return Number(this.cursorSpacing);
+		},
+		// 光标起始位置
+		uSelectionStart() {
+			return String(this.selectionStart);
+		},
+		// 光标结束位置
+		uSelectionEnd() {
+			return String(this.selectionEnd);
+		}
+	},
+	created() {
+		// 监听u-form-item发出的错误事件，将输入框边框变红色
+		// #ifndef VUE3
+		this.$on("onFormItemError", this.onFormItemError);
+		// #endif
+		this.defaultValue = this.valueCom;
+	},
+	mounted() {
+		let parent = this.$u.$parent.call(this, 'u-form');
+		if (parent) {
+			Object.keys(this.uForm).map(key => {
+				this.uForm[key] = parent[key];
+			});
+		}
+	},
+	methods: {
+		/**
+		 * change 事件
+		 * @param event
+		 */
+		handleInput(event) {
+			let value = event.detail.value;
+			// 判断是否去除空格
+			if (this.trim) value = this.$u.trim(value);
+			// vue 原生的方法 return 出去
+			this.$emit("input", value);
+			this.$emit("update:modelValue", value);
+			// 当前model 赋值
+			this.defaultValue = value;
+			// 过一个生命周期再发送事件给u-form-item，否则this.$emit('input')更新了父组件的值，但是微信小程序上
+			// 尚未更新到u-form-item，导致获取的值为空，从而校验混论
+			// 这里不能延时时间太短，或者使用this.$nextTick，否则在头条上，会造成混乱
+			setTimeout(() => {
+				// 头条小程序由于自身bug，导致中文下，每按下一个键(尚未完成输入)，都会触发一次@input，导致错误，这里进行判断处理
+				// #ifdef MP-TOUTIAO
+				if (this.$u.trim(value) == this.lastValue) return;
+				this.lastValue = value;
+				// #endif
+				// 将当前的值发送到 u-form-item 进行校验
+				this.dispatch("u-form-item", "onFieldChange", value);
+			}, 40);
+		},
+		/**
+		 * blur 事件
+		 * @param event
+		 */
+		handleBlur(event) {
+			// 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错
+			// 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时
+			setTimeout(() => {
+				this.focused = false;
+			}, 100);
+			// vue 原生的方法 return 出去
+			this.$emit("blur", event.detail.value);
+			setTimeout(() => {
+				// 头条小程序由于自身bug，导致中文下，每按下一个键(尚未完成输入)，都会触发一次@input，导致错误，这里进行判断处理
+				// #ifdef MP-TOUTIAO
+				if (this.$u.trim(value) == this.lastValue) return;
+				this.lastValue = value;
+				// #endif
+				// 将当前的值发送到 u-form-item 进行校验
+				this.dispatch("u-form-item", "onFieldBlur", event.detail.value);
+			}, 40);
+		},
+		onFormItemError(status) {
+			this.validateState = status;
+		},
+		onFocus(event) {
+			this.focused = true;
+			this.$emit("focus");
+		},
+		onConfirm(e) {
+			this.$emit("confirm", e.detail.value);
+		},
+		onClear(event) {
+			this.$emit("input", "");
+			this.$emit("update:modelValue", "");
+		},
+		inputClick() {
+			this.$emit("click");
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-input {
+	position: relative;
+	flex: 1;
+	@include vue-flex;
+
+	&__input {
+		//height: $u-form-item-height;
+		font-size: 28rpx;
+		color: $u-main-color;
+		flex: 1;
+	}
+
+	&__textarea {
+		width: auto;
+		font-size: 28rpx;
+		color: $u-main-color;
+		padding: 10rpx 0;
+		line-height: normal;
+		flex: 1;
+	}
+
+	&--border {
+		border-radius: 6rpx;
+		border-radius: 4px;
+		border: 1px solid $u-form-item-border-color;
+	}
+
+	&--error {
+		border-color: $u-type-error !important;
+	}
+
+	&__right-icon {
+		&__item {
+			margin-left: 10rpx;
+		}
+
+		&--select {
+			transition: transform 0.4s;
+
+			&--reverse {
+				transform: rotate(-180deg);
+			}
+		}
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-keyboard/u-keyboard.vue b/uni_modules/vk-uview-ui/components/u-keyboard/u-keyboard.vue
new file mode 100644
index 0000000..d5aee71
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-keyboard/u-keyboard.vue
@@ -0,0 +1,285 @@
+<template>
+	<u-popup
+		class=""
+		:blur="blur"
+		:mask="mask"
+		:maskCloseAble="maskCloseAble"
+		mode="bottom"
+		:popup="false"
+		v-model="popupValue"
+		length="auto"
+		:safeAreaInsetBottom="safeAreaInsetBottom"
+		@close="popupClose"
+		:zIndex="uZIndex"
+	>
+		<slot />
+		<view class="u-tooltip" v-if="tooltip">
+			<view
+				class="u-tooltip-item u-tooltip-cancel"
+				hover-class="u-tooltip-cancel-hover"
+				@tap="onCancel"
+			>
+				{{ cancelBtn ? cancelText : "" }}
+			</view>
+			<view v-if="showTips" class="u-tooltip-item u-tooltip-tips">
+				{{
+					tips ? tips : mode == "number" ? "数字键盘" : mode == "card" ? "身份证键盘" : "车牌号键盘"
+				}}
+			</view>
+			<view
+				v-if="confirmBtn"
+				@tap="onConfirm"
+				class="u-tooltip-item u-tooltips-submit"
+				hover-class="u-tooltips-submit-hover"
+			>
+				{{ confirmBtn ? confirmText : "" }}
+			</view>
+		</view>
+		<block v-if="mode == 'number' || mode == 'card'">
+			<u-number-keyboard
+				:random="random"
+				@backspace="backspace"
+				@change="change"
+				:mode="mode"
+				:dotEnabled="dotEnabled"
+			></u-number-keyboard>
+		</block>
+		<block v-else>
+			<u-car-keyboard
+				ref="uCarKeyboard"
+				:random="random"
+				@backspace="backspace"
+				@change="change"
+			></u-car-keyboard>
+		</block>
+	</u-popup>
+</template>
+
+<script>
+/**
+ * keyboard 键盘
+ * @description 此为uViw自定义的键盘面板，内含了数字键盘，车牌号键，身份证号键盘3中模式，都有可以打乱按键顺序的选项。
+ * @tutorial https://www.uviewui.com/components/keyboard.html
+ * @property {String} mode 键盘类型，见官网基本使用的说明（默认number）
+ * @property {Boolean} dot-enabled 是否显示"."按键，只在mode=number时有效（默认true）
+ * @property {Boolean} tooltip 是否显示键盘顶部工具条（默认true）
+ * @property {String} tips 工具条中间的提示文字，见上方基本使用的说明，如不需要，请传""空字符
+ * @property {Boolean} cancel-btn 是否显示工具条左边的"取消"按钮（默认true）
+ * @property {Boolean} confirm-btn 是否显示工具条右边的"完成"按钮（默认true）
+ * @property {Boolean} mask 是否显示遮罩（默认true）
+ * @property {String} confirm-text 确认按钮的文字
+ * @property {String} cancel-text 取消按钮的文字
+ * @property {Number String} z-index 弹出键盘的z-index值（默认1075）
+ * @property {Boolean} random 是否打乱键盘按键的顺序（默认false）
+ * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配（默认false）
+ * @property {Boolean} mask-close-able 是否允许点击遮罩收起键盘（默认true）
+ * @event {Function} change 按键被点击(不包含退格键被点击)
+ * @event {Function} cancel 键盘顶部工具条左边的"取消"按钮被点击
+ * @event {Function} confirm 键盘顶部工具条右边的"完成"按钮被点击
+ * @event {Function} backspace 键盘退格键被点击
+ * @example <u-keyboard mode="number" v-model="show"></u-keyboard>
+ */
+export default {
+	name: "u-keyboard",
+	emits: ["update:modelValue", "input", "change", "cancel", "confirm", "backspace"],
+	props: {
+		// 通过双向绑定控制键盘的弹出与收起
+		value: {
+			type: Boolean,
+			default: false
+		},
+		modelValue: {
+			type: Boolean,
+			default: false
+		},
+		// 键盘的类型，number-数字键盘，card-身份证键盘，car-车牌号键盘
+		mode: {
+			type: String,
+			default: "number"
+		},
+
+		// 是否显示键盘的"."符号
+		dotEnabled: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示顶部工具条
+		tooltip: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示工具条中间的提示
+		showTips: {
+			type: Boolean,
+			default: true
+		},
+		// 工具条中间的提示文字
+		tips: {
+			type: String,
+			default: ""
+		},
+		// 是否显示工具条左边的"取消"按钮
+		cancelBtn: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示工具条右边的"完成"按钮
+		confirmBtn: {
+			type: Boolean,
+			default: true
+		},
+		// 是否打乱键盘按键的顺序
+		random: {
+			type: Boolean,
+			default: false
+		},
+		// 是否开启底部安全区适配，开启的话，会在iPhoneX机型底部添加一定的内边距
+		safeAreaInsetBottom: {
+			type: Boolean,
+			default: false
+		},
+		// 是否允许通过点击遮罩关闭键盘
+		maskCloseAble: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示遮罩，某些时候数字键盘时，用户希望看到自己的数值，所以可能不想要遮罩
+		mask: {
+			type: Boolean,
+			default: true
+		},
+		// z-index值
+		zIndex: {
+			type: [Number, String],
+			default: ""
+		},
+		// 取消按钮的文字
+		cancelText: {
+			type: String,
+			default: "取消"
+		},
+		// 确认按钮的文字
+		confirmText: {
+			type: String,
+			default: "确认"
+		},
+		// 遮罩的模糊度
+		blur: {
+			type: [Number, String],
+			default: 0
+		}
+	},
+	data() {
+		return {
+			popupValue: false
+		};
+	},
+	watch: {
+		valueCom:{
+			immediate: true,
+			handler(v1, v2) {
+				this.popupValue = v1;
+			}
+		}
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		uZIndex() {
+			return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+		}
+	},
+	methods: {
+		change(e) {
+			this.$emit("change", e);
+		},
+		// 键盘关闭
+		popupClose() {
+			// 通过发送input这个特殊的事件名，可以修改父组件传给props的value的变量，也即双向绑定
+			this.$emit("input", false);
+			this.$emit("update:modelValue", false);
+		},
+		// 输入完成
+		onConfirm() {
+			this.popupClose();
+			this.$emit("confirm");
+		},
+		// 取消输入
+		onCancel() {
+			this.popupClose();
+			this.$emit("cancel");
+		},
+		// 退格键
+		backspace(count) {
+			this.$emit("backspace", count);
+		},
+		changeCarInputMode() {
+			if (this.$refs.uCarKeyboard) this.$refs.uCarKeyboard.changeCarInputMode();
+		},
+		updateCarInputMode(abcKey) {
+			if (this.$refs.uCarKeyboard) this.$refs.uCarKeyboard.updateCarInputMode(abcKey);
+		}
+		// 关闭键盘
+		// close() {
+		// 	this.show = false;
+		// },
+		// // 打开键盘
+		// open() {
+		// 	this.show = true;
+		// }
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-keyboard {
+	position: relative;
+	z-index: 1003;
+}
+
+.u-tooltip {
+	@include vue-flex;
+	justify-content: space-between;
+}
+
+.u-tooltip-item {
+	color: #333333;
+	flex: 0 0 33.333333%;
+	text-align: center;
+	padding: 20rpx 10rpx;
+	font-size: 28rpx;
+}
+
+.u-tooltips-submit {
+	text-align: right;
+	flex-grow: 1;
+	flex-wrap: 0;
+	padding-right: 40rpx;
+	color: $u-type-primary;
+}
+
+.u-tooltip-cancel {
+	text-align: left;
+	flex-grow: 1;
+	flex-wrap: 0;
+	padding-left: 40rpx;
+	color: #888888;
+}
+
+.u-tooltips-submit-hover {
+	color: $u-type-success;
+}
+
+.u-tooltip-cancel-hover {
+	color: #333333;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-lazy-load/u-lazy-load.vue b/uni_modules/vk-uview-ui/components/u-lazy-load/u-lazy-load.vue
new file mode 100644
index 0000000..f872922
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-lazy-load/u-lazy-load.vue
@@ -0,0 +1,254 @@
+<template>
+	<view class="u-wrap" :style="{
+			  opacity: Number(opacity),
+			  borderRadius: borderRadius + 'rpx',
+			  // 因为time值需要改变,所以不直接用duration值(不能改变父组件prop传过来的值)
+			  transition: `opacity ${time / 1000}s ease-in-out`
+		   }"
+	 :class="'u-lazy-item-' + elIndex">
+		<view :class="'u-lazy-item-' + elIndex">
+			<image :style="{borderRadius: borderRadius + 'rpx', height: imgHeight}" v-if="!isError" class="u-lazy-item"
+			 :src="isShow ? image : loadingImg" :mode="imgMode" @load="imgLoaded" @error="loadError" @tap="clickImg"></image>
+			<image :style="{borderRadius: borderRadius + 'rpx', height: imgHeight}" class="u-lazy-item error" v-else :src="errorImg"
+			 :mode="imgMode" @load="errorImgLoaded" @tap="clickImg"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * lazyLoad 懒加载
+	 * @description 懒加载使用的场景为：页面有很多图片时，APP会同时加载所有的图片，导致页面卡顿，各个位置的图片出现前后不一致等.
+	 * @tutorial https://www.uviewui.com/components/lazyLoad.html
+	 * @property {String Number} index 用户自定义值，在事件触发时回调，用以区分是哪个图片
+	 * @property {String} image 图片路径
+	 * @property {String} loading-img 预加载时的占位图
+	 * @property {String} error-img 图片加载出错时的占位图
+	 * @property {String} threshold 触发加载时的位置，见上方说明，单位 rpx（默认300）
+	 * @property {String Number} duration 图片加载成功时，淡入淡出时间，单位ms（默认）
+	 * @property {String} effect 图片加载成功时，淡入淡出的css动画效果（默认ease-in-out）
+	 * @property {Boolean} is-effect 图片加载成功时，是否启用淡入淡出效果（默认true）
+	 * @property {String Number} border-radius 图片圆角值，单位rpx（默认0）
+	 * @property {String Number} height 图片高度，注意：实际高度可能受img-mode参数影响（默认450）
+	 * @property {String Number} mg-mode 图片的裁剪模式，详见image组件裁剪模式（默认widthFix）
+	 * @event {Function} click 点击图片时触发
+	 * @event {Function} load 图片加载成功时触发
+	 * @event {Function} error 图片加载失败时触发
+	 * @example <u-lazy-load :image="image" :loading-img="loadingImg" :error-img="errorImg"></u-lazy-load>
+	 */
+	export default {
+		name: 'u-lazy-load',
+    emits: ["click", "load", "error"],
+		props: {
+			index: {
+				type: [Number, String]
+			},
+			// 要显示的图片
+			image: {
+				type: String,
+				default: ''
+			},
+			// 图片裁剪模式
+			imgMode: {
+				type: String,
+				default: 'widthFix'
+			},
+			// 占位图片路径
+			loadingImg: {
+				type: String,
+				default: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAGQCAMAAAC3Ycb+AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OUM0QjNBQjkyQUQ2MTFFQTlCNUQ4RTIzNDE5RUIxNjciIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OUM0QjNBQkEyQUQ2MTFFQTlCNUQ4RTIzNDE5RUIxNjciPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo5QzRCM0FCNzJBRDYxMUVBOUI1RDhFMjM0MTlFQjE2NyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo5QzRCM0FCODJBRDYxMUVBOUI1RDhFMjM0MTlFQjE2NyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PtRHfPcAAAAzUExURZWVldfX18PDw62trZubm9zc3Li4uKGhoebm5tLS0uHh4c3Nzaenp729vcjIyLKysuvr6141L40AAAcXSURBVHja7NzZlqpGAEBR5lG0//9rIw7IJKJi4or7PGTdtN10wr5SVAEGf/qqArsAiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAg+nmQFMi5Jis+sIniED23jSzIgLTtg2D//iYme/8QBM/9lQ+CAEhbNLM3N9hEHAThX7GPCiBfAxK1b51kD+R7QMLjXg7iCsgWIPUh7pfVozG791oeBPngm48G583uW5GkBvI+SBaM2xXDn1oqum423bX/mgF5FySc2cv93Voug9TdZotsggnkBZB2NzbhrSY5HnoG07jei8dvzsJB/c3W60SALILE46+WCztsbhPR7R2VJq0ukEcT49nyy8QhaKcRa3fYHZD4+ufqOJAcgDz8/59vtw1I3QP5K6JsOG0vm3hce4I8LQp/BaRZGJC3AAn7IKOKXbC+7EdA5vdmmVwOLksgRThqOqiH4XEGsht+peoPUE8U/jJIO5OLH4GEwUslV5G0PTBG5Uiw/Y2jyigO3l9HAHKv9PYb82LloH74dZBoBUgar+l48NsNvtD0fkez9iwrAvIYZDRCl+Xs149Hm/KZmQ+QjUCiO1ei4ru7EsgnQYrkznlQb7thCuRfAzlOAPN72427P4VA/i2Q/DKT/Ls/VR8fvIBsDZIuz7TPF6TCbnk4GJkB2RokejTjuE7/unlgCuSTIO0Cy+Plp6vDfnQlBchy8QtjSHVd3EgmK1bHLm+H6+nXYbz2DuQRSPnqoL7vvq0u70on4zvxgCyWD3b9UyDVdW24PaWaiGTnFZJwPIQAebDpIKheBIm7n124ZthMJipAlkqHO+IZkP1tbfzOJark/A7MgKyvvl60fRqkvXfhuow+t9+q00+0/yyBrK8ZngOtBzldhw2X9tvpNGty0gvkmbPeJ0Cy/r09s/stbmfo0yMWkEdjevgKyOn2t2pxv7UXoibTdCDLje9/Ww1ymqzn87dbp92242ZmMRjI8hASvwKSLq4udqN6ksw8nxXN3tszD9L8Gkg+2mFrQYql5az4tvFj5xOx4VwnSdeBtGdyPwUytxK77pBVlNHdO7OK3rh/eTPUvdutT3fO52tuHMqD4N7llv8pyOQQ//w19YVDfX27+Sfuby9/6nau4pdA8vEdOZuChEH/quHt0Jg+IRJ/5+PrHwKZXfjbDiS73Zo7mu5UkzX7uTsXe0e/7nC3ePf1O69+BUg2XDfZCqSqOu7rGVf8cHBe8zhC2b61dtUHXv0OkGo6ZL4JkpbRYXdUaFevivx2M/1GIOctNh949TtAoumQ+TpIHMX54CJu+8BDd8FkE5BqcZh/59XvAClmTvKfB0nDqIlHo3T70SftyW1eX9dXtgQJqs1f/Q6QaOa/7wmQKtxH8eiGoCRuovODIO3VxOMmruZbHrLyD7z6DSDtGyT7ew1kf9hNn07c986JTovzzem0Id9wUG+Vk/IDr34DSNR7huZJkMFT6vEhqrPx/j5cnlZML8N6/PAzh9Y99Flm5Yde/c9BquDOkvkKkMP58dA4qi9vivE8JOvGz/j8FokfPpr288+pH2ZPOZrLmeGD+7KOh6dqYWJ48ki7yUg0tz0go/fv/LLddfV3sgOLJyaGPY/zrSlh1a36Arkzoue9CyG35ze6E6/dzO2Ga0EGHqdRJIkfn9/8OEjTW8Vq91ZWh39FeehWA7Nu9ft8CpUEk1WWOyDF0OPyEU2Pnzf/bZC0P6IPzmAvu7KauQBVrgKpJ0tG2arHzX8e5Pb3PezNs/PrX+3JMyCLn9XXf37tPFHvt09WfCDDjx+yyn1/p1V11j7GnB/q3leLuVva79S/tzed+db08YpF4uOZtmz/9oXWMq6BCAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiAALELvqt/BBgACqVeUBXxcCkAAAAASUVORK5CYII='
+			},
+			// 加载失败的错误占位图
+			errorImg: {
+				type: String,
+				default: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAGQCAMAAAC3Ycb+AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ODdDMjhENDYyQUQ2MTFFQTlDQ0VBODgxQjFFOEEyMEMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6ODdDMjhENDcyQUQ2MTFFQTlDQ0VBODgxQjFFOEEyMEMiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo4N0MyOEQ0NDJBRDYxMUVBOUNDRUE4ODFCMUU4QTIwQyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo4N0MyOEQ0NTJBRDYxMUVBOUNDRUE4ODFCMUU4QTIwQyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PhLwhikAAAAzUExURZWVldfX162t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'
+			},
+			// 图片进入可见区域前多少像素时，单位rpx，开始加载图片
+			// 负数为图片超出屏幕底部多少距离后触发懒加载，正数为图片顶部距离屏幕底部多少距离时触发(图片还没出现在屏幕上)
+			threshold: {
+				type: [Number, String],
+				default: 100
+			},
+			// 淡入淡出动画的过渡时间
+			duration: {
+				type: [Number, String],
+				default: 500
+			},
+			// 渡效果的速度曲线，各个之间差别不大，因为这是淡入淡出，且时间很短，不是那些变形或者移动的情况，会明显
+			// linear|ease|ease-in|ease-out|ease-in-out|cubic-bezier(n,n,n,n);
+			effect: {
+				type: String,
+				default: 'ease-in-out'
+			},
+			// 是否使用过渡效果
+			isEffect: {
+				type: Boolean,
+				default: true
+			},
+			// 圆角值
+			borderRadius: {
+				type: [Number, String],
+				default: 0
+			},
+			// 图片高度，单位rpx
+			height: {
+				type: [Number, String],
+				default: '450'
+			}
+		},
+		data() {
+			return {
+				isShow: false,
+				opacity: 1,
+				time: this.duration,
+				loadStatus: '', // 默认是懒加载中的状态
+				isError: false, // 图片加载失败
+				elIndex: this.$u.guid()
+			}
+		},
+		computed: {
+			// 将threshold从rpx转为px
+			getThreshold() {
+				// 先取绝对值，因为threshold可能是负数，最后根据this.threshold是正数或者负数，重新还原
+				let thresholdPx = uni.upx2px(Math.abs(this.threshold));
+				return this.threshold < 0 ? -thresholdPx : thresholdPx;
+			},
+			// 计算图片的高度，可能为auto，带%，或者直接数值
+			imgHeight() {
+				return this.$u.addUnit(this.height);
+			}
+		},
+		created() {
+			// 由于一些特殊原因，不能将此变量放到data中定义
+			this.observer = {};
+		},
+		watch: {
+			isShow(nVal) {
+				// 如果是不开启过渡效果，直接返回
+				if (!this.isEffect) return;
+				this.time = 0;
+				// 原来opacity为1(不透明，是为了显示占位图)，改成0(透明，意味着该元素显示的是背景颜色，默认的白色)，再改成1，是为了获得过渡效果
+				this.opacity = 0;
+				// 延时30ms，否则在浏览器H5，过渡效果无效
+				setTimeout(() => {
+					this.time = this.duration;
+					this.opacity = 1;
+				}, 30)
+			},
+			// 图片路径发生变化时，需要重新标记一些变量，否则会一直卡在某一个状态，比如isError
+			image(n) {
+				if(!n) {
+					// 如果传入null或者''，或者undefined，标记为错误状态
+					this.isError = true;
+				} else {
+					this.init();
+					this.isError = false;
+				}
+			}
+		},
+		methods: {
+			// 用于重新初始化
+			init() {
+				this.isError = false;
+				this.loadStatus = '';
+			},
+			// 点击图片触发的事件,loadlazy-还是懒加载中状态，loading-图片正在加载，loaded-图片加加载完成
+			clickImg() {
+				let whichImg = '';
+				// 如果isShow为false，意味着图片还没开始加载，点击的只能是最开始的占位图
+				if (this.isShow == false) whichImg = 'lazyImg';
+				// 如果isError为true，意味着图片加载失败，这是只剩下错误的占位图，所以点击的只能是错误占位图
+				// 当然，也可以给错误的占位图元素绑定点击事件，看你喜欢~
+				else if (this.isError == true) whichImg = 'errorImg';
+				// 总共三张图片，除了两个占位图，剩下的只能是正常的那张图片了
+				else whichImg = 'realImg';
+				// 只通知当前图片的index
+				this.$emit('click', this.index);
+			},
+			// 图片加载完成事件，可能是加载占位图时触发，也可能是加载真正的图片完成时触发，通过isShow区分
+			imgLoaded() {
+				// 占位图加载完成
+				if (this.loadStatus == '') {
+					this.loadStatus = 'lazyed';
+				}
+				// 真正的图片加载完成 
+				else if (this.loadStatus == 'lazyed') {
+					this.loadStatus = 'loaded';
+					this.$emit('load', this.index);
+				}
+			},
+			// 错误的图片加载完成
+			errorImgLoaded() {
+				this.$emit('error', this.index);
+			},
+			// 图片加载失败
+			loadError() {
+				this.isError = true;
+			},
+			disconnectObserver(observerName) {
+				const observer = this[observerName];
+				observer && observer.disconnect();
+			},
+		},
+    // #ifndef VUE3
+    // 组件销毁前，将实例从u-form的缓存中移除
+    beforeDestroy() {
+      // 销毁页面时，可能还没触发某张很底部的懒加载图片，所以把这个事件给去掉
+      //observer.disconnect();
+    },
+    // #endif
+    
+    // #ifdef VUE3
+    beforeUnmount() {
+      
+    },
+    // #endif
+		mounted() {
+			// 此uOnReachBottom事件由mixin.js发出，目的是让页面到底时，保证所有图片都进行加载，做到绝对稳定且可靠
+			this.$nextTick(() => {
+				uni.$once('uOnReachBottom', () => {
+					if (!this.isShow) this.isShow = true;
+				});
+			})
+			// mounted的时候，不一定挂载了这个元素，延时30ms，否则会报错或者不报错，但是也没有效果
+			setTimeout(() => {
+				// 这里是组件内获取布局状态，不能用uni.createIntersectionObserver，而必须用this.createIntersectionObserver
+				this.disconnectObserver('contentObserver');
+				const contentObserver = uni.createIntersectionObserver(this);
+				// 要理解这里怎么计算的，请看这个：
+				// https://blog.csdn.net/qq_25324335/article/details/83687695
+				contentObserver.relativeToViewport({
+					bottom: this.getThreshold,
+				}).observe('.u-lazy-item-' + this.elIndex, (res) => {
+					if (res.intersectionRatio > 0) {
+						// 懒加载状态改变
+						this.isShow = true;
+						// 如果图片已经加载，去掉监听，减少性能的消耗
+						this.disconnectObserver('contentObserver');
+					}
+				})
+				this.contentObserver = contentObserver;
+			}, 30)
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	
+	.u-wrap {
+		background-color: #eee;
+		overflow: hidden;
+	}
+
+	.u-lazy-item {
+		width: 100%;
+		// 骗系统开启硬件加速
+		transform: transition3d(0, 0, 0);
+		// 防止图片加载“闪一下”
+		will-change: transform;
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-line-progress/u-line-progress.vue b/uni_modules/vk-uview-ui/components/u-line-progress/u-line-progress.vue
new file mode 100644
index 0000000..77e2da2
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-line-progress/u-line-progress.vue
@@ -0,0 +1,147 @@
+<template>
+	<view class="u-progress" :style="{
+		borderRadius: round ? '100rpx' : 0,
+		height: height + 'rpx',
+		backgroundColor: inactiveColor
+	}">
+		<view :class="[
+			type ? `u-type-${type}-bg` : '',
+			striped ? 'u-striped' : '',
+			striped && stripedActive ? 'u-striped-active' : ''
+		]" class="u-active" :style="[progressStyle]">
+			<slot v-if="$slots.default || $slots.$default" />
+			<block v-else-if="showPercent">
+				{{percent + '%'}}
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * lineProgress 线型进度条
+	 * @description 展示操作或任务的当前进度，比如上传文件，是一个线形的进度条。
+	 * @tutorial https://www.uviewui.com/components/lineProgress.html
+	 * @property {String Number} percent 进度条百分比值，为数值类型，0-100
+	 * @property {Boolean} round 进度条两端是否为半圆（默认true）
+	 * @property {String} type 如设置，active-color值将会失效
+	 * @property {String} active-color 进度条激活部分的颜色（默认#19be6b）
+	 * @property {String} inactive-color 进度条的底色（默认#ececec）
+	 * @property {Boolean} show-percent 是否在进度条内部显示当前的百分比值数值（默认true）
+	 * @property {String Number} height 进度条的高度，单位rpx（默认28）
+	 * @property {Boolean} striped 是否显示进度条激活部分的条纹（默认false）
+	 * @property {Boolean} striped-active 条纹是否具有动态效果（默认false）
+	 * @example <u-line-progress :percent="70" :show-percent="true"></u-line-progress>
+	 */
+	export default {
+		name: "u-line-progress",
+		props: {
+			// 两端是否显示半圆形
+			round: {
+				type: Boolean,
+				default: true
+			},
+			// 主题颜色
+			type: {
+				type: String,
+				default: ''
+			},
+			// 激活部分的颜色
+			activeColor: {
+				type: String,
+				default: '#19be6b'
+			},
+			inactiveColor: {
+				type: String,
+				default: '#ececec'
+			},
+			// 进度百分比，数值
+			percent: {
+				type: Number,
+				default: 0
+			},
+			// 是否在进度条内部显示百分比的值
+			showPercent: {
+				type: Boolean,
+				default: true
+			},
+			// 进度条的高度，单位rpx
+			height: {
+				type: [Number, String],
+				default: 28
+			},
+			// 是否显示条纹
+			striped: {
+				type: Boolean,
+				default: false
+			},
+			// 条纹是否显示活动状态
+			stripedActive: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		computed: {
+			progressStyle() {
+				let style = {};
+				style.width = this.percent + '%';
+				if(this.activeColor) style.backgroundColor = this.activeColor;
+				return style;
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-progress {
+		overflow: hidden;
+		height: 15px;
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		align-items: center;
+		width: 100%;
+		border-radius: 100rpx;
+	}
+
+	.u-active {
+		width: 0;
+		height: 100%;
+		align-items: center;
+		@include vue-flex;
+		justify-items: flex-end;
+		justify-content: space-around;
+		font-size: 20rpx;
+		color: #ffffff;
+		transition: all 0.4s ease;
+	}
+
+	.u-striped {
+		background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+		background-size: 39px 39px;
+	}
+
+	.u-striped-active {
+		animation: progress-stripes 2s linear infinite;
+	}
+
+	@keyframes progress-stripes {
+		0% {
+			background-position: 0 0;
+		}
+
+		100% {
+			background-position: 39px 0;
+		}
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-line/u-line.vue b/uni_modules/vk-uview-ui/components/u-line/u-line.vue
new file mode 100644
index 0000000..aecc09c
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-line/u-line.vue
@@ -0,0 +1,84 @@
+<template>
+	<view class="u-line" :style="[lineStyle]">
+		
+	</view>
+</template>
+
+<script>
+	/**
+	 * line 线条
+	 * @description 此组件一般用于显示一根线条，用于分隔内容块，有横向和竖向两种模式，且能设置0.5px线条，使用也很简单
+	 * @tutorial https://www.uviewui.com/components/line.html
+	 * @property {String} color 线条的颜色(默认#e4e7ed)
+	 * @property {String} length 长度，竖向时表现为高度，横向时表现为长度，可以为百分比，带rpx单位的值等
+	 * @property {String} direction 线条的方向，row-横向，col-竖向(默认row)
+	 * @property {String} border-style 线条的类型，solid-实线，dashed-方形虚线，dotted-圆点虚线(默认solid)
+	 * @property {Boolean} hair-line 是否显示细线条(默认true)
+	 * @property {String} margin 线条与上下左右元素的间距，字符串形式，如"30rpx"
+	 * @example <u-line color="red"></u-line>
+	 */
+	export default {
+		name: 'u-line',
+		props: {
+			color: {
+				type: String,
+				default: '#e4e7ed'
+			},
+			// 长度，竖向时表现为高度，横向时表现为长度，可以为百分比，带rpx单位的值等
+			length: {
+				type: String,
+				default: '100%'
+			},
+			// 线条方向，col-竖向，row-横向
+			direction: {
+				type: String,
+				default: 'row'
+			},
+			// 是否显示细边框
+			hairLine: {
+				type: Boolean,
+				default: true
+			},
+			// 线条与上下左右元素的间距，字符串形式，如"30rpx"、"20rpx 30rpx"
+			margin: {
+				type: String,
+				default: '0'
+			},
+			// 线条的类型，solid-实线，dashed-方形虚线，dotted-圆点虚线
+			borderStyle: {
+				type: String,
+				default: 'solid'
+			}
+		},
+		computed: {
+			lineStyle() {
+				let style = {};
+				style.margin = this.margin;
+				// 如果是水平线条，边框高度为1px，再通过transform缩小一半，就是0.5px了
+				if(this.direction == 'row') {
+					// 此处采用兼容分开写，兼容nvue的写法
+					style.borderBottomWidth = '3rpx';
+					style.borderBottomStyle = this.borderStyle;
+					style.width = this.$u.addUnit(this.length);
+					if(this.hairLine) style.transform = 'scaleY(0.5)';
+				} else {
+					// 如果是竖向线条，边框宽度为1px，再通过transform缩小一半，就是0.5px了
+					style.borderLeftWidth = '3rpx';
+					style.borderLeftStyle = this.borderStyle;
+					style.height = this.$u.addUnit(this.length);
+					if(this.hairLine) style.transform = 'scaleX(0.5)';
+				}
+				style.borderColor = this.color;
+				return style;
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	
+	.u-line {
+		vertical-align: middle;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-link/u-link.vue b/uni_modules/vk-uview-ui/components/u-link/u-link.vue
new file mode 100644
index 0000000..2dd2a73
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-link/u-link.vue
@@ -0,0 +1,89 @@
+<template>
+	<text class="u-link" @tap.stop="openLink" :style="{
+		color: color,
+		fontSize: fontSize + 'rpx',
+		borderBottom: underLine ? `1px solid ${lineColor ? lineColor : color}` : 'none',
+		paddingBottom: underLine ? '0rpx' : '0'
+	}">
+		<slot></slot>
+	</text>
+</template>
+
+<script>
+	/**
+	 * link 超链接
+	 * @description 该组件为超链接组件，在不同平台有不同表现形式：在APP平台会通过plus环境打开内置浏览器，在小程序中把链接复制到粘贴板，同时提示信息，在H5中通过window.open打开链接。
+	 * @tutorial https://www.uviewui.com/components/link.html
+	 * @property {String} color 文字颜色（默认#606266）
+	 * @property {String Number} font-size 字体大小，单位rpx（默认28）
+	 * @property {Boolean} under-line 是否显示下划线（默认false）
+	 * @property {String} href 跳转的链接，要带上http(s)
+	 * @property {String} line-color 下划线颜色，默认同color参数颜色 
+	 * @property {String} mp-tips 各个小程序平台把链接复制到粘贴板后的提示语（默认“链接已复制，请在浏览器打开”）
+	 * @example <u-link href="http://www.uviewui.com">蜀道难，难于上青天</u-link>
+	 */
+	export default {
+		name: "u-link",
+		props: {
+			// 文字颜色
+			color: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 字体大小，单位rpx
+			fontSize: {
+				type: [String, Number],
+				default: 28
+			},
+			// 是否显示下划线
+			underLine: {
+				type: Boolean,
+				default: false
+			},
+			// 要跳转的链接
+			href: {
+				type: String,
+				default: ''
+			},
+			// 小程序中复制到粘贴板的提示语
+			mpTips: {
+				type: String,
+				default: '链接已复制，请在浏览器打开'
+			},
+			// 下划线颜色
+			lineColor: {
+				type: String,
+				default: ''
+			}
+		},
+		methods: {
+			openLink() {
+				// #ifdef APP-PLUS
+				plus.runtime.openURL(this.href)
+				// #endif
+				// #ifdef H5
+				window.open(this.href)
+				// #endif
+				// #ifdef MP
+				uni.setClipboardData({
+					data: this.href,
+					success: () => {
+						uni.hideToast();
+						this.$nextTick(() => {
+							this.$u.toast(this.mpTips);
+						})
+					}
+				});
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-link {
+		line-height: 1;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-loading-page/u-loading-page.vue b/uni_modules/vk-uview-ui/components/u-loading-page/u-loading-page.vue
new file mode 100644
index 0000000..7e04401
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-loading-page/u-loading-page.vue
@@ -0,0 +1,25 @@
+<template>
+	<view class="u-loading-page">
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-loading/u-loading.vue b/uni_modules/vk-uview-ui/components/u-loading/u-loading.vue
new file mode 100644
index 0000000..3175c8c
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-loading/u-loading.vue
@@ -0,0 +1,106 @@
+<template>
+	<view v-if="show" class="u-loading" :class="mode == 'circle' ? 'u-loading-circle' : 'u-loading-flower'" :style="[cricleStyle]">
+	</view>
+</template>
+
+<script>
+	/**
+	 * loading 加载动画
+	 * @description 警此组件为一个小动画，目前用在uView的loadmore加载更多和switch开关等组件的正在加载状态场景。
+	 * @tutorial https://www.uviewui.com/components/loading.html
+	 * @property {String} mode 模式选择，见官网说明（默认circle）
+	 * @property {String} color 动画活动区域的颜色，只对 mode = flower 模式有效（默认#c7c7c7）
+	 * @property {String Number} size 加载图标的大小，单位rpx（默认34）
+	 * @property {Boolean} show 是否显示动画（默认true）
+	 * @example <u-loading mode="circle"></u-loading>
+	 */
+	export default {
+		name: "u-loading",
+		props: {
+			// 动画的类型
+			mode: {
+				type: String,
+				default: 'circle'
+			},
+			// 动画的颜色
+			color: {
+				type: String,
+				default: '#c7c7c7'
+			},
+			// 加载图标的大小，单位rpx
+			size: {
+				type: [String, Number],
+				default: '34'
+			},
+			// 是否显示动画
+			show: {
+				type: Boolean,
+				default: true
+			}
+		},
+		computed: {
+			// 加载中圆圈动画的样式
+			cricleStyle() {
+				let style = {};
+				style.width = this.size + 'rpx';
+				style.height = this.size + 'rpx';
+				if (this.mode == 'circle') style.borderColor = `#e4e4e4 #e4e4e4 #e4e4e4 ${this.color ? this.color : '#c7c7c7'}`;
+				return style;
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-loading-circle {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		vertical-align: middle;
+		width: 28rpx;
+		height: 28rpx;
+		background: 0 0;
+		border-radius: 50%;
+		border: 2px solid;
+		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #8f8d8e;
+		animation: u-circle 1s linear infinite;
+	}
+
+	.u-loading-flower {
+		width: 20px;
+		height: 20px;
+		display: inline-block;
+		vertical-align: middle;
+		-webkit-animation: u-flower 1s steps(12) infinite;
+		animation: u-flower 1s steps(12) infinite;
+		background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
+		background-size: 100%;
+	}
+
+	@keyframes u-flower {
+		0% {
+			-webkit-transform: rotate(0deg);
+			transform: rotate(0deg);
+		}
+
+		to {
+			-webkit-transform: rotate(1turn);
+			transform: rotate(1turn);
+		}
+	}
+
+	@keyframes u-circle {
+		0% {
+			-webkit-transform: rotate(0deg);
+			transform: rotate(0deg);
+		}
+
+		to {
+			-webkit-transform: rotate(1turn);
+			transform: rotate(1turn);
+		}
+	}
+
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-loadmore/u-loadmore.vue b/uni_modules/vk-uview-ui/components/u-loadmore/u-loadmore.vue
new file mode 100644
index 0000000..e7cbbea
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-loadmore/u-loadmore.vue
@@ -0,0 +1,204 @@
+<template>
+	<view class="u-load-more-wrap" :style="{
+		backgroundColor: bgColor,
+		marginBottom: marginBottom + 'rpx',
+		marginTop: marginTop + 'rpx',
+		height: $u.addUnit(height)
+	}">
+		<u-line color="#d4d4d4" length="50"></u-line>
+		<!-- 加载中和没有更多的状态才显示两边的横线 -->
+		<view :class="status == 'loadmore' || status == 'nomore' ? 'u-more' : ''" class="u-load-more-inner">
+			<view class="u-loadmore-icon-wrap">
+				<u-loading class="u-loadmore-icon" :color="iconColor" :mode="iconType == 'circle' ? 'circle' : 'flower'" :show="status == 'loading' && icon"></u-loading>
+			</view>
+			<!-- 如果没有更多的状态下，显示内容为dot（粗点），加载特定样式 -->
+			<view class="u-line-1" :style="[loadTextStyle]" :class="[(status == 'nomore' && isDot == true) ? 'u-dot-text' : 'u-more-text']" @tap="loadMore">
+				{{ showText }}
+			</view>
+		</view>
+		<u-line color="#d4d4d4" length="50"></u-line>
+	</view>
+</template>
+
+<script>
+	/**
+	 * loadmore 加载更多
+	 * @description 此组件一般用于标识页面底部加载数据时的状态。
+	 * @tutorial https://www.uviewui.com/components/loadMore.html
+	 * @property {String} status 组件状态（默认loadmore）
+	 * @property {String} bg-color 组件背景颜色，在页面是非白色时会用到（默认#ffffff）
+	 * @property {Boolean} icon 加载中时是否显示图标（默认true）
+	 * @property {String} icon-type 加载中时的图标类型（默认circle）
+	 * @property {String} icon-color icon-type为circle时有效，加载中的动画图标的颜色（默认#b7b7b7）
+	 * @property {Boolean} is-dot status为nomore时，内容显示为一个"●"（默认false）
+	 * @property {String} color 字体颜色（默认#606266）
+	 * @property {String Number} margin-top 到上一个相邻元素的距离
+	 * @property {String Number} margin-bottom 到下一个相邻元素的距离
+	 * @property {Object} load-text 自定义显示的文字，见上方说明示例
+	 * @event {Function} loadmore status为loadmore时，点击组件会发出此事件
+	 * @example <u-loadmore :status="status" icon-type="iconType" load-text="loadText" />
+	 */
+	export default {
+		name: "u-loadmore",
+    emits: ["loadmore"],
+		props: {
+			// 组件背景色
+			bgColor: {
+				type: String,
+				default: 'transparent'
+			},
+			// 是否显示加载中的图标
+			icon: {
+				type: Boolean,
+				default: true
+			},
+			// 字体大小
+			fontSize: {
+				type: String,
+				default: '28'
+			},
+			// 字体颜色
+			color: {
+				type: String, 
+				default: '#606266'
+			},
+			// 组件状态，loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态
+			status: {
+				type: String,
+				default: 'loadmore'
+			},
+			// 加载中状态的图标，flower-花朵状图标，circle-圆圈状图标
+			iconType: {
+				type: String,
+				default: 'circle'
+			},
+			// 显示的文字
+			loadText: {
+				type: Object,
+				default () {
+					return {
+						loadmore: '加载更多',
+						loading: '正在加载...',
+						nomore: '没有更多了'
+					}
+				}
+			},
+			// 在“没有更多”状态下，是否显示粗点
+			isDot: {
+				type: Boolean,
+				default: false
+			},
+			// 加载中显示圆圈动画时，动画的颜色
+			iconColor: {
+				type: String,
+				default: '#b7b7b7'
+			},
+			// 上边距
+			marginTop: {
+				type: [String, Number],
+				default: 0
+			},
+			// 下边距
+			marginBottom: {
+				type: [String, Number],
+				default: 0
+			},
+			// 高度，单位rpx
+			height: {
+				type: [String, Number],
+				default: 'auto'
+			}
+		},
+		data() {
+			return {
+				// 粗点
+				dotText: "●"
+			}
+		},
+		computed: {
+			// 加载的文字显示的样式
+			loadTextStyle() {
+				return {
+					color: this.color,
+					fontSize: this.fontSize + 'rpx',
+					position: 'relative',
+					zIndex: 1,
+					backgroundColor: this.bgColor,
+					// 如果是加载中状态，动画和文字需要距离近一点
+				}
+			},
+			// 加载中圆圈动画的样式
+			cricleStyle() {
+				return {
+					borderColor: `#e5e5e5 #e5e5e5 #e5e5e5 ${this.circleColor}`
+				}
+			},
+			// 加载中花朵动画形式
+			// 动画由base64图片生成，暂不支持修改
+			flowerStyle() {
+				return {
+				}
+			},
+			// 显示的提示文字
+			showText() {
+				let text = '';
+				if(this.status == 'loadmore') text = this.loadText.loadmore;
+				else if(this.status == 'loading') text = this.loadText.loading;
+				else if(this.status == 'nomore' && this.isDot) text = this.dotText;
+				else text = this.loadText.nomore;
+				return text;
+			}
+		},
+		methods: {
+			loadMore() {
+				// 只有在“加载更多”的状态下才发送点击事件，内容不满一屏时无法触发底部上拉事件，所以需要点击来触发
+				if(this.status == 'loadmore') this.$emit('loadmore');
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	
+	/* #ifdef MP */
+	// 在mp.scss中，赋予了u-line为flex: 1，这里需要一个明确的长度，所以重置掉它
+	// 在组件内部，把组件名(u-line)当做选择器，在微信开发工具会提示不合法，但不影响使用
+	u-line {
+		flex: none;
+	}
+	/* #endif */
+	
+	.u-load-more-wrap {
+		@include vue-flex;
+		justify-content: center;
+		align-items: center;
+	}
+	
+	.u-load-more-inner {
+		@include vue-flex;
+		justify-content: center;
+		align-items: center;
+		padding: 0 12rpx;
+	}
+	
+	.u-more {
+		position: relative;
+		@include vue-flex;
+		justify-content: center;
+	}
+	
+	.u-dot-text {
+		font-size: 28rpx;
+	}
+	
+	.u-loadmore-icon-wrap {
+		margin-right: 8rpx;
+	}
+	
+	.u-loadmore-icon {
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-mask/u-mask.vue b/uni_modules/vk-uview-ui/components/u-mask/u-mask.vue
new file mode 100644
index 0000000..cd33923
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-mask/u-mask.vue
@@ -0,0 +1,137 @@
+<template>
+	<view class="u-mask" hover-stop-propagation :style="[maskStyle, zoomStyle, filterStyle]" @tap="click" @touchmove.stop.prevent="() => {}" :class="{
+		'u-mask-zoom': zoom,
+		'u-mask-show': show
+	}">
+		<slot />
+	</view>
+</template>
+
+<script>
+	/**
+	 * mask 遮罩
+	 * @description 创建一个遮罩层，用于强调特定的页面元素，并阻止用户对遮罩下层的内容进行操作，一般用于弹窗场景
+	 * @tutorial https://www.uviewui.com/components/mask.html
+	 * @property {Boolean} show 是否显示遮罩（默认false）
+	 * @property {String Number} z-index z-index 层级（默认1070）
+	 * @property {Object} custom-style 自定义样式对象，见上方说明
+	 * @property {String Number} duration 动画时长，单位毫秒（默认300）
+	 * @property {Boolean} zoom 是否使用scale对遮罩进行缩放（默认true）
+	 * @property {Boolean} mask-click-able 遮罩是否可点击，为false时点击不会发送click事件（默认true）
+	 * @event {Function} click mask-click-able为true时，点击遮罩发送此事件
+	 * @example <u-mask :show="show" @click="show = false"></u-mask>
+	 */
+	export default {
+		name: "u-mask",
+		emits: ["click"],
+		props: {
+			// 是否显示遮罩
+			show: {
+				type: Boolean,
+				default: false
+			},
+			// 层级z-index
+			zIndex: {
+				type: [Number, String],
+				default: ''
+			},
+			// 用户自定义样式
+			customStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 遮罩的动画样式， 是否使用使用zoom进行scale进行缩放
+			zoom: {
+				type: Boolean,
+				default: true
+			},
+			// 遮罩的过渡时间，单位为ms
+			duration: {
+				type: [Number, String],
+				default: 300
+			},
+			// 是否可以通过点击遮罩进行关闭
+			maskClickAble: {
+				type: Boolean,
+				default: true
+			},
+			// 遮罩的模糊度
+			blur: {
+				type: [Number, String],
+				default: 0
+			},
+		},
+		data() {
+			return {
+				zoomStyle: {
+					transform: ''
+				},
+				scale: 'scale(1.2, 1.2)'
+			}
+		},
+		watch: {
+			show(n) {
+				if(n && this.zoom) {
+					// 当展示遮罩的时候，设置scale为1，达到缩小(原来为1.2)的效果
+					this.zoomStyle.transform = 'scale(1, 1)';
+				} else if(!n && this.zoom) {
+					// 当隐藏遮罩的时候，设置scale为1.2，达到放大(因为显示遮罩时已重置为1)的效果
+					this.zoomStyle.transform = this.scale;
+				}
+			}
+		},
+		computed: {
+			maskStyle() {
+				let style = {};
+				style.backgroundColor = "rgba(0, 0, 0, 0.6)";
+				if(this.show) style.zIndex = this.zIndex ? this.zIndex : this.$u.zIndex.mask;
+				else style.zIndex = -1;
+				style.transition = `all ${this.duration / 1000}s ease-in-out`;
+				// 判断用户传递的对象是否为空，不为空就进行合并
+				if (Object.keys(this.customStyle).length) style = { 
+					...style,
+					...this.customStyle
+				};
+				return style;
+			},
+			filterStyle() {
+				let { blur } = this;
+				let style = {};
+				if (blur) {
+					style.backdropFilter = `blur(${blur}rpx)`;
+				}
+				return style;
+			}
+		},
+		methods: {
+			click() {
+				if (!this.maskClickAble) return;
+				this.$emit('click');
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		opacity: 0;
+		transition: transform 0.3s;
+	}
+
+	.u-mask-show {
+		opacity: 1;
+	}
+	
+	.u-mask-zoom {
+		transform: scale(1.2, 1.2);
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-message-input/u-message-input.vue b/uni_modules/vk-uview-ui/components/u-message-input/u-message-input.vue
new file mode 100644
index 0000000..f4b1568
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-message-input/u-message-input.vue
@@ -0,0 +1,327 @@
+<template>
+	<view class="u-char-box">
+		<view class="u-char-flex">
+			<input :disabled="disabledKeyboard" :value="valueModel" type="number" :focus="focus" :maxlength="maxlength" class="u-input" @input="getVal"/>
+			<view v-for="(item, index) in loopCharArr" :key="index">
+				<view :class="[breathe && charArrLength == index ? 'u-breathe' : '', 'u-char-item',
+				charArrLength === index && mode == 'box' ? 'u-box-active' : '',
+				mode === 'box' ? 'u-box' : '']" :style="{
+					fontWeight: bold ? 'bold' : 'normal',
+					fontSize: fontSize + 'rpx',
+					width: width + 'rpx',
+					height: width + 'rpx',
+					color: inactiveColor,
+					borderColor: charArrLength === index && mode == 'box' ? activeColor : inactiveColor
+				}">
+					<view class="u-placeholder-line" :style="{
+							display: charArrLength === index ? 'block' : 'none',
+							height: width * 0.5 +'rpx'
+						}"
+						v-if="mode !== 'middleLine'"
+					></view>
+					<view v-if="mode === 'middleLine' && charArrLength <= index" :class="[breathe && charArrLength == index ? 'u-breathe' : '', charArrLength === index ? 'u-middle-line-active' : '']"
+					 class="u-middle-line" :style="{height: bold ? '4px' : '2px', background: charArrLength === index ? activeColor : inactiveColor}"></view>
+					<view v-if="mode === 'bottomLine'" :class="[breathe && charArrLength == index ? 'u-breathe' : '', charArrLength === index ? 'u-bottom-line-active' : '']"
+					 class="u-bottom-line" :style="{height: bold ? '4px' : '2px', background: charArrLength === index ? activeColor : inactiveColor}"></view>
+					<block v-if="!dotFill"> {{ charArr[index] ? charArr[index] : ''}}</block>
+					<block v-else>
+						<text class="u-dot">{{ charArr[index] ? '●' : ''}}</text>
+					</block>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * messageInput 验证码输入框
+	 * @description 该组件一般用于验证用户短信验证码的场景，也可以结合uView的键盘组件使用
+	 * @tutorial https://www.uviewui.com/components/messageInput.html
+	 * @property {String Number} maxlength 输入字符个数（默认4）
+	 * @property {Boolean} dot-fill 是否用圆点填充（默认false）
+	 * @property {String} mode 模式选择，见上方"基本使用"说明（默认box）
+	 * @property {String Number} value 预置值
+	 * @property {Boolean} breathe 是否开启呼吸效果，见上方说明（默认true）
+	 * @property {Boolean} focus 是否自动获取焦点（默认false）
+	 * @property {Boolean} bold 字体和输入横线是否加粗（默认true）
+	 * @property {String Number} font-size 字体大小，单位rpx（默认60）
+	 * @property {String} active-color 当前激活输入框的样式（默认#2979ff）
+	 * @property {String} inactive-color 非激活输入框的样式，文字颜色同此值（默认#606266）
+	 * @property {String | Number} width 输入框宽度，单位rpx，高等于宽（默认80）
+	 * @property {Boolean} disabled-keyboard 禁止点击输入框唤起系统键盘（默认false）
+	 * @event {Function} change 输入内容发生改变时触发，具体见官网说明
+	 * @event {Function} finish 输入字符个数达maxlength值时触发，见官网说明
+	 * @example <u-message-input mode="bottomLine"></u-message-input>
+	 */
+	export default {
+		name: "u-message-input",
+    emits: ["update:modelValue", "input","change", "finish"],
+		props: {
+      // 预置值
+      value: {
+      	type: [String, Number],
+      	default: ''
+      },
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			// 最大输入长度
+			maxlength: {
+				type: [Number, String],
+				default: 4
+			},
+			// 是否用圆点填充
+			dotFill: {
+				type: Boolean,
+				default: false
+			},
+			// 显示模式，box-盒子模式，bottomLine-横线在底部模式，middleLine-横线在中部模式
+			mode: {
+				type: String,
+				default: "box"
+			},
+			// 当前激活输入item，是否带有呼吸效果
+			breathe: {
+				type: Boolean,
+				default: true
+			},
+			// 是否自动获取焦点
+			focus: {
+				type: Boolean,
+				default: false
+			},
+			// 字体是否加粗
+			bold: {
+				type: Boolean,
+				default: false
+			},
+			// 字体大小
+			fontSize: {
+				type: [String, Number],
+				default: 60
+			},
+			// 激活样式
+			activeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 未激活的样式
+			inactiveColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 输入框的大小，单位rpx，宽等于高
+			width: {
+				type: [Number, String],
+				default: '80'
+			},
+			// 是否隐藏原生键盘，如果想用自定义键盘的话，需设置此参数为true
+			disabledKeyboard: {
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			// maxlength: {
+			// 	// 此值设置为true，会在组件加载后无需maxlength变化就会执行一次本监听函数，无需再created生命周期中处理
+			// 	immediate: true,
+			// 	handler(val) {
+			// 		this.maxlength = Number(val);
+			// 	}
+			// },
+			valueCom: {
+				immediate: true,
+				handler(val) {
+					// 转为字符串
+					val = String(val);
+					// 超出部分截掉
+					this.valueModel = val.substring(0, Number(this.maxlength));
+				}
+			},
+		},
+		data() {
+			return {
+				valueModel: ""
+			}
+		},
+		computed: {
+			valueCom(){
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+			},
+			// 是否显示呼吸灯效果
+			animationClass() {
+				return (index) => {
+					if (this.breathe && this.charArr.length == index) return 'u-breathe';
+					else return '';
+				}
+			},
+			// 用于显示字符
+			charArr() {
+				return this.valueModel.split('');
+			},
+			charArrLength() {
+				return this.charArr.length;
+			},
+			// 根据长度，循环输入框的个数，因为头条小程序数值不能用于v-for
+			loopCharArr() {
+				return new Array(Number(this.maxlength));
+			}
+		},
+		methods: {
+			getVal(e) {
+				let {
+					value
+				} = e.detail
+				this.valueModel = value;
+				// 判断长度是否超出了maxlength值，理论上不会发生，因为input组件设置了maxlength属性值
+				if (String(value).length > Number(this.maxlength)) return;
+				// 未达到maxlength之前，发送change事件，达到后发送finish事件
+				this.$emit('change', value);
+				this.$emit("input", value);
+				this.$emit("update:modelValue", value);
+				if (String(value).length == Number(this.maxlength)) {
+					this.$emit('finish', value);
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	@keyframes breathe {
+		0% {
+			opacity: 0.3;
+		}
+
+		50% {
+			opacity: 1;
+		}
+
+		100% {
+			opacity: 0.3;
+		}
+	}
+
+	.u-char-box {
+		text-align: center;
+	}
+
+	.u-char-flex {
+		@include vue-flex;
+		justify-content: center;
+		flex-wrap: wrap;
+		position: relative;
+	}
+
+	.u-input {
+		position: absolute;
+		top: 0;
+		left: -100%;
+		width: 200%;
+		height: 100%;
+		text-align: left;
+		z-index: 9;
+		opacity: 0;
+		background: none;
+	}
+
+	.u-char-item {
+		position: relative;
+		width: 90rpx;
+		height: 90rpx;
+		margin: 10rpx 10rpx;
+		font-size: 60rpx;
+		font-weight: bold;
+		color: $u-main-color;
+		line-height: 90rpx;
+		@include vue-flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.u-middle-line {
+		border: none;
+	}
+
+	.u-box {
+		box-sizing: border-box;
+		border: 2rpx solid #cccccc;
+		border-radius: 6rpx;
+	}
+
+	.u-box-active {
+		overflow: hidden;
+		animation-timing-function: ease-in-out;
+		animation-duration: 1500ms;
+		animation-iteration-count: infinite;
+		animation-direction: alternate;
+		border: 2rpx solid $u-type-primary;
+	}
+
+	.u-middle-line-active {
+		background: $u-type-primary;
+	}
+
+	.u-breathe {
+		animation: breathe 2s infinite ease;
+	}
+
+	.u-placeholder-line {
+		/* #ifndef APP-NVUE */
+		display: none;
+		/* #endif */
+		position: absolute;
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+		width: 2rpx;
+		height: 40rpx;
+		background: #333333;
+		animation: twinkling 1.5s infinite ease;
+	}
+
+	.u-animation-breathe {
+		animation-name: breathe;
+	}
+
+	.u-dot {
+		font-size: 34rpx;
+		line-height: 34rpx;
+	}
+
+	.u-middle-line {
+		height: 4px;
+		background: #000000;
+		width: 80%;
+		position: absolute;
+		border-radius: 2px;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+
+	.u-bottom-line-active {
+		background: $u-type-primary;
+	}
+
+	.u-bottom-line {
+		height: 4px;
+		background: #000000;
+		width: 80%;
+		position: absolute;
+		border-radius: 2px;
+		bottom: 0;
+		left: 50%;
+		transform: translate(-50%);
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-modal/u-modal.vue b/uni_modules/vk-uview-ui/components/u-modal/u-modal.vue
new file mode 100644
index 0000000..bf8b4fc
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-modal/u-modal.vue
@@ -0,0 +1,339 @@
+<template>
+	<view>
+		<u-popup
+			:blur="blur"
+			:zoom="zoom"
+			mode="center"
+			:popup="false"
+			:z-index="uZIndex"
+			v-model="popupValue"
+			:length="width"
+			:mask-close-able="maskCloseAble"
+			:border-radius="borderRadius"
+			@close="popupClose"
+			:negative-top="negativeTop"
+		>
+			<view class="u-model">
+				<view v-if="showTitle" class="u-model__title u-line-1" :style="[titleStyle]">
+					{{ title }}
+				</view>
+				<view class="u-model__content">
+					<view :style="[contentStyle]" v-if="$slots.default || $slots.$default"><slot /></view>
+					<view v-else class="u-model__content__message" :style="[contentStyle]">
+						{{ content }}
+					</view>
+				</view>
+				<view class="u-model__footer u-border-top" v-if="showCancelButton || showConfirmButton">
+					<view
+						v-if="showCancelButton"
+						:hover-stay-time="100"
+						hover-class="u-model__btn--hover"
+						class="u-model__footer__button"
+						:style="[cancelBtnStyle]"
+						@tap="cancel"
+					>
+						{{ cancelText }}
+					</view>
+					<view
+						v-if="showConfirmButton || $slots['confirm-button']"
+						:hover-stay-time="100"
+						:hover-class="asyncClose ? 'none' : 'u-model__btn--hover'"
+						class="u-model__footer__button hairline-left"
+						:style="[confirmBtnStyle]"
+						@tap="confirm"
+					>
+						<slot v-if="$slots['confirm-button']" name="confirm-button"></slot>
+						<block v-else>
+							<u-loading mode="circle" :color="confirmColor" v-if="loading"></u-loading>
+							<block v-else>{{ confirmText }}</block>
+						</block>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+/**
+ * modal 模态框
+ * @description 弹出模态框，常用于消息提示、消息确认、在当前页面内完成特定的交互操作
+ * @tutorial https://www.uviewui.com/components/modal.html
+ * @property {Boolean} value 是否显示模态框
+ * @property {String | Number} z-index 层级
+ * @property {String} title 模态框标题（默认"提示"）
+ * @property {String | Number} width 模态框宽度（默认600）
+ * @property {String} content 模态框内容（默认"内容"）
+ * @property {Boolean} show-title 是否显示标题（默认true）
+ * @property {Boolean} async-close 是否异步关闭，只对确定按钮有效（默认false）
+ * @property {Boolean} show-confirm-button 是否显示确认按钮（默认true）
+ * @property {Stringr | Number} negative-top modal往上偏移的值
+ * @property {Boolean} show-cancel-button 是否显示取消按钮（默认false）
+ * @property {Boolean} mask-close-able 是否允许点击遮罩关闭modal（默认false）
+ * @property {String} confirm-text 确认按钮的文字内容（默认"确认"）
+ * @property {String} cancel-text 取消按钮的文字内容（默认"取消"）
+ * @property {String} cancel-color 取消按钮的颜色（默认"#606266"）
+ * @property {String} confirm-color 确认按钮的文字内容（默认"#2979ff"）
+ * @property {String | Number} border-radius 模态框圆角值，单位rpx（默认16）
+ * @property {Object} title-style 自定义标题样式，对象形式
+ * @property {Object} content-style 自定义内容样式，对象形式
+ * @property {Object} cancel-style 自定义取消按钮样式，对象形式
+ * @property {Object} confirm-style 自定义确认按钮样式，对象形式
+ * @property {Boolean} zoom 是否开启缩放模式（默认true）
+ * @event {Function} confirm 确认按钮被点击
+ * @event {Function} cancel 取消按钮被点击
+ * @example <u-modal :src="title" :content="content"></u-modal>
+ */
+export default {
+	name: "u-modal",
+	emits: ["update:modelValue", "input", "confirm", "cancel"],
+	props: {
+		// 是否显示Modal
+		value: {
+			type: Boolean,
+			default: false
+		},
+		modelValue: {
+			type: Boolean,
+			default: false
+		},
+		// 层级z-index
+		zIndex: {
+			type: [Number, String],
+			default: ""
+		},
+		// 标题
+		title: {
+			type: [String],
+			default: "提示"
+		},
+		// 弹窗宽度，可以是数值(rpx)，百分比，auto等
+		width: {
+			type: [Number, String],
+			default: 600
+		},
+		// 弹窗内容
+		content: {
+			type: String,
+			default: "内容"
+		},
+		// 是否显示标题
+		showTitle: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示确认按钮
+		showConfirmButton: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示取消按钮
+		showCancelButton: {
+			type: Boolean,
+			default: false
+		},
+		// 确认文案
+		confirmText: {
+			type: String,
+			default: "确认"
+		},
+		// 取消文案
+		cancelText: {
+			type: String,
+			default: "取消"
+		},
+		// 确认按钮颜色
+		confirmColor: {
+			type: String,
+			default: "#2979ff"
+		},
+		// 取消文字颜色
+		cancelColor: {
+			type: String,
+			default: "#606266"
+		},
+		// 圆角值
+		borderRadius: {
+			type: [Number, String],
+			default: 16
+		},
+		// 标题的样式
+		titleStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 内容的样式
+		contentStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 取消按钮的样式
+		cancelStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 确定按钮的样式
+		confirmStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 是否开启缩放效果
+		zoom: {
+			type: Boolean,
+			default: true
+		},
+		// 是否异步关闭，只对确定按钮有效
+		asyncClose: {
+			type: Boolean,
+			default: false
+		},
+		// 是否允许点击遮罩关闭modal
+		maskCloseAble: {
+			type: Boolean,
+			default: false
+		},
+		// 给一个负的margin-top，往上偏移，避免和键盘重合的情况
+		negativeTop: {
+			type: [String, Number],
+			default: 0
+		},
+		// 遮罩的模糊度
+		blur: {
+			type: [Number, String],
+			default: 0
+		}
+	},
+	data() {
+		return {
+			loading: false, // 确认按钮是否正在加载中
+			popupValue: false
+		};
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		cancelBtnStyle() {
+			return Object.assign(
+				{
+					color: this.cancelColor
+				},
+				this.cancelStyle
+			);
+		},
+		confirmBtnStyle() {
+			return Object.assign(
+				{
+					color: this.confirmColor
+				},
+				this.confirmStyle
+			);
+		},
+		uZIndex() {
+			return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+		}
+	},
+	watch: {
+		// 如果是异步关闭时，外部修改v-model的值为false时，重置内部的loading状态
+		// 避免下次打开的时候，状态混乱
+		valueCom:{
+			immediate: true,
+			handler(n){
+				if (n === true) this.loading = false;
+				this.popupValue = n;
+			}
+		}
+	},
+	methods: {
+		confirm() {
+			// 异步关闭
+			if (this.asyncClose) {
+				this.loading = true;
+			} else {
+				this.$emit("input", false);
+				this.$emit("update:modelValue", false);
+			}
+			this.$emit("confirm");
+		},
+		cancel() {
+			this.$emit("cancel");
+			this.$emit("input", false);
+			this.$emit("update:modelValue", false);
+			// 目前popup弹窗关闭有一个延时操作，此处做一个延时
+			// 避免确认按钮文字变成了"确定"字样，modal还没消失，造成视觉不好的效果
+			setTimeout(() => {
+				this.loading = false;
+			}, 300);
+		},
+		// 点击遮罩关闭modal，设置v-model的值为false，否则无法第二次弹起modal
+		popupClose() {
+			this.$emit("input", false);
+			this.$emit("update:modelValue", false);
+		},
+		// 清除加载中的状态
+		clearLoading() {
+			this.loading = false;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-model {
+	height: auto;
+	overflow: hidden;
+	font-size: 32rpx;
+	background-color: #fff;
+
+	&__btn--hover {
+		background-color: rgb(230, 230, 230);
+	}
+
+	&__title {
+		padding-top: 48rpx;
+		font-weight: 500;
+		text-align: center;
+		color: $u-main-color;
+	}
+
+	&__content {
+		&__message {
+			padding: 48rpx;
+			font-size: 30rpx;
+			text-align: center;
+			color: $u-content-color;
+		}
+	}
+
+	&__footer {
+		@include vue-flex;
+
+		&__button {
+			flex: 1;
+			height: 100rpx;
+			line-height: 100rpx;
+			font-size: 32rpx;
+			box-sizing: border-box;
+			cursor: pointer;
+			text-align: center;
+			border-radius: 4rpx;
+		}
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-navbar/u-navbar.vue b/uni_modules/vk-uview-ui/components/u-navbar/u-navbar.vue
new file mode 100644
index 0000000..450242e
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-navbar/u-navbar.vue
@@ -0,0 +1,315 @@
+<template>
+	<view class="">
+		<view class="u-navbar" :style="[navbarStyle]" :class="{ 'u-navbar-fixed': isFixed, 'u-border-bottom': borderBottom }">
+			<view class="u-status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
+			<view class="u-navbar-inner" :style="[navbarInnerStyle]">
+				<view class="u-back-wrap" v-if="isBack" @tap="goBack">
+					<view class="u-icon-wrap">
+						<u-icon :name="backIconName" :color="backIconColor" :size="backIconSize"></u-icon>
+					</view>
+					<view class="u-icon-wrap u-back-text u-line-1" v-if="backText" :style="[backTextStyle]">{{ backText }}</view>
+				</view>
+				<view class="u-navbar-content-title" v-if="title" :style="[titleStyle]">
+					<view
+					    class="u-title u-line-1"
+					    :style="{
+							color: titleColor,
+							fontSize: titleSize + 'rpx',
+							fontWeight: titleBold ? 'bold' : 'normal'
+						}">
+						{{ title }}
+					</view>
+				</view>
+				<view class="u-slot-content">
+					<slot></slot>
+				</view>
+				<view class="u-slot-right">
+					<slot name="right"></slot>
+				</view>
+			</view>
+		</view>
+		<!-- 解决fixed定位后导航栏塌陷的问题 -->
+		<view class="u-navbar-placeholder" v-if="isFixed && !immersive" :style="{ width: '100%', height: Number(navbarHeight) + statusBarHeight + 'px' }"></view>
+	</view>
+</template>
+
+<script>
+	// 获取系统状态栏的高度
+	let systemInfo = uni.getSystemInfoSync();
+	let menuButtonInfo = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+	/**
+	 * navbar 自定义导航栏
+	 * @description 此组件一般用于在特殊情况下，需要自定义导航栏的时候用到，一般建议使用uniapp自带的导航栏。
+	 * @tutorial https://www.uviewui.com/components/navbar.html
+	 * @property {String Number} height 导航栏高度(不包括状态栏高度在内，内部自动加上)，注意这里的单位是px（默认44）
+	 * @property {String} back-icon-color 左边返回图标的颜色（默认#606266）
+	 * @property {String} back-icon-name 左边返回图标的名称，只能为uView自带的图标（默认arrow-left）
+	 * @property {String Number} back-icon-size 左边返回图标的大小，单位rpx（默认30）
+	 * @property {String} back-text 返回图标右边的辅助提示文字
+	 * @property {Object} back-text-style 返回图标右边的辅助提示文字的样式，对象形式（默认{ color: '#606266' }）
+	 * @property {String} title 导航栏标题，如设置为空字符，将会隐藏标题占位区域
+	 * @property {String Number} title-width 导航栏标题的最大宽度，内容超出会以省略号隐藏，单位rpx（默认250）
+	 * @property {String} title-color 标题的颜色（默认#606266）
+	 * @property {String Number} title-size 导航栏标题字体大小，单位rpx（默认32）
+	 * @property {Function} custom-back 自定义返回逻辑方法
+	 * @property {String Number} z-index 固定在顶部时的z-index值（默认980）
+	 * @property {Boolean} is-back 是否显示导航栏左边返回图标和辅助文字（默认true）
+	 * @property {Object} background 导航栏背景设置，见官网说明（默认{ background: '#ffffff' }）
+	 * @property {Boolean} is-fixed 导航栏是否固定在顶部（默认true）
+	 * @property {Boolean} immersive 沉浸式，允许fixed定位后导航栏塌陷，仅fixed定位下生效（默认false）
+	 * @property {Boolean} border-bottom 导航栏底部是否显示下边框，如定义了较深的背景颜色，可取消此值（默认true）
+	 * @example <u-navbar back-text="返回" title="剑未配妥，出门已是江湖"></u-navbar>
+	 */
+	export default {
+		name: "u-navbar",
+		props: {
+			// 导航栏高度，单位px，非rpx
+			height: {
+				type: [String, Number],
+				default: ''
+			},
+			// 返回箭头的颜色
+			backIconColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 左边返回的图标
+			backIconName: {
+				type: String,
+				default: 'nav-back'
+			},
+			// 左边返回图标的大小，rpx
+			backIconSize: {
+				type: [String, Number],
+				default: '44'
+			},
+			// 返回的文字提示
+			backText: {
+				type: String,
+				default: ''
+			},
+			// 返回的文字的 样式
+			backTextStyle: {
+				type: Object,
+				default () {
+					return {
+						color: '#606266'
+					}
+				}
+			},
+			// 导航栏标题
+			title: {
+				type: String,
+				default: ''
+			},
+			// 标题的宽度，如果需要自定义右侧内容，且右侧内容很多时，可能需要减少这个宽度，单位rpx
+			titleWidth: {
+				type: [String, Number],
+				default: '250'
+			},
+			// 标题的颜色
+			titleColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 标题字体是否加粗
+			titleBold: {
+				type: Boolean,
+				default: false
+			},
+			// 标题的字体大小
+			titleSize: {
+				type: [String, Number],
+				default: 32
+			},
+			isBack: {
+				type: [Boolean, String],
+				default: true
+			},
+			// 对象形式，因为用户可能定义一个纯色，或者线性渐变的颜色
+			background: {
+				type: Object,
+				default () {
+					return {
+						background: '#ffffff'
+					}
+				}
+			},
+			// 导航栏是否固定在顶部
+			isFixed: {
+				type: Boolean,
+				default: true
+			},
+			// 是否沉浸式，允许fixed定位后导航栏塌陷，仅fixed定位下生效
+			immersive: {
+				type: Boolean,
+				default: false
+			},
+			// 是否显示导航栏的下边框
+			borderBottom: {
+				type: Boolean,
+				default: true
+			},
+			zIndex: {
+				type: [String, Number],
+				default: ''
+			},
+			// 自定义返回逻辑
+			customBack: {
+				type: Function,
+				default: null
+			}
+		},
+		data() {
+			return {
+				menuButtonInfo: menuButtonInfo,
+				statusBarHeight: systemInfo.statusBarHeight
+			};
+		},
+		computed: {
+			// 导航栏内部盒子的样式
+			navbarInnerStyle() {
+				let style = {};
+				// 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
+				style.height = this.navbarHeight + 'px';
+				// // 如果是各家小程序，导航栏内部的宽度需要减少右边胶囊的宽度
+				// #ifdef MP
+				let rightButtonWidth = systemInfo.windowWidth - menuButtonInfo.left;
+				style.marginRight = rightButtonWidth + 'px';
+				// #endif
+				return style;
+			},
+			// 整个导航栏的样式
+			navbarStyle() {
+				let style = {};
+				style.zIndex = this.zIndex ? this.zIndex : this.$u.zIndex.navbar;
+				// 合并用户传递的背景色对象
+				Object.assign(style, this.background);
+				return style;
+			},
+			// 导航中间的标题的样式
+			titleStyle() {
+				let style = {};
+				// #ifndef MP
+				style.left = (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + 'px';
+				style.right = (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + 'px';
+				// #endif
+				// #ifdef MP
+				// 此处是为了让标题显示区域即使在小程序有右侧胶囊的情况下也能处于屏幕的中间，是通过绝对定位实现的
+				let rightButtonWidth = systemInfo.windowWidth - menuButtonInfo.left;
+				style.left = (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + 'px';
+				style.right = rightButtonWidth - (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + rightButtonWidth +
+					'px';
+				// #endif
+				style.width = uni.upx2px(this.titleWidth) + 'px';
+				return style;
+			},
+			// 转换字符数值为真正的数值
+			navbarHeight() {
+				// #ifdef APP-PLUS || H5
+				return this.height ? this.height : 44;
+				// #endif
+				// #ifdef MP
+				// 小程序特别处理，让导航栏高度 = 胶囊高度 + 两倍胶囊顶部与状态栏底部的距离之差(相当于同时获得了导航栏底部与胶囊底部的距离)
+				// 此方法有缺陷，暂不用(会导致少了几个px)，采用直接固定值的方式
+				// return menuButtonInfo.height + (menuButtonInfo.top - this.statusBarHeight) * 2;//导航高度
+				let height = systemInfo.platform == 'ios' ? 44 : 48;
+				return this.height ? this.height : height;
+				// #endif
+			}
+		},
+		created() {},
+		methods: {
+			goBack() {
+				// 如果自定义了点击返回按钮的函数，则执行，否则执行返回逻辑
+				if (typeof this.customBack === 'function') {
+					// 在微信，支付宝等环境(H5正常)，会导致父组件定义的customBack()函数体中的this变成子组件的this
+					// 通过bind()方法，绑定父组件的this，让this.customBack()的this为父组件的上下文
+					this.customBack.bind(this.$u.$parent.call(this))();
+				} else {
+					uni.navigateBack();
+				}
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	.u-navbar {
+		width: 100%;
+	}
+
+	.u-navbar-fixed {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		z-index: 991;
+	}
+
+	.u-status-bar {
+		width: 100%;
+	}
+
+	.u-navbar-inner {
+		@include vue-flex;
+		justify-content: space-between;
+		position: relative;
+		align-items: center;
+	}
+
+	.u-back-wrap {
+		@include vue-flex;
+		align-items: center;
+		flex: 1;
+		flex-grow: 0;
+		padding: 14rpx 14rpx 14rpx 24rpx;
+	}
+
+	.u-back-text {
+		padding-left: 4rpx;
+		font-size: 30rpx;
+	}
+
+	.u-navbar-content-title {
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		flex: 1;
+		position: absolute;
+		left: 0;
+		right: 0;
+		height: 60rpx;
+		text-align: center;
+		flex-shrink: 0;
+	}
+
+	.u-navbar-centent-slot {
+		flex: 1;
+	}
+
+	.u-title {
+		line-height: 60rpx;
+		font-size: 32rpx;
+		flex: 1;
+	}
+
+	.u-navbar-right {
+		flex: 1;
+		@include vue-flex;
+		align-items: center;
+		justify-content: flex-end;
+	}
+
+	.u-slot-content {
+		flex: 1;
+		@include vue-flex;
+		align-items: center;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-no-network/u-no-network.vue b/uni_modules/vk-uview-ui/components/u-no-network/u-no-network.vue
new file mode 100644
index 0000000..51d9f4f
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-no-network/u-no-network.vue
@@ -0,0 +1,233 @@
+<template>
+	<view class="u-no-network" v-if="!isConnected" :style="{'z-index': uZIndex}" @touchmove.stop.prevent="() => {}">
+		<view class="u-inner">
+			<image class="u-error-icon" :src="image" mode="widthFix"></image>
+			<view class="u-tips">
+				{{tips}}
+			</view>
+			<!-- 只有APP平台，才能跳转设置页，因为需要调用plus环境 -->
+			<!-- #ifdef APP-PLUS -->
+			<view class="u-to-setting">
+				请检查网络，或前往<text class="u-setting-btn" @tap="openSettings">设置</text>
+			</view>
+			<!-- #endif -->
+			<view class="u-retry" :hover-stay-time="150" @tap="retry" hover-class="u-retry-hover">
+				重试
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * noNetwork 无网络提示
+	 * @description 该组件无需任何配置，引入即可，内部自动处理所有功能和事件。
+	 * @tutorial https://www.uviewui.com/components/noNetwork.html
+	 * @property {String} tips 没有网络时的提示语（默认哎呀，网络信号丢失）
+	 * @property {String Number} zIndex 组件的z-index值（默认1080）
+	 * @property {String} image 无网络的图片提示，可用的src地址或base64图片
+	 * @event {Function} retry 用户点击页面的"重试"按钮时触发
+	 * @example <u-no-network></u-no-network>
+	 */
+	export default {
+		name: "u-no-network",
+		props: {
+			// 页面文字提示
+			tips: {
+				type: String,
+				default: '哎呀，网络信号丢失'
+			},
+			// 一个z-index值，用于设置没有网络这个组件的层次，因为页面可能会有其他定位的元素层级过高，导致此组件被覆盖
+			zIndex: {
+				type: [Number, String],
+				default: ''
+			},
+			// image 没有网络的图片提示
+			image: {
+				type: String,
+				default: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAEYCAMAAABFglBLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6M0U3MjVFMzQwNEY1MTFFQUE4MTNDOUEzMTVBREMxQjIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6M0U3MjVFMzUwNEY1MTFFQUE4MTNDOUEzMTVBREMxQjIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDozRTcyNUUzMjA0RjUxMUVBQTgxM0M5QTMxNUFEQzFCMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozRTcyNUUzMzA0RjUxMUVBQTgxM0M5QTMxNUFEQzFCMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PkHIU9QAAAMAUExURdHW2OWiou7u7tve4dnc3/vw8N3g4sPCwvjn5+jo6M7Q0u6+vtyEhPXY2Li+wuikpPXW1uXo6dba3Pbg4Na5u+qurqqyt/HJydjb3fjo6LrAxO7Bwey1td6MjOrs7fbc3OTn6Maytf7+/vz19eqqqrzCxvzz87a8wLO6vuqxsf78/PDFxenr7L/FyNTY26+2u/z09MjMzqy0udnZ2dvb27G4vMjN0O7v8P339+Ll5u3v8NDS1ODj5frt7bC3vP76+u24uOKamtTW2MTIy9zc3N7e3vPQ0OCTk8DGyfDDw9LR0c7S1LussNbY2fPOztLU1cLHyrK6vvji4vrv78bKzPX29/np6crP0vjk5Ozu78bLzuepqczR1MHFyMDEyOq1tfTS0vP09cLIy9DU173Ex8bGxvHy88/U18vO0LK4vM7OzsTKzcPJzPLMzM/T1sbMz8HJy+7FxbW8wNTW18XKzvb3+MjLzczP0d3e3+Dh4r3Dxtna29zd3rK5vdPU1cfM0Prq6uOenuPm58HGyfHz8/ro6Lq/w8nO0bzCxcrKytjZ2uXm5vTU1LvBxbW7v+rp6eefn/39/eLi4u3t7Ozs7Pj4+Pr6+vX19fHx8erq6vPz8+Xl5ff39+fn5/v7+/z8/PLx8fX09Pb29ri4uOTk5PHw8OPj4/Py8ubm5vn5+e3s7Pb19fTz8/f29tfX1+7t7cvQ0+zr6/Ly8u3t7fr5+efm5quzuOvq6vT19uvr6/j5+a61uuy6uvb39/T09Ojn5+jq6621uvn6+t/i5KyzuPn4+Le+wvv6+s3S1fj4+fDw8OHk5vv7/Pr7++Xk5LS7v7y8vObl5fz9/ff4+OTj48DEx8XJy+Hk5euysu/x8re9wfn5+v38/Pv8/Pr6++vt7uLi4+Pi4ubl5uXk5dPV1tbV1fHMzNPX2e7u7ejn6PT19fX19PDw7/b29f39/vnr6+Hh4a+3u+7t7q61uePi48PHyf35+enp6fLz9PPz8qmxtuDg4N/f3/Dv7////////1cfN/UAAAEAdFJOU////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////wBT9wclAAAlqElEQVR42uydCXwUVZrAk5CEJBAQshACCGyjIRwBJR0It6JBGZZBkRtm5PBgFXAXHBghqAMz6LjGTrd9n7lvwn0JQhARxYNxVJTMwcwOM+7uzK6Z3VXcrnTXVr2q6q7urrvfq26c+n4egXTSVfXv993veym4JkklKdoj0IBoogHRgGiiAdGAaKIB0YBoogHRgGiiAdFEA6IBUVuwx+vqet/v1YAkhxwmcNT9gvjnsAYkGcT7eN1TtThe+1TdL2o1IEkg+rrvUV90MF9oQBIqv6ijF4a3d51XA5J4jVVXx3z587ojGpDEm/QwkO9pQJJB2CvksAYk8fJUXT31xZG63ppRTwI5QgcgR35Rd1MDkgxSX1f31P33P1V3i3u936HUyc3edWSsjuEakKRRW3r9kVv+JrRsrwbklpKTnXs+z0wfONOtAUm8rJu55oqfkZ0TOzUgCZS3Zh7s54+S5RqQhNGYMsnPISkakCSiQcjkNzUgasvUDaVsBF1fb9GXd//B0ziliPzjEA2IujLqGRaMST+cawgLNpn4q30aEDV1Va+dYRqzNy00RMoYUmdpQNTzcb8sCtuKH8w9Z4iWLuIbVzQgapmOBedDOO6c0WjgENK2vKwBUUUmvBSiUbrqxwZuOU18d5MGhEe/dI6a2WvIxA0HX1hfvH7V8gUpA9Mz3x/VuVTRLxvwdAhH5aJjBj4hv39QAxIl743ITHm6azBPnOCfVLwlc6pR3upYFbLjvIuDlEUqRYZo38JYS4gVt5rNZhMQO46byksoMeG4w8QIjtvMpJA/wP1EdZ0bKvkitkh555mBA3zSLnBlSFnNnlJvEJJ95ItW3pJAamvtZhy3m/T0g7fhthJGiG+EviYgmEJ/wHFP6GsbnlZSoicoucxmGwHVguPTBz543C9LHky/Jnql1w5KxWGo8KsThsAFYneYMOb5mlnP11ZCrwOPjfgGI8RqsZuZtUOsFmbllFhZP+zEbc8vGcqzMibv7qos3rd7Mg+TrQv2vCVkiLYc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"
+			}
+		},
+		data() {
+			return {
+				isConnected: true, // 是否有网络连接
+				networkType: "none", // 网络类型
+			}
+		},
+		computed: {
+			uZIndex() {
+				return this.zIndex ? this.zIndex : this.$u.zIndex.noNetwork;
+			}
+		},
+		mounted() {
+			this.isIOS = (uni.getSystemInfoSync().platform === 'ios');
+			uni.onNetworkStatusChange((res) => {
+				this.isConnected = res.isConnected;
+				this.networkType = res.networkType;
+			});
+			uni.getNetworkType({
+				success: (res) => {
+					this.networkType = res.networkType;
+					if (res.networkType == 'none') {
+						this.isConnected = false;
+					} else {
+						this.isConnected = true;
+					}
+				}
+			});
+		},
+		methods: {
+			retry() {
+				// 重新检查网络
+				uni.getNetworkType({
+					success: (res) => {
+						this.networkType = res.networkType;
+						if (res.networkType == 'none') {
+							uni.showToast({
+								title: '无网络连接',
+								icon: 'none',
+								position: 'top'
+							})
+							this.isConnected = false;
+						} else {
+							uni.showToast({
+								title: '网络已连接',
+								icon: 'none',
+								position: 'top'
+							})
+							this.isConnected = true;
+						}
+					}
+				});
+				this.$emit('retry');
+			},
+			async openSettings() {
+				if (this.networkType == "none") {
+					this.openSystemSettings();
+					return;
+				}
+			},
+			openAppSettings() {
+				this.gotoAppSetting();
+			},
+			openSystemSettings() {
+				// 以下方法来自5+范畴，如需深究，请自行查阅相关文档
+				// https://ask.dcloud.net.cn/docs/
+				if (this.isIOS) {
+					this.gotoiOSSetting();
+				} else {
+					this.gotoAndroidSetting();
+				}
+			},
+			network() {
+				var result = null;
+				var cellularData = plus.ios.newObject("CTCellularData");
+				var state = cellularData.plusGetAttribute("restrictedState");
+				if (state == 0) {
+					result = null;
+				} else if (state == 2) {
+					result = 1;
+				} else if (state == 1) {
+					result = 2;
+				}
+				plus.ios.deleteObject(cellularData);
+				return result;
+			},
+			gotoAppSetting() {
+				if (this.isIOS) {
+					var UIApplication = plus.ios.import("UIApplication");
+					var application2 = UIApplication.sharedApplication();
+					var NSURL2 = plus.ios.import("NSURL");
+					var setting2 = NSURL2.URLWithString("app-settings:");
+					application2.openURL(setting2);
+					plus.ios.deleteObject(setting2);
+					plus.ios.deleteObject(NSURL2);
+					plus.ios.deleteObject(application2);
+				} else {
+					var Intent = plus.android.importClass("android.content.Intent");
+					var Settings = plus.android.importClass("android.provider.Settings");
+					var Uri = plus.android.importClass("android.net.Uri");
+					var mainActivity = plus.android.runtimeMainActivity();
+					var intent = new Intent();
+					intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+					var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
+					intent.setData(uri);
+					mainActivity.startActivity(intent);
+				}
+			},
+			gotoiOSSetting() {
+				var UIApplication = plus.ios.import("UIApplication");
+				var application2 = UIApplication.sharedApplication();
+				var NSURL2 = plus.ios.import("NSURL");
+				var setting2 = NSURL2.URLWithString("App-prefs:root=General");
+				application2.openURL(setting2);
+				plus.ios.deleteObject(setting2);
+				plus.ios.deleteObject(NSURL2);
+				plus.ios.deleteObject(application2);
+			},
+			gotoAndroidSetting() {
+				var Intent = plus.android.importClass("android.content.Intent");
+				var Settings = plus.android.importClass("android.provider.Settings");
+				var mainActivity = plus.android.runtimeMainActivity();
+				var intent = new Intent(Settings.ACTION_SETTINGS);
+				mainActivity.startActivity(intent);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-no-network {
+		background-color: #fff;
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.u-inner {
+		height: 100vh;
+		@include vue-flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		margin-top: -15%;
+	}
+
+	.u-tips {
+		color: $u-tips-color;
+		font-size: 28rpx;
+		padding: 30rpx 0;
+	}
+
+	.u-error-icon {
+		width: 300rpx;
+	}
+
+	.u-to-setting {
+		color: $u-light-color;
+		font-size: 26rpx;
+	}
+
+	.u-setting-btn {
+		font-size: 26rpx;
+		color: $u-type-primary;
+	}
+
+	.u-retry {
+		margin-top: 30rpx;
+		border: 1px solid $u-tips-color;
+		color: $u-tips-color;
+		font-size: 28rpx;
+		padding: 6rpx 30rpx;
+		border-radius: 3px;
+	}
+
+	.u-retry-hover {
+		color: #fff;
+		background-color: $u-tips-color;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-notice-bar/u-notice-bar.vue b/uni_modules/vk-uview-ui/components/u-notice-bar/u-notice-bar.vue
new file mode 100644
index 0000000..f5a05a2
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-notice-bar/u-notice-bar.vue
@@ -0,0 +1,273 @@
+<template>
+	<view class="u-notice-bar-wrap" v-if="isShow" :style="{
+		borderRadius: borderRadius + 'rpx',
+	}">
+		<block v-if="mode == 'horizontal' && isCircular">
+			<u-row-notice
+				:type="type"
+				:color="color"
+				:bgColor="bgColor"
+				:list="list"
+				:volumeIcon="volumeIcon"
+				:moreIcon="moreIcon"
+				:volumeSize="volumeSize"
+				:closeIcon="closeIcon"
+				:mode="mode"
+				:fontSize="fontSize"
+				:speed="speed"
+				:playState="playState"
+				:padding="padding"
+				@getMore="getMore"
+				@close="close"
+				@click="click"
+			></u-row-notice>
+		</block>
+		<block v-if="mode == 'vertical' || (mode == 'horizontal' && !isCircular)">
+			<u-column-notice
+				:type="type"
+				:color="color"
+				:bgColor="bgColor"
+				:list="list"
+				:volumeIcon="volumeIcon"
+				:moreIcon="moreIcon"
+				:closeIcon="closeIcon"
+				:mode="mode"
+				:volumeSize="volumeSize"
+				:disable-touch="disableTouch"
+				:fontSize="fontSize"
+				:duration="duration"
+				:playState="playState"
+				:padding="padding"
+				@getMore="getMore"
+				@close="close"
+				@click="click"
+				@end="end"
+			></u-column-notice>
+		</block>
+	</view>
+</template>
+<script>
+/**
+ * noticeBar 滚动通知
+ * @description 该组件用于滚动通告场景，有多种模式可供选择
+ * @tutorial https://www.uviewui.com/components/noticeBar.html
+ * @property {Array} list 滚动内容，数组形式，见上方说明
+ * @property {String} type 显示的主题（默认warning）
+ * @property {Boolean} volume-icon 是否显示小喇叭图标（默认true）
+ * @property {Boolean} more-icon 是否显示右边的向右箭头（默认false）
+ * @property {Boolean} close-icon 是否显示关闭图标（默认false）
+ * @property {Boolean} autoplay 是否自动播放（默认true）
+ * @property {String} color 文字颜色
+ * @property {String Number} bg-color 背景颜色
+ * @property {String} mode 滚动模式（默认horizontal）
+ * @property {Boolean} show 是否显示（默认true）
+ * @property {String Number} font-size 字体大小，单位rpx（默认28）
+ * @property {String Number} volume-size 左边喇叭的大小（默认34）
+ * @property {String Number} duration 滚动周期时长，只对步进模式有效，横向衔接模式无效，单位ms（默认2000）
+ * @property {String Number} speed 水平滚动时的滚动速度，即每秒移动多少距离，只对水平衔接方式有效，单位rpx（默认160）
+ * @property {String Number} font-size 字体大小，单位rpx（默认28）
+ * @property {Boolean} is-circular mode为horizontal时，指明是否水平衔接滚动（默认true）
+ * @property {String} play-state 播放状态，play - 播放，paused - 暂停（默认play）
+ * @property {String Number} border-radius 通知栏圆角（默认为0）
+ * @property {String Number} padding 内边距，字符串，与普通的内边距css写法一直（默认"18rpx 24rpx"）
+ * @property {Boolean} no-list-hidden 列表为空时，是否显示组件（默认false）
+ * @property {Boolean} disable-touch 是否禁止通过手动滑动切换通知，只有mode = vertical，或者mode = horizontal且is-circular = false时有效（默认true）
+ * @event {Function} click 点击通告文字触发，只有mode = vertical，或者mode = horizontal且is-circular = false时有效
+ * @event {Function} close 点击右侧关闭图标触发
+ * @event {Function} getMore 点击右侧向右图标触发
+ * @event {Function} end 列表的消息每次被播放一个周期时触发，只有mode = vertical，或者mode = horizontal且is-circular = false时有效
+ * @example <u-notice-bar :more-icon="true" :list="list"></u-notice-bar>
+ */
+export default {
+	name: "u-notice-bar",
+  emits: ["click", "close", "getMore", "end"],
+	props: {
+		// 显示的内容，数组
+		list: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 显示的主题，success|error|primary|info|warning
+		type: {
+			type: String,
+			default: 'warning'
+		},
+		// 是否显示左侧的音量图标
+		volumeIcon: {
+			type: Boolean,
+			default: true
+		},
+		// 音量喇叭的大小
+		volumeSize: {
+			type: [Number, String],
+			default: 34
+		},
+		// 是否显示右侧的右箭头图标
+		moreIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示右侧的关闭图标
+		closeIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 是否自动播放
+		autoplay: {
+			type: Boolean,
+			default: true
+		},
+		// 文字颜色，各图标也会使用文字颜色
+		color: {
+			type: String,
+			default: ''
+		},
+		// 背景颜色
+		bgColor: {
+			type: String,
+			default: ''
+		},
+		// 滚动方向，horizontal-水平滚动，vertical-垂直滚动
+		mode: {
+			type: String,
+			default: 'horizontal'
+		},
+		// 是否显示
+		show: {
+			type: Boolean,
+			default: true
+		},
+		// 字体大小，单位rpx
+		fontSize: {
+			type: [Number, String],
+			default: 28
+		},
+		// 滚动一个周期的时间长，单位ms
+		duration: {
+			type: [Number, String],
+			default: 2000
+		},
+		// 水平滚动时的滚动速度，即每秒滚动多少rpx，这有利于控制文字无论多少时，都能有一个恒定的速度
+		speed: {
+			type: [Number, String],
+			default: 160
+		},
+		// 水平滚动时，是否采用衔接形式滚动
+		// 水平衔接模式，采用的是swiper组件，水平滚动
+		isCircular: {
+			type: Boolean,
+			default: true
+		},
+		// 播放状态，play-播放，paused-暂停
+		playState: {
+			type: String,
+			default: 'play'
+		},
+		// 是否禁止用手滑动切换
+		// 目前HX2.6.11，只支持App 2.5.5+、H5 2.5.5+、支付宝小程序、字节跳动小程序
+		disableTouch: {
+			type: Boolean,
+			default: true
+		},
+		// 滚动通知设置圆角
+		borderRadius: {
+			type: [Number, String],
+			default: 0
+		},
+		// 通知的边距
+		padding: {
+			type: [Number, String],
+			default: '18rpx 24rpx'
+		},
+		// list列表为空时，是否显示组件
+		noListHidden: {
+			type: Boolean,
+			default: true
+		}
+	},
+	computed: {
+		// 如果设置show为false，或者设置了noListHidden为true，且list长度又为零的话，隐藏组件
+		isShow() {
+			if(this.show == false || (this.noListHidden == true && this.list.length == 0)) return false;
+			else return true;
+		}
+	},
+	methods: {
+		// 点击通告栏
+		click(index) {
+			this.$emit('click', index);
+		},
+		// 点击关闭按钮
+		close() {
+			this.$emit('close');
+		},
+		// 点击更多箭头按钮
+		getMore() {
+			this.$emit('getMore');
+		},
+		// 滚动一个周期结束，只对垂直，或者水平步进形式有效
+		end() {
+			this.$emit('end');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-notice-bar-wrap {
+	overflow: hidden;
+}
+
+.u-notice-bar {
+	padding: 18rpx 24rpx;
+	overflow: hidden;
+}
+
+.u-direction-row {
+	@include vue-flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.u-left-icon {
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-notice-box {
+	flex: 1;
+	@include vue-flex;
+	overflow: hidden;
+	margin-left: 12rpx;
+}
+
+.u-right-icon {
+	margin-left: 12rpx;
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-notice-content {
+	line-height: 1;
+	white-space: nowrap;
+	font-size: 26rpx;
+	animation: u-loop-animation 10s linear infinite both;
+	text-align: right;
+	// 这一句很重要，为了能让滚动左右连接起来
+	padding-left: 100%;
+}
+
+@keyframes u-loop-animation {
+	0% {
+		transform: translate3d(0, 0, 0);
+	}
+
+	100% {
+		transform: translate3d(-100%, 0, 0);
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-number-box/u-number-box.vue b/uni_modules/vk-uview-ui/components/u-number-box/u-number-box.vue
new file mode 100644
index 0000000..6ceecfc
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-number-box/u-number-box.vue
@@ -0,0 +1,476 @@
+<!-- 步进器 -->
+<template>
+	<view class="u-numberbox">
+		<view
+			class="u-icon-minus"
+			@touchstart.prevent="btnTouchStart('minus')"
+			@touchend.stop.prevent="clearTimer"
+			:class="{ 'u-icon-disabled': disabled || inputVal <= min }"
+			:style="{
+				background: bgColor,
+				height: inputHeight + 'rpx',
+				color: color,
+				fontSize: size + 'rpx',
+				minHeight: '1.4em'
+			}"
+		>
+			<view :style="'font-size:' + (Number(size) + 10) + 'rpx'" class="num-btn">－</view>
+		</view>
+		<input
+			:disabled="disabledInput || disabled"
+			:cursor-spacing="getCursorSpacing"
+			:class="{ 'u-input-disabled': disabled }"
+			v-model="inputVal"
+			class="u-number-input"
+			@blur="onBlur"
+			type="number"
+			:style="{
+				color: color,
+				fontSize: size + 'rpx',
+				background: bgColor,
+				height: inputHeight + 'rpx',
+				width: inputWidth + 'rpx'
+			}"
+		/>
+		<view
+			class="u-icon-plus"
+			@touchstart.prevent="btnTouchStart('plus')"
+			@touchend.stop.prevent="clearTimer"
+			:class="{ 'u-icon-disabled': disabled || inputVal >= max }"
+			:style="{
+				background: bgColor,
+				height: inputHeight + 'rpx',
+				color: color,
+				fontSize: size + 'rpx',
+				minHeight: '1.4em'
+			}"
+		>
+			<view :style="'font-size:' + (Number(size) + 10) + 'rpx'" class="num-btn">＋</view>
+		</view>
+	</view>
+</template>
+<script>
+/**
+ * numberBox 步进器
+ * @description 该组件一般用于商城购物选择物品数量的场景。注意：该输入框只能输入大于或等于0的整数，不支持小数输入
+ * @tutorial https://www.uviewui.com/components/numberBox.html
+ * @property {Number} value 输入框初始值（默认1）
+ * @property {String} bg-color 输入框和按钮的背景颜色（默认#F2F3F5）
+ * @property {Number} min 用户可输入的最小值（默认0）
+ * @property {Number} max 用户可输入的最大值（默认99999）
+ * @property {Number} step 步长，每次加或减的值（默认1）
+ * @property {Number} stepFirst 步进值，首次增加或最后减的值(默认step值和一致）
+ * @property {Boolean} disabled 是否禁用操作，禁用后无法加减或手动修改输入框的值（默认false）
+ * @property {Boolean} disabled-input 是否禁止输入框手动输入值（默认false）
+ * @property {Boolean} positive-integer 是否只能输入正整数（默认true）
+ * @property {String | Number} size 输入框文字和按钮字体大小，单位rpx（默认26）
+ * @property {String} color 输入框文字和加减按钮图标的颜色（默认#323233）
+ * @property {String | Number} input-width 输入框宽度，单位rpx（默认80）
+ * @property {String | Number} input-height 输入框和按钮的高度，单位rpx（默认50）
+ * @property {String | Number} index 事件回调时用以区分当前发生变化的是哪个输入框
+ * @property {Boolean} long-press 是否开启长按连续递增或递减(默认true)
+ * @property {String | Number} press-time 开启长按触发后，每触发一次需要多久，单位ms(默认250)
+ * @property {String | Number} cursor-spacing 指定光标于键盘的距离，避免键盘遮挡输入框，单位rpx（默认200）
+ * @event {Function} change 输入框内容发生变化时触发，对象形式
+ * @event {Function} blur 输入框失去焦点时触发，对象形式
+ * @event {Function} minus 点击减少按钮时触发(按钮可点击情况下)，对象形式
+ * @event {Function} plus 点击增加按钮时触发(按钮可点击情况下)，对象形式
+ * @example <u-numberbox :min="1" :max="100"></u-numberbox>
+ */
+export default {
+	name: "u-numberbox",
+	emits: ["update:modelValue", "input", "change", "blur", "plus", "minus"],
+	props: {
+		// 预显示的数字
+		value: {
+			type: Number,
+			default: 1
+		},
+		modelValue: {
+			type: Number,
+			default: 1
+		},
+		// 背景颜色
+		bgColor: {
+			type: String,
+			default: "#F2F3F5"
+		},
+		// 最小值
+		min: {
+			type: Number,
+			default: 0
+		},
+		// 最大值
+		max: {
+			type: Number,
+			default: 99999
+		},
+		// 步进值，每次加或减的值
+		step: {
+			type: Number,
+			default: 1
+		},
+		// 步进值，首次增加或最后减的值
+		stepFirst: {
+			type: Number,
+			default: 0
+		},
+		// 是否只能输入 step 的倍数
+		stepStrictly: {
+			type: Boolean,
+			default: false
+		},
+		// 是否禁用加减操作
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// input的字体大小，单位rpx
+		size: {
+			type: [Number, String],
+			default: 26
+		},
+		// 加减图标的颜色
+		color: {
+			type: String,
+			default: "#323233"
+		},
+		// input宽度，单位rpx
+		inputWidth: {
+			type: [Number, String],
+			default: 80
+		},
+		// input高度，单位rpx
+		inputHeight: {
+			type: [Number, String],
+			default: 50
+		},
+		// index索引，用于列表中使用，让用户知道是哪个numberbox发生了变化，一般使用for循环出来的index值即可
+		index: {
+			type: [Number, String],
+			default: ""
+		},
+		// 是否禁用输入框，与disabled作用于输入框时，为OR的关系，即想要禁用输入框，又可以加减的话
+		// 设置disabled为false，disabledInput为true即可
+		disabledInput: {
+			type: Boolean,
+			default: false
+		},
+		// 输入框于键盘之间的距离
+		cursorSpacing: {
+			type: [Number, String],
+			default: 100
+		},
+		// 是否开启长按连续递增或递减
+		longPress: {
+			type: Boolean,
+			default: true
+		},
+		// 开启长按触发后，每触发一次需要多久
+		pressTime: {
+			type: [Number, String],
+			default: 250
+		},
+		// 是否只能输入大于或等于0的整数(正整数)
+		positiveInteger: {
+			type: Boolean,
+			default: true
+		}
+	},
+	watch: {
+		valueCom(v1, v2) {
+			// 只有value的改变是来自外部的时候，才去同步inputVal的值，否则会造成循环错误
+			if (!this.changeFromInner) {
+				this.inputVal = v1;
+				// 因为inputVal变化后，会触发this.handleChange()，在其中changeFromInner会再次被设置为true，
+				// 造成外面修改值，也导致被认为是内部修改的混乱，这里进行this.$nextTick延时，保证在运行周期的最后处
+				// 将changeFromInner设置为false
+				this.$nextTick(function() {
+					this.changeFromInner = false;
+				});
+			}
+		},
+		inputVal(v1, v2) {
+			// 为了让用户能够删除所有输入值，重新输入内容，删除所有值后，内容为空字符串
+			if (v1 == "") return;
+			let value = 0;
+			// 首先判断是否数值，并且在min和max之间，如果不是，使用原来值
+			let tmp = this.isNumber(v1);
+			if (tmp && v1 >= this.min && v1 <= this.max) value = v1;
+			else value = v2;
+			// 判断是否只能输入大于等于0的整数
+			if (this.positiveInteger) {
+				// 小于0，或者带有小数点，
+				if (v1 < 0 || String(v1).indexOf(".") !== -1) {
+					value = v2;
+					// 双向绑定input的值，必须要使用$nextTick修改显示的值
+					this.$nextTick(() => {
+						this.inputVal = v2;
+					});
+				}
+			}
+			// 发出change事件
+			this.handleChange(value, "change");
+		},
+		min(v1) {
+			if (v1 !== undefined && v1 != "" && this.valueCom < v1) {
+				this.$emit("input", v1);
+			}
+		},
+		max(v1) {
+			if (v1 !== undefined && v1 != "" && this.valueCom > v1) {
+				this.$emit("input", v1);
+			}
+		}
+	},
+	data() {
+		return {
+			inputVal: 1, // 输入框中的值，不能直接使用props中的value，因为应该改变props的状态
+			timer: null, // 用作长按的定时器
+			changeFromInner: false, // 值发生变化，是来自内部还是外部
+			innerChangeTimer: null, // 内部定时器
+		};
+	},
+	created() {
+		this.inputVal = Number(this.valueCom);
+	},
+	mounted() {
+
+	},
+	computed: {
+		getCursorSpacing() {
+			// 先将值转为px单位，再转为数值
+			return Number(uni.upx2px(this.cursorSpacing));
+		},
+		valueCom(){
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		}
+	},
+	methods: {
+		// 点击退格键
+		btnTouchStart(callback) {
+			// 先执行一遍方法，否则会造成松开手时，就执行了clearTimer，导致无法实现功能
+			this[callback]();
+			// 如果没开启长按功能，直接返回
+			if (!this.longPress) return;
+			clearInterval(this.timer); //再次清空定时器，防止重复注册定时器
+			this.timer = null;
+			this.timer = setInterval(() => {
+				// 执行加或减函数
+				this[callback]();
+			}, this.pressTime);
+		},
+		clearTimer() {
+			this.$nextTick(() => {
+				clearInterval(this.timer);
+				this.timer = null;
+			});
+		},
+		minus() {
+			this.computeVal("minus");
+		},
+		plus() {
+			this.computeVal("plus");
+		},
+		// 为了保证小数相加减出现精度溢出的问题
+		calcPlus(num1, num2) {
+			let baseNum, baseNum1, baseNum2;
+			try {
+				baseNum1 = num1.toString().split(".")[1].length;
+			} catch (e) {
+				baseNum1 = 0;
+			}
+			try {
+				baseNum2 = num2.toString().split(".")[1].length;
+			} catch (e) {
+				baseNum2 = 0;
+			}
+			baseNum = Math.pow(10, Math.max(baseNum1, baseNum2));
+			let precision = baseNum1 >= baseNum2 ? baseNum1 : baseNum2; //精度
+			return ((num1 * baseNum + num2 * baseNum) / baseNum).toFixed(precision);
+		},
+		// 为了保证小数相加减出现精度溢出的问题
+		calcMinus(num1, num2) {
+			let baseNum, baseNum1, baseNum2;
+			try {
+				baseNum1 = num1.toString().split(".")[1].length;
+			} catch (e) {
+				baseNum1 = 0;
+			}
+			try {
+				baseNum2 = num2.toString().split(".")[1].length;
+			} catch (e) {
+				baseNum2 = 0;
+			}
+			baseNum = Math.pow(10, Math.max(baseNum1, baseNum2));
+			let precision = baseNum1 >= baseNum2 ? baseNum1 : baseNum2;
+			return ((num1 * baseNum - num2 * baseNum) / baseNum).toFixed(precision);
+		},
+		computeVal(type) {
+			uni.hideKeyboard();
+			if (this.disabled) return;
+			let value = 0;
+			// 新增stepFirst开始
+			// 减
+			if (type === "minus") {
+				if (this.stepFirst > 0 && this.inputVal == this.stepFirst) {
+					value = this.min;
+				} else {
+					value = this.calcMinus(this.inputVal, this.step);
+				}
+			} else if (type === "plus") {
+				if (this.stepFirst > 0 && this.inputVal < this.stepFirst) {
+					value = this.stepFirst;
+				} else {
+					value = this.calcPlus(this.inputVal, this.step);
+				}
+			}
+			if (this.stepStrictly) {
+				let strictly = value % this.step;
+				if (strictly > 0) {
+					value -= strictly;
+				}
+				if (this.stepFirst > 0 && value > 0 && value < this.stepFirst) {
+					if (type === "minus") {
+						value = 0;
+					} else if (type === "plus") {
+						value = this.stepFirst + (this.step - (this.stepFirst % this.step));
+					}
+				}
+			}
+			if (value > this.max) {
+				value = this.max;
+			} else if (value < this.min) {
+				value = this.min;
+			}
+			// 新增stepFirst结束
+			this.inputVal = value;
+			this.handleChange(value, type);
+		},
+		// 处理用户手动输入的情况
+		onBlur(event) {
+			let val = 0;
+			let value = event.detail.value;
+			// 如果为非0-9数字组成，或者其第一位数值为0，直接让其等于min值
+			// 这里不直接判断是否正整数，是因为用户传递的props min值可能为0
+			if (!/(^\d+$)/.test(value) || value[0] == 0) val = this.min;
+			val = +value;
+
+			// 新增stepFirst开始
+			if (this.stepFirst > 0 && this.inputVal < this.stepFirst && this.inputVal > 0) {
+				val = this.stepFirst;
+			}
+			// 新增stepFirst结束
+			if (this.stepStrictly) {
+				let strictly = val % this.step;
+				if (strictly > 0) {
+					val -= strictly;
+				}
+				if (this.stepFirst > 0 && val > 0 && val < this.stepFirst) {
+					val = this.stepFirst + (this.step - (this.stepFirst % this.step));
+				}
+			}
+			if (val > this.max) {
+				val = this.max;
+			} else if (val < this.min) {
+				val = this.min;
+			}
+			this.$nextTick(() => {
+				this.inputVal = val;
+			});
+			this.handleChange(val, "blur");
+		},
+		handleChange(value, type) {
+			if (this.disabled) return;
+			// 清除定时器，避免造成混乱
+			if (this.innerChangeTimer) {
+				clearTimeout(this.innerChangeTimer);
+				this.innerChangeTimer = null;
+			}
+			// 发出input事件，修改通过v-model绑定的值，达到双向绑定的效果
+			this.changeFromInner = true;
+			// 一定时间内，清除changeFromInner标记，否则内部值改变后
+			// 外部通过程序修改value值，将会无效
+			this.innerChangeTimer = setTimeout(() => {
+				this.changeFromInner = false;
+			}, 150);
+			this.$emit("input", Number(value));
+			this.$emit("update:modelValue", Number(value));
+			this.$emit(type, {
+				// 转为Number类型
+				value: Number(value),
+				index: this.index
+			});
+		},
+		/**
+		 * 验证十进制数字
+		 */
+		isNumber(value) {
+			return /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(value);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.u-numberbox {
+	display: inline-flex;
+	align-items: center;
+}
+
+.u-number-input {
+	position: relative;
+	text-align: center;
+	padding: 0;
+	margin: 0 6rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.u-icon-plus,
+.u-icon-minus {
+	width: 60rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.u-icon-plus {
+	border-radius: 0 8rpx 8rpx 0;
+}
+
+.u-icon-minus {
+	border-radius: 8rpx 0 0 8rpx;
+}
+
+.u-icon-disabled {
+	color: #c8c9cc !important;
+	background: #f7f8fa !important;
+}
+
+.u-input-disabled {
+	color: #c8c9cc !important;
+	background-color: #f2f3f5 !important;
+}
+/* #ifdef H5 */
+.num-btn {
+	font-weight: 550;
+	position: relative;
+	top: -4rpx;
+}
+/* #endif */
+/* #ifndef H5 */
+.num-btn {
+	font-weight: 550;
+	position: relative;
+	top: 0rpx;
+}
+/* #endif */
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-number-keyboard/u-number-keyboard.vue b/uni_modules/vk-uview-ui/components/u-number-keyboard/u-number-keyboard.vue
new file mode 100644
index 0000000..f2d90f2
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-number-keyboard/u-number-keyboard.vue
@@ -0,0 +1,170 @@
+<template>
+	<view class="u-keyboard" @touchmove.stop.prevent>
+		<view class="u-keyboard-grids">
+			<view
+			    class="u-keyboard-grids-item"
+			    :class="[btnBgGray(index) ? 'u-bg-gray' : '', index <= 2 ? 'u-border-top' : '', index < 9 ? 'u-border-bottom' : '', (index + 1) % 3 != 0 ? 'u-border-right' : '']"
+			    :style="[itemStyle(index)]"
+			    v-for="(item, index) in numList"
+			    :key="index"
+			    :hover-class="hoverClass(index)"
+			    :hover-stay-time="100"
+					@touchstart.stop="keyboardClick(item)"
+			    >
+				<view class="u-keyboard-grids-btn">{{ item }}</view>
+			</view>
+			<view class="u-keyboard-grids-item u-bg-gray" hover-class="u-hover-class" :hover-stay-time="100" @touchstart.stop="backspaceClick"
+			    @touchend="clearTimer">
+				<view class="u-keyboard-back u-keyboard-grids-btn">
+					<u-icon name="backspace" :size="38" :bold="true"></u-icon>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+    name: "u-number-keyboard",
+    emits: ["change", "backspace"],
+		props: {
+			// 键盘的类型，number-数字键盘，card-身份证键盘
+			mode: {
+				type: String,
+				default: 'number'
+			},
+			// 是否显示键盘的"."符号
+			dotEnabled: {
+				type: Boolean,
+				default: true
+			},
+			// 是否打乱键盘按键的顺序
+			random: {
+				type: Boolean,
+				default: false
+			},
+			// 是否开启震动
+			vibrate: {
+				type: Boolean,
+				default: false
+			},
+		},
+		data() {
+			return {
+				backspace: 'backspace', // 退格键内容
+				dot: '.', // 点
+				timer: null, // 长按多次删除的事件监听
+				cardX: 'X' // 身份证的X符号
+			};
+		},
+		computed: {
+			// 键盘需要显示的内容
+			numList() {
+				let tmp = [];
+				if (!this.dotEnabled && this.mode == 'number') {
+					if (!this.random) {
+						return [1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
+					} else {
+						return this.$u.randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, 0]);
+					}
+				} else if (this.dotEnabled && this.mode == 'number') {
+					if (!this.random) {
+						return [1, 2, 3, 4, 5, 6, 7, 8, 9, this.dot, 0];
+					} else {
+						return this.$u.randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, this.dot, 0]);
+					}
+				} else if (this.mode == 'card') {
+					if (!this.random) {
+						return [1, 2, 3, 4, 5, 6, 7, 8, 9, this.cardX, 0];
+					} else {
+						return this.$u.randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, this.cardX, 0]);
+					}
+				}
+			},
+			// 按键的样式，在非乱序&&数字键盘&&不显示点按钮时，index为9时，按键占位两个空间
+			itemStyle() {
+				return index => {
+					let style = {};
+					if (this.mode == 'number' && !this.dotEnabled && index == 9) style.flex = '0 0 66.6666666666%';
+					return style;
+				};
+			},
+			// 是否让按键显示灰色，只在非乱序&&数字键盘&&且允许点按键的时候
+			btnBgGray() {
+				return index => {
+					if (!this.random && index == 9 && (this.mode != 'number' || (this.mode == 'number' && this.dotEnabled))) return true;
+					else return false;
+				};
+			},
+			hoverClass() {
+				return index => {
+					if (!this.random && index == 9 && (this.mode == 'number' && this.dotEnabled || this.mode == 'card')) return 'u-hover-class';
+					else return 'u-keyboard-hover';
+				}
+			}
+		},
+		methods: {
+			// 点击退格键
+			backspaceClick() {
+				let count = 1;
+				this.$emit('backspace', count);
+				clearInterval(this.timer); //再次清空定时器，防止重复注册定时器
+				this.timer = null;
+				this.timer = setInterval(() => {
+					count++;
+					this.$emit('backspace', count);
+				}, 250);
+				if(this.vibrate) uni.vibrateShort();
+			},
+			clearTimer() {
+				clearInterval(this.timer);
+				this.timer = null;
+			},
+			// 获取键盘显示的内容
+			keyboardClick(val) {
+				// 允许键盘显示点模式和触发非点按键时，将内容转为数字类型
+				if (this.dotEnabled && val != this.dot && val != this.cardX) val = Number(val);
+				this.$emit('change', val);
+				if(this.vibrate) uni.vibrateShort();
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-keyboard {
+		position: relative;
+		z-index: 1003;
+	}
+
+	.u-keyboard-grids {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.u-keyboard-grids-item {
+		flex: 0 0 33.3333333333%;
+		text-align: center;
+		font-size: 50rpx;
+		color: #333;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 110rpx;
+		font-weight: 500;
+	}
+
+	.u-bg-gray {
+		background-color: #e7e6eb;
+	}
+
+	.u-keyboard-back {
+		font-size: 36rpx;
+	}
+
+	.u-keyboard-hover {
+		background-color: #e7e6eb;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-parse/libs/CssHandler.js b/uni_modules/vk-uview-ui/components/u-parse/libs/CssHandler.js
new file mode 100644
index 0000000..ad3add0
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-parse/libs/CssHandler.js
@@ -0,0 +1,100 @@
+import cfg from './config.js'
+var isLetter = c => (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+
+function CssHandler(tagStyle) {
+	var styles = Object.assign(Object.create(null), cfg.userAgentStyles);
+	for (var item in tagStyle)
+		styles[item] = (styles[item] ? styles[item] + ';' : '') + tagStyle[item];
+	this.styles = styles;
+}
+CssHandler.prototype.getStyle = function(data) {
+	this.styles = new parser(data, this.styles).parse();
+}
+CssHandler.prototype.match = function(name, attrs) {
+	var tmp, matched = (tmp = this.styles[name]) ? tmp + ';' : '';
+	if (attrs.class) {
+		var items = attrs.class.split(' ');
+		for (var i = 0, item; item = items[i]; i++)
+			if (tmp = this.styles['.' + item])
+				matched += tmp + ';';
+	}
+	if (tmp = this.styles['#' + attrs.id])
+		matched += tmp + ';';
+	return matched;
+}
+export default CssHandler;
+
+function parser(data, init) {
+	this.data = data;
+	this.floor = 0;
+	this.i = 0;
+	this.list = [];
+	this.res = init;
+	this.state = this.Space;
+}
+parser.prototype.parse = function() {
+	for (var c; c = this.data[this.i]; this.i++)
+		this.state(c);
+	return this.res;
+}
+parser.prototype.section = function() {
+	return this.data.substring(this.start, this.i);
+}
+// 状态机
+parser.prototype.Space = function(c) {
+	if (c == '.' || c == '#' || isLetter(c)) {
+		this.start = this.i;
+		this.state = this.Name;
+	} else if (c == '/' && this.data[this.i + 1] == '*')
+		this.Comment();
+	else if (!cfg.blankChar[c] && c != ';')
+		this.state = this.Ignore;
+}
+parser.prototype.Comment = function() {
+	this.i = this.data.indexOf('*/', this.i) + 1;
+	if (!this.i) this.i = this.data.length;
+	this.state = this.Space;
+}
+parser.prototype.Ignore = function(c) {
+	if (c == '{') this.floor++;
+	else if (c == '}' && !--this.floor) {
+		this.list = [];
+		this.state = this.Space;
+	}
+}
+parser.prototype.Name = function(c) {
+	if (cfg.blankChar[c]) {
+		this.list.push(this.section());
+		this.state = this.NameSpace;
+	} else if (c == '{') {
+		this.list.push(this.section());
+		this.Content();
+	} else if (c == ',') {
+		this.list.push(this.section());
+		this.Comma();
+	} else if (!isLetter(c) && (c < '0' || c > '9') && c != '-' && c != '_')
+		this.state = this.Ignore;
+}
+parser.prototype.NameSpace = function(c) {
+	if (c == '{') this.Content();
+	else if (c == ',') this.Comma();
+	else if (!cfg.blankChar[c]) this.state = this.Ignore;
+}
+parser.prototype.Comma = function() {
+	while (cfg.blankChar[this.data[++this.i]]);
+	if (this.data[this.i] == '{') this.Content();
+	else {
+		this.start = this.i--;
+		this.state = this.Name;
+	}
+}
+parser.prototype.Content = function() {
+	this.start = ++this.i;
+	if ((this.i = this.data.indexOf('}', this.i)) == -1) this.i = this.data.length;
+	var content = this.section();
+	for (var i = 0, item; item = this.list[i++];)
+		if (this.res[item]) this.res[item] += ';' + content;
+		else this.res[item] = content;
+	this.list = [];
+	this.state = this.Space;
+}
diff --git a/uni_modules/vk-uview-ui/components/u-parse/libs/MpHtmlParser.js b/uni_modules/vk-uview-ui/components/u-parse/libs/MpHtmlParser.js
new file mode 100644
index 0000000..a829fab
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-parse/libs/MpHtmlParser.js
@@ -0,0 +1,581 @@
+/**
+ * html 解析器
+ * @tutorial https://github.com/jin-yufeng/Parser
+ * @version 20201029
+ * @author JinYufeng
+ * @listens MIT
+ */
+import cfg from './config.js'
+import CssHandler from './CssHandler.js'
+
+var	blankChar = cfg.blankChar
+var	windowWidth = uni.getSystemInfoSync().windowWidth;
+var emoji;
+
+function MpHtmlParser(data, options = {}) {
+	this.attrs = {};
+	this.CssHandler = new CssHandler(options.tagStyle, windowWidth);
+	this.data = data;
+	this.domain = options.domain;
+	this.DOM = [];
+	this.i = this.start = this.audioNum = this.imgNum = this.videoNum = 0;
+	options.prot = (this.domain || '').includes('://') ? this.domain.split('://')[0] : 'http';
+	this.options = options;
+	this.state = this.Text;
+	this.STACK = [];
+	// 工具函数
+	this.bubble = () => {
+		for (var i = this.STACK.length, item; item = this.STACK[--i];) {
+			if (cfg.richOnlyTags[item.name]) return false;
+			item.c = 1;
+		}
+		return true;
+	}
+	this.decode = (val, amp) => {
+		var i = -1,
+			j, en;
+		while (1) {
+			if ((i = val.indexOf('&', i + 1)) == -1) break;
+			if ((j = val.indexOf(';', i + 2)) == -1) break;
+			if (val[i + 1] == '#') {
+				en = parseInt((val[i + 2] == 'x' ? '0' : '') + val.substring(i + 2, j));
+				if (!isNaN(en)) val = val.substr(0, i) + String.fromCharCode(en) + val.substr(j + 1);
+			} else {
+				en = val.substring(i + 1, j);
+				if (cfg.entities[en] || en == amp)
+					val = val.substr(0, i) + (cfg.entities[en] || '&') + val.substr(j + 1);
+			}
+		}
+		return val;
+	}
+	this.getUrl = url => {
+		if (url[0] == '/') {
+			if (url[1] == '/') url = this.options.prot + ':' + url;
+			else if (this.domain) url = this.domain + url;
+		} else if (this.domain && url.indexOf('data:') != 0 && !url.includes('://'))
+			url = this.domain + '/' + url;
+		return url;
+	}
+	this.isClose = () => this.data[this.i] == '>' || (this.data[this.i] == '/' && this.data[this.i + 1] == '>');
+	this.section = () => this.data.substring(this.start, this.i);
+	this.parent = () => this.STACK[this.STACK.length - 1];
+	this.siblings = () => this.STACK.length ? this.parent().children : this.DOM;
+}
+MpHtmlParser.prototype.parse = function() {
+	if (emoji) this.data = emoji.parseEmoji(this.data);
+	for (var c; c = this.data[this.i]; this.i++)
+		this.state(c);
+	if (this.state == this.Text) this.setText();
+	while (this.STACK.length) this.popNode(this.STACK.pop());
+	return this.DOM;
+}
+// 设置属性
+MpHtmlParser.prototype.setAttr = function() {
+	var name = this.attrName.toLowerCase(),
+		val = this.attrVal;
+	if (cfg.boolAttrs[name]) this.attrs[name] = 'T';
+	else if (val) {
+		if (name == 'src' || (name == 'data-src' && !this.attrs.src)) this.attrs.src = this.getUrl(this.decode(val, 'amp'));
+		else if (name == 'href' || name == 'style') this.attrs[name] = this.decode(val, 'amp');
+		else if (name.substr(0, 5) != 'data-') this.attrs[name] = val;
+	}
+	this.attrVal = '';
+	while (blankChar[this.data[this.i]]) this.i++;
+	if (this.isClose()) this.setNode();
+	else {
+		this.start = this.i;
+		this.state = this.AttrName;
+	}
+}
+// 设置文本节点
+MpHtmlParser.prototype.setText = function() {
+	var back, text = this.section();
+	if (!text) return;
+	text = (cfg.onText && cfg.onText(text, () => back = true)) || text;
+	if (back) {
+		this.data = this.data.substr(0, this.start) + text + this.data.substr(this.i);
+		let j = this.start + text.length;
+		for (this.i = this.start; this.i < j; this.i++) this.state(this.data[this.i]);
+		return;
+	}
+	if (!this.pre) {
+		// 合并空白符
+		var flag, tmp = [];
+		for (let i = text.length, c; c = text[--i];)
+			if (!blankChar[c]) {
+				tmp.unshift(c);
+				if (!flag) flag = 1;
+			} else {
+				if (tmp[0] != ' ') tmp.unshift(' ');
+				if (c == '\n' && flag == void 0) flag = 0;
+			}
+		if (flag == 0) return;
+		text = tmp.join('');
+	}
+	this.siblings().push({
+		type: 'text',
+		text: this.decode(text)
+	});
+}
+// 设置元素节点
+MpHtmlParser.prototype.setNode = function() {
+	var node = {
+			name: this.tagName.toLowerCase(),
+			attrs: this.attrs
+		},
+		close = cfg.selfClosingTags[node.name];
+	if (this.options.nodes.length) node.type = 'node';
+	this.attrs = {};
+	if (!cfg.ignoreTags[node.name]) {
+		// 处理属性
+		var attrs = node.attrs,
+			style = this.CssHandler.match(node.name, attrs, node) + (attrs.style || ''),
+			styleObj = {};
+		if (attrs.id) {
+			if (this.options.compress & 1) attrs.id = void 0;
+			else if (this.options.useAnchor) this.bubble();
+		}
+		if ((this.options.compress & 2) && attrs.class) attrs.class = void 0;
+		switch (node.name) {
+			case 'a':
+			case 'ad': // #ifdef APP-PLUS
+			case 'iframe':
+				// #endif
+				this.bubble();
+				break;
+			case 'font':
+				if (attrs.color) {
+					styleObj['color'] = attrs.color;
+					attrs.color = void 0;
+				}
+				if (attrs.face) {
+					styleObj['font-family'] = attrs.face;
+					attrs.face = void 0;
+				}
+				if (attrs.size) {
+					var size = parseInt(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'];
+					styleObj['font-size'] = map[size - 1];
+					attrs.size = void 0;
+				}
+				break;
+			case 'embed':
+				// #ifndef APP-PLUS
+				var src = node.attrs.src || '',
+					type = node.attrs.type || '';
+				if (type.includes('video') || src.includes('.mp4') || src.includes('.3gp') || src.includes('.m3u8'))
+					node.name = 'video';
+				else if (type.includes('audio') || src.includes('.m4a') || src.includes('.wav') || src.includes('.mp3') || src.includes(
+						'.aac'))
+					node.name = 'audio';
+				else break;
+				if (node.attrs.autostart)
+					node.attrs.autoplay = 'T';
+				node.attrs.controls = 'T';
+				// #endif
+				// #ifdef APP-PLUS
+				this.bubble();
+				break;
+				// #endif
+			case 'video':
+			case 'audio':
+				if (!attrs.id) attrs.id = node.name + (++this[`${node.name}Num`]);
+				else this[`${node.name}Num`]++;
+				if (node.name == 'video') {
+					if (this.videoNum > 3)
+						node.lazyLoad = 1;
+					if (attrs.width) {
+						styleObj.width = parseFloat(attrs.width) + (attrs.width.includes('%') ? '%' : 'px');
+						attrs.width = void 0;
+					}
+					if (attrs.height) {
+						styleObj.height = parseFloat(attrs.height) + (attrs.height.includes('%') ? '%' : 'px');
+						attrs.height = void 0;
+					}
+				}
+				if (!attrs.controls && !attrs.autoplay) attrs.controls = 'T';
+				attrs.source = [];
+				if (attrs.src) {
+					attrs.source.push(attrs.src);
+					attrs.src = void 0;
+				}
+				this.bubble();
+				break;
+			case 'td':
+			case 'th':
+				if (attrs.colspan || attrs.rowspan)
+					for (var k = this.STACK.length, item; item = this.STACK[--k];)
+						if (item.name == 'table') {
+							item.flag = 1;
+							break;
+						}
+		}
+		if (attrs.align) {
+			if (node.name == 'table') {
+				if (attrs.align == 'center') styleObj['margin-inline-start'] = styleObj['margin-inline-end'] = 'auto';
+				else styleObj['float'] = attrs.align;
+			} else styleObj['text-align'] = attrs.align;
+			attrs.align = void 0;
+		}
+		// 压缩 style
+		var styles = style.split(';');
+		style = '';
+		for (var i = 0, len = styles.length; i < len; i++) {
+			var info = styles[i].split(':');
+			if (info.length < 2) continue;
+			let key = info[0].trim().toLowerCase(),
+				value = info.slice(1).join(':').trim();
+			if (value[0] == '-' || value.includes('safe'))
+				style += `;${key}:${value}`;
+			else if (!styleObj[key] || value.includes('import') || !styleObj[key].includes('import'))
+				styleObj[key] = value;
+		}
+		if (node.name == 'img') {
+			if (attrs.src && !attrs.ignore) {
+				if (this.bubble())
+					attrs.i = (this.imgNum++).toString();
+				else attrs.ignore = 'T';
+			}
+			if (attrs.ignore) {
+				style += ';-webkit-touch-callout:none';
+				styleObj['max-width'] = '100%';
+			}
+			var width;
+			if (styleObj.width) width = styleObj.width;
+			else if (attrs.width) width = attrs.width.includes('%') ? attrs.width : parseFloat(attrs.width) + 'px';
+			if (width) {
+				styleObj.width = width;
+				attrs.width = '100%';
+				if (parseInt(width) > windowWidth) {
+					styleObj.height = '';
+					if (attrs.height) attrs.height = void 0;
+				}
+			}
+			if (styleObj.height) {
+				attrs.height = styleObj.height;
+				styleObj.height = '';
+			} else if (attrs.height && !attrs.height.includes('%'))
+				attrs.height = parseFloat(attrs.height) + 'px';
+		}
+		for (var key in styleObj) {
+			var value = styleObj[key];
+			if (!value) continue;
+			if (key.includes('flex') || key == 'order' || key == 'self-align') node.c = 1;
+			// 填充链接
+			if (value.includes('url')) {
+				var j = value.indexOf('(');
+				if (j++ != -1) {
+					while (value[j] == '"' || value[j] == "'" || blankChar[value[j]]) j++;
+					value = value.substr(0, j) + this.getUrl(value.substr(j));
+				}
+			}
+			// 转换 rpx
+			else if (value.includes('rpx'))
+				value = value.replace(/[0-9.]+\s*rpx/g, $ => parseFloat($) * windowWidth / 750 + 'px');
+			else if (key == 'white-space' && value.includes('pre') && !close)
+				this.pre = node.pre = true;
+			style += `;${key}:${value}`;
+		}
+		style = style.substr(1);
+		if (style) attrs.style = style;
+		if (!close) {
+			node.children = [];
+			if (node.name == 'pre' && cfg.highlight) {
+				this.remove(node);
+				this.pre = node.pre = true;
+			}
+			this.siblings().push(node);
+			this.STACK.push(node);
+		} else if (!cfg.filter || cfg.filter(node, this) != false)
+			this.siblings().push(node);
+	} else {
+		if (!close) this.remove(node);
+		else if (node.name == 'source') {
+			var parent = this.parent();
+			if (parent && (parent.name == 'video' || parent.name == 'audio') && node.attrs.src)
+				parent.attrs.source.push(node.attrs.src);
+		} else if (node.name == 'base' && !this.domain) this.domain = node.attrs.href;
+	}
+	if (this.data[this.i] == '/') this.i++;
+	this.start = this.i + 1;
+	this.state = this.Text;
+}
+// 移除标签
+MpHtmlParser.prototype.remove = function(node) {
+	var name = node.name,
+		j = this.i;
+	// 处理 svg
+	var handleSvg = () => {
+		var src = this.data.substring(j, this.i + 1);
+		node.attrs.xmlns = 'http://www.w3.org/2000/svg';
+		for (var key in node.attrs) {
+			if (key == 'viewbox') src = ` viewBox="${node.attrs.viewbox}"` + src;
+			else if (key != 'style') src = ` ${key}="${node.attrs[key]}"` + src;
+		}
+		src = '<svg' + src;
+		var parent = this.parent();
+		if (node.attrs.width == '100%' && parent && (parent.attrs.style || '').includes('inline'))
+			parent.attrs.style = 'width:300px;max-width:100%;' + parent.attrs.style;
+		this.siblings().push({
+			name: 'img',
+			attrs: {
+				src: 'data:image/svg+xml;utf8,' + src.replace(/#/g, '%23'),
+				style: node.attrs.style,
+				ignore: 'T'
+			}
+		})
+	}
+	if (node.name == 'svg' && this.data[j] == '/') return handleSvg(this.i++);
+	while (1) {
+		if ((this.i = this.data.indexOf('</', this.i + 1)) == -1) {
+			if (name == 'pre' || name == 'svg') this.i = j;
+			else this.i = this.data.length;
+			return;
+		}
+		this.start = (this.i += 2);
+		while (!blankChar[this.data[this.i]] && !this.isClose()) this.i++;
+		if (this.section().toLowerCase() == name) {
+			// 代码块高亮
+			if (name == 'pre') {
+				this.data = this.data.substr(0, j + 1) + cfg.highlight(this.data.substring(j + 1, this.i - 5), node.attrs) + this.data
+					.substr(this.i - 5);
+				return this.i = j;
+			} else if (name == 'style')
+				this.CssHandler.getStyle(this.data.substring(j + 1, this.i - 7));
+			else if (name == 'title')
+				this.DOM.title = this.data.substring(j + 1, this.i - 7);
+			if ((this.i = this.data.indexOf('>', this.i)) == -1) this.i = this.data.length;
+			if (name == 'svg') handleSvg();
+			return;
+		}
+	}
+}
+// 节点出栈处理
+MpHtmlParser.prototype.popNode = function(node) {
+	// 空白符处理
+	if (node.pre) {
+		node.pre = this.pre = void 0;
+		for (let i = this.STACK.length; i--;)
+			if (this.STACK[i].pre)
+				this.pre = true;
+	}
+	var siblings = this.siblings(),
+		len = siblings.length,
+		childs = node.children;
+	if (node.name == 'head' || (cfg.filter && cfg.filter(node, this) == false))
+		return siblings.pop();
+	var attrs = node.attrs;
+	// 替换一些标签名
+	if (cfg.blockTags[node.name]) node.name = 'div';
+	else if (!cfg.trustTags[node.name]) node.name = 'span';
+	// 处理列表
+	if (node.c && (node.name == 'ul' || node.name == 'ol')) {
+		if ((node.attrs.style || '').includes('list-style:none')) {
+			for (let i = 0, child; child = childs[i++];)
+				if (child.name == 'li')
+					child.name = 'div';
+		} else if (node.name == 'ul') {
+			var floor = 1;
+			for (let i = this.STACK.length; i--;)
+				if (this.STACK[i].name == 'ul') floor++;
+			if (floor != 1)
+				for (let i = childs.length; i--;)
+					childs[i].floor = floor;
+		} else {
+			for (let i = 0, num = 1, child; child = childs[i++];)
+				if (child.name == 'li') {
+					child.type = 'ol';
+					child.num = ((num, type) => {
+						if (type == 'a') return String.fromCharCode(97 + (num - 1) % 26);
+						if (type == 'A') return String.fromCharCode(65 + (num - 1) % 26);
+						if (type == 'i' || type == 'I') {
+							num = (num - 1) % 99 + 1;
+							var one = ['I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX'],
+								ten = ['X', 'XX', 'XXX', 'XL', 'L', 'LX', 'LXX', 'LXXX', 'XC'],
+								res = (ten[Math.floor(num / 10) - 1] || '') + (one[num % 10 - 1] || '');
+							if (type == 'i') return res.toLowerCase();
+							return res;
+						}
+						return num;
+					})(num++, attrs.type) + '.';
+				}
+		}
+	}
+	// 处理表格
+	if (node.name == 'table') {
+		var padding = parseFloat(attrs.cellpadding),
+			spacing = parseFloat(attrs.cellspacing),
+			border = parseFloat(attrs.border);
+		if (node.c) {
+			if (isNaN(padding)) padding = 2;
+			if (isNaN(spacing)) spacing = 2;
+		}
+		if (border) attrs.style = `border:${border}px solid gray;${attrs.style || ''}`;
+		if (node.flag && node.c) {
+			// 有 colspan 或 rowspan 且含有链接的表格转为 grid 布局实现
+			attrs.style = `${attrs.style || ''};${spacing ? `;grid-gap:${spacing}px` : ';border-left:0;border-top:0'}`;
+			var row = 1,
+				col = 1,
+				colNum,
+				trs = [],
+				children = [],
+				map = {};
+			(function f(ns) {
+				for (var i = 0; i < ns.length; i++) {
+					if (ns[i].name == 'tr') trs.push(ns[i]);
+					else f(ns[i].children || []);
+				}
+			})(node.children)
+			for (let i = 0; i < trs.length; i++) {
+				for (let j = 0, td; td = trs[i].children[j]; j++) {
+					if (td.name == 'td' || td.name == 'th') {
+						while (map[row + '.' + col]) col++;
+						var cell = {
+							name: 'div',
+							c: 1,
+							attrs: {
+								style: (td.attrs.style || '') + (border ? `;border:${border}px solid gray` + (spacing ? '' :
+									';border-right:0;border-bottom:0') : '') + (padding ? `;padding:${padding}px` : '')
+							},
+							children: td.children
+						}
+						if (td.attrs.colspan) {
+							cell.attrs.style += ';grid-column-start:' + col + ';grid-column-end:' + (col + parseInt(td.attrs.colspan));
+							if (!td.attrs.rowspan) cell.attrs.style += ';grid-row-start:' + row + ';grid-row-end:' + (row + 1);
+							col += parseInt(td.attrs.colspan) - 1;
+						}
+						if (td.attrs.rowspan) {
+							cell.attrs.style += ';grid-row-start:' + row + ';grid-row-end:' + (row + parseInt(td.attrs.rowspan));
+							if (!td.attrs.colspan) cell.attrs.style += ';grid-column-start:' + col + ';grid-column-end:' + (col + 1);
+							for (var k = 1; k < td.attrs.rowspan; k++) map[(row + k) + '.' + col] = 1;
+						}
+						children.push(cell);
+						col++;
+					}
+				}
+				if (!colNum) {
+					colNum = col - 1;
+					attrs.style += `;grid-template-columns:repeat(${colNum},auto)`
+				}
+				col = 1;
+				row++;
+			}
+			node.children = children;
+		} else {
+			attrs.style = `border-spacing:${spacing}px;${attrs.style || ''}`;
+			if (border || padding)
+				(function f(ns) {
+					for (var i = 0, n; n = ns[i]; i++) {
+						if (n.name == 'th' || n.name == 'td') {
+							if (border) n.attrs.style = `border:${border}px solid gray;${n.attrs.style || ''}`;
+							if (padding) n.attrs.style = `padding:${padding}px;${n.attrs.style || ''}`;
+						} else f(n.children || []);
+					}
+				})(childs)
+		}
+		if (this.options.autoscroll) {
+			var table = Object.assign({}, node);
+			node.name = 'div';
+			node.attrs = {
+				style: 'overflow:scroll'
+			}
+			node.children = [table];
+		}
+	}
+	this.CssHandler.pop && this.CssHandler.pop(node);
+	// 自动压缩
+	if (node.name == 'div' && !Object.keys(attrs).length && childs.length == 1 && childs[0].name == 'div')
+		siblings[len - 1] = childs[0];
+}
+// 状态机
+MpHtmlParser.prototype.Text = function(c) {
+	if (c == '<') {
+		var next = this.data[this.i + 1],
+			isLetter = c => (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+		if (isLetter(next)) {
+			this.setText();
+			this.start = this.i + 1;
+			this.state = this.TagName;
+		} else if (next == '/') {
+			this.setText();
+			if (isLetter(this.data[++this.i + 1])) {
+				this.start = this.i + 1;
+				this.state = this.EndTag;
+			} else this.Comment();
+		} else if (next == '!' || next == '?') {
+			this.setText();
+			this.Comment();
+		}
+	}
+}
+MpHtmlParser.prototype.Comment = function() {
+	var key;
+	if (this.data.substring(this.i + 2, this.i + 4) == '--') key = '-->';
+	else if (this.data.substring(this.i + 2, this.i + 9) == '[CDATA[') key = ']]>';
+	else key = '>';
+	if ((this.i = this.data.indexOf(key, this.i + 2)) == -1) this.i = this.data.length;
+	else this.i += key.length - 1;
+	this.start = this.i + 1;
+	this.state = this.Text;
+}
+MpHtmlParser.prototype.TagName = function(c) {
+	if (blankChar[c]) {
+		this.tagName = this.section();
+		while (blankChar[this.data[this.i]]) this.i++;
+		if (this.isClose()) this.setNode();
+		else {
+			this.start = this.i;
+			this.state = this.AttrName;
+		}
+	} else if (this.isClose()) {
+		this.tagName = this.section();
+		this.setNode();
+	}
+}
+MpHtmlParser.prototype.AttrName = function(c) {
+	if (c == '=' || blankChar[c] || this.isClose()) {
+		this.attrName = this.section();
+		if (blankChar[c])
+			while (blankChar[this.data[++this.i]]);
+		if (this.data[this.i] == '=') {
+			while (blankChar[this.data[++this.i]]);
+			this.start = this.i--;
+			this.state = this.AttrValue;
+		} else this.setAttr();
+	}
+}
+MpHtmlParser.prototype.AttrValue = function(c) {
+	if (c == '"' || c == "'") {
+		this.start++;
+		if ((this.i = this.data.indexOf(c, this.i + 1)) == -1) return this.i = this.data.length;
+		this.attrVal = this.section();
+		this.i++;
+	} else {
+		for (; !blankChar[this.data[this.i]] && !this.isClose(); this.i++);
+		this.attrVal = this.section();
+	}
+	this.setAttr();
+}
+MpHtmlParser.prototype.EndTag = function(c) {
+	if (blankChar[c] || c == '>' || c == '/') {
+		var name = this.section().toLowerCase();
+		for (var i = this.STACK.length; i--;)
+			if (this.STACK[i].name == name) break;
+		if (i != -1) {
+			var node;
+			while ((node = this.STACK.pop()).name != name) this.popNode(node);
+			this.popNode(node);
+		} else if (name == 'p' || name == 'br')
+			this.siblings().push({
+				name,
+				attrs: {}
+			});
+		this.i = this.data.indexOf('>', this.i);
+		this.start = this.i + 1;
+		if (this.i == -1) this.i = this.data.length;
+		else this.state = this.Text;
+	}
+}
+export default MpHtmlParser;
diff --git a/uni_modules/vk-uview-ui/components/u-parse/libs/config.js b/uni_modules/vk-uview-ui/components/u-parse/libs/config.js
new file mode 100644
index 0000000..1517afe
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-parse/libs/config.js
@@ -0,0 +1,80 @@
+/* 配置文件 */
+var cfg = {
+	// 出错占位图
+	errorImg: null,
+	// 过滤器函数
+	filter: null,
+	// 代码高亮函数
+	highlight: null,
+	// 文本处理函数
+	onText: null,
+	// 实体编码列表
+	entities: {
+		quot: '"',
+		apos: "'",
+		semi: ';',
+		nbsp: '\xA0',
+		ensp: '\u2002',
+		emsp: '\u2003',
+		ndash: '–',
+		mdash: '—',
+		middot: '·',
+		lsquo: '‘',
+		rsquo: '’',
+		ldquo: '“',
+		rdquo: '”',
+		bull: '•',
+		hellip: '…'
+	},
+	blankChar: makeMap(' ,\xA0,\t,\r,\n,\f'),
+	boolAttrs: makeMap('allowfullscreen,autoplay,autostart,controls,ignore,loop,muted'),
+	// 块级标签，将被转为 div
+	blockTags: makeMap('address,article,aside,body,caption,center,cite,footer,header,html,nav,pre,section'),
+	// 将被移除的标签
+	ignoreTags: makeMap('area,base,canvas,frame,iframe,input,link,map,meta,param,script,source,style,svg,textarea,title,track,wbr'),
+	// 只能被 rich-text 显示的标签
+	richOnlyTags: makeMap('a,colgroup,fieldset,legend'),
+	// 自闭合的标签
+	selfClosingTags: makeMap('area,base,br,col,circle,ellipse,embed,frame,hr,img,input,line,link,meta,param,path,polygon,rect,source,track,use,wbr'),
+	// 信任的标签
+	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,ul,video'),
+	// 默认的标签样式
+	userAgentStyles: {
+		address: 'font-style:italic',
+		big: 'display:inline;font-size:1.2em',
+		blockquote: 'background-color:#f6f6f6;border-left:3px solid #dbdbdb;color:#6c6c6c;padding:5px 0 5px 10px',
+		caption: 'display:table-caption;text-align:center',
+		center: 'text-align:center',
+		cite: 'font-style:italic',
+		dd: 'margin-left:40px',
+		mark: 'background-color:yellow',
+		pre: 'font-family:monospace;white-space:pre;overflow:scroll',
+		s: 'text-decoration:line-through',
+		small: 'display:inline;font-size:0.8em',
+		u: 'text-decoration:underline'
+	}
+}
+
+function makeMap(str) {
+	var map = Object.create(null),
+		list = str.split(',');
+	for (var i = list.length; i--;)
+		map[list[i]] = true;
+	return map;
+}
+
+// #ifdef MP-WEIXIN
+if (wx.canIUse('editor')) {
+	cfg.blockTags.pre = void 0;
+	cfg.ignoreTags.rp = true;
+	Object.assign(cfg.richOnlyTags, makeMap('bdi,bdo,caption,rt,ruby'));
+	Object.assign(cfg.trustTags, makeMap('bdi,bdo,caption,pre,rt,ruby'));
+}
+// #endif
+
+// #ifdef APP-PLUS
+cfg.ignoreTags.iframe = void 0;
+Object.assign(cfg.trustTags, makeMap('embed,iframe'));
+// #endif
+
+export default cfg;
diff --git a/uni_modules/vk-uview-ui/components/u-parse/libs/trees.vue b/uni_modules/vk-uview-ui/components/u-parse/libs/trees.vue
new file mode 100644
index 0000000..4f9960a
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-parse/libs/trees.vue
@@ -0,0 +1,537 @@
+<template>
+	<view :class="'interlayer '+(c||'')" :style="s">
+		<block v-for="(n, i) in nodes" v-bind:key="i">
+			<!--图片-->
+			<view v-if="n.name=='img'" :class="'_img '+n.attrs.class" :style="n.attrs.style" :data-attrs="n.attrs" @tap.stop="imgtap">
+				<rich-text v-if="ctrl[i]!=0" :nodes="[{attrs:{src:loading&&(ctrl[i]||0)<2?loading:(lazyLoad&&!ctrl[i]?placeholder:(ctrl[i]==3?errorImg:n.attrs.src||'')),alt:n.attrs.alt||'',width:n.attrs.width||'',style:'-webkit-touch-callout:none;max-width:100%;display:block'+(n.attrs.height?';height:'+n.attrs.height:'')},name:'img'}]" />
+				<image class="_image" :src="lazyLoad&&!ctrl[i]?placeholder:n.attrs.src" :lazy-load="lazyLoad"
+				 :show-menu-by-longpress="!n.attrs.ignore" :data-i="i" :data-index="n.attrs.i" data-source="img" @load="loadImg"
+				 @error="error" />
+			</view>
+			<!--文本-->
+			<text v-else-if="n.type=='text'" decode>{{n.text}}</text>
+			<!--#ifndef MP-BAIDU-->
+			<text v-else-if="n.name=='br'">\n</text>
+			<!--#endif-->
+			<!--视频-->
+			<view v-else-if="((n.lazyLoad&&!n.attrs.autoplay)||(n.name=='video'&&!loadVideo))&&ctrl[i]==undefined" :id="n.attrs.id"
+			 :class="'_video '+(n.attrs.class||'')" :style="n.attrs.style" :data-i="i" @tap.stop="_loadVideo" />
+			<video v-else-if="n.name=='video'" :id="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :autoplay="n.attrs.autoplay||ctrl[i]==0"
+			 :controls="n.attrs.controls" :loop="n.attrs.loop" :muted="n.attrs.muted" :poster="n.attrs.poster" :src="n.attrs.source[ctrl[i]||0]"
+			 :unit-id="n.attrs['unit-id']" :data-id="n.attrs.id" :data-i="i" data-source="video" @error="error" @play="play" />
+			<!--音频-->
+			<audio v-else-if="n.name=='audio'" :ref="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :author="n.attrs.author"
+			 :autoplay="n.attrs.autoplay" :controls="n.attrs.controls" :loop="n.attrs.loop" :name="n.attrs.name" :poster="n.attrs.poster"
+			 :src="n.attrs.source[ctrl[i]||0]" :data-i="i" :data-id="n.attrs.id" data-source="audio" @error.native="error"
+			 @play.native="play" />
+			<!--链接-->
+			<view v-else-if="n.name=='a'" :id="n.attrs.id" :class="'_a '+(n.attrs.class||'')" hover-class="_hover" :style="n.attrs.style"
+			 :data-attrs="n.attrs" @tap.stop="linkpress">
+				<trees class="_span" c="_span" :nodes="n.children" />
+			</view>
+			<!--广告-->
+			<!--<ad v-else-if="n.name=='ad'" :class="n.attrs.class" :style="n.attrs.style" :unit-id="n.attrs['unit-id']" :appid="n.attrs.appid" :apid="n.attrs.apid" :type="n.attrs.type" :adpid="n.attrs.adpid" data-source="ad" @error="error" />-->
+			<!--列表-->
+			<view v-else-if="n.name=='li'" :id="n.attrs.id" :class="n.attrs.class" :style="(n.attrs.style||'')+';display:flex;flex-direction:row'">
+				<view v-if="n.type=='ol'" class="_ol-bef">{{n.num}}</view>
+				<view v-else class="_ul-bef">
+					<view v-if="n.floor%3==0" class="_ul-p1">█</view>
+					<view v-else-if="n.floor%3==2" class="_ul-p2" />
+					<view v-else class="_ul-p1" style="border-radius:50%">█</view>
+				</view>
+				<trees class="_li" c="_li" :nodes="n.children" :lazyLoad="lazyLoad" :loading="loading" />
+			</view>
+			<!--表格-->
+			<view v-else-if="n.name=='table'&&n.c&&n.flag" :id="n.attrs.id" :class="n.attrs.class" :style="(n.attrs.style||'')+';display:grid'">
+				<trees v-for="(cell,n) in n.children" v-bind:key="n" :class="cell.attrs.class" :c="cell.attrs.class" :style="cell.attrs.style"
+				 :s="cell.attrs.style" :nodes="cell.children" />
+			</view>
+			<view v-else-if="n.name=='table'&&n.c" :id="n.attrs.id" :class="n.attrs.class" :style="(n.attrs.style||'')+';display:table'">
+				<view v-for="(tbody, o) in n.children" v-bind:key="o" :class="tbody.attrs.class" :style="(tbody.attrs.style||'')+(tbody.name[0]=='t'?';display:table-'+(tbody.name=='tr'?'row':'row-group'):'')">
+					<view v-for="(tr, p) in tbody.children" v-bind:key="p" :class="tr.attrs.class" :style="(tr.attrs.style||'')+(tr.name[0]=='t'?';display:table-'+(tr.name=='tr'?'row':'cell'):'')">
+						<trees v-if="tr.name=='td'" :nodes="tr.children" />
+						<trees v-else v-for="(td, q) in tr.children" v-bind:key="q" :class="td.attrs.class" :c="td.attrs.class" :style="(td.attrs.style||'')+(td.name[0]=='t'?';display:table-'+(td.name=='tr'?'row':'cell'):'')"
+						 :s="(td.attrs.style||'')+(td.name[0]=='t'?';display:table-'+(td.name=='tr'?'row':'cell'):'')" :nodes="td.children" />
+					</view>
+				</view>
+			</view>
+			<!--#ifdef APP-PLUS-->
+			<iframe v-else-if="n.name=='iframe'" :style="n.attrs.style" :allowfullscreen="n.attrs.allowfullscreen" :frameborder="n.attrs.frameborder"
+			 :width="n.attrs.width" :height="n.attrs.height" :src="n.attrs.src" />
+			<embed v-else-if="n.name=='embed'" :style="n.attrs.style" :width="n.attrs.width" :height="n.attrs.height" :src="n.attrs.src" />
+			<!--#endif-->
+			<!--富文本-->
+			<!--#ifdef MP-WEIXIN || MP-QQ || APP-PLUS-->
+			<rich-text v-else-if="use(n)" :id="n.attrs.id" :class="'_p __'+n.name" :nodes="[n]" />
+			<!--#endif-->
+			<!--#ifndef MP-WEIXIN || MP-QQ || APP-PLUS-->
+			<rich-text v-else-if="!n.c" :id="n.attrs.id" :nodes="[n]" style="display:inline" />
+			<!--#endif-->
+			<trees v-else :class="(n.attrs.id||'')+' _'+n.name+' '+(n.attrs.class||'')" :c="(n.attrs.id||'')+' _'+n.name+' '+(n.attrs.class||'')"
+			 :style="n.attrs.style" :s="n.attrs.style" :nodes="n.children" :lazyLoad="lazyLoad" :loading="loading" />
+		</block>
+	</view>
+</template>
+<script>
+	var inline = {
+		abbr: 1,
+		b: 1,
+		big: 1,
+		code: 1,
+		del: 1,
+		em: 1,
+		i: 1,
+		ins: 1,
+		label: 1,
+		q: 1,
+		small: 1,
+		span: 1,
+		strong: 1,
+		sub: 1,
+		sup: 1
+	}
+	let global = {};
+	global.Parser = {};
+	import trees from './trees'
+	import cfg from '../libs/config.js'
+	const errorImg = cfg.errorImg;
+	export default {
+		components: {
+			trees
+		},
+		name: 'trees',
+		data() {
+			return {
+				ctrl: [],
+				placeholder: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="300" height="225"/>',
+				errorImg,
+				loadVideo: typeof plus == 'undefined',
+				// #ifndef MP-ALIPAY
+				c: '',
+				s: ''
+				// #endif
+			}
+		},
+		props: {
+			nodes: Array,
+			lazyLoad: Boolean,
+			loading: String,
+			// #ifdef MP-ALIPAY
+			c: String,
+			s: String
+			// #endif
+		},
+		mounted() {
+			for (this.top = this.$parent; this.top.$options.name != 'parser'; this.top = this.top.$parent);
+			this.init();
+		},
+		// #ifdef APP-PLUS
+    
+    // #ifndef VUE3
+    // 组件销毁前，将实例从u-form的缓存中移除
+    beforeDestroy() {
+      this.observer && this.observer.disconnect();
+    },
+    // #endif
+    
+    // #ifdef VUE3
+    beforeUnmount() {
+      this.observer && this.observer.disconnect();
+    },
+    // #endif
+    
+		// #endif
+		methods: {
+			init() {
+				for (var i = this.nodes.length, n; n = this.nodes[--i];) {
+					if (n.name == 'img') {
+						this.top.imgList.setItem(n.attrs.i, n.attrs['original-src'] || n.attrs.src);
+						// #ifdef APP-PLUS
+						if (this.lazyLoad && !this.observer) {
+							this.observer = uni.createIntersectionObserver(this).relativeToViewport({
+								top: 500,
+								bottom: 500
+							});
+							setTimeout(() => {
+								this.observer.observe('._img', res => {
+									if (res.intersectionRatio) {
+										for (var j = this.nodes.length; j--;)
+											if (this.nodes[j].name == 'img')
+												this.$set(this.ctrl, j, 1);
+										this.observer.disconnect();
+									}
+								})
+							}, 0)
+						}
+						// #endif
+					} else if (n.name == 'video' || n.name == 'audio') {
+						var ctx;
+						if (n.name == 'video') {
+							ctx = uni.createVideoContext(n.attrs.id
+								// #ifndef MP-BAIDU
+								, this
+								// #endif
+							);
+						} else if (this.$refs[n.attrs.id])
+							ctx = this.$refs[n.attrs.id][0];
+						if (ctx) {
+							ctx.id = n.attrs.id;
+							this.top.videoContexts.push(ctx);
+						}
+					}
+				}
+				// #ifdef APP-PLUS
+				// APP 上避免 video 错位需要延时渲染
+				setTimeout(() => {
+					this.loadVideo = true;
+				}, 1000)
+				// #endif
+			},
+			play(e) {
+				var contexts = this.top.videoContexts;
+				if (contexts.length > 1 && this.top.autopause)
+					for (var i = contexts.length; i--;)
+						if (contexts[i].id != e.currentTarget.dataset.id)
+							contexts[i].pause();
+			},
+			imgtap(e) {
+				var attrs = e.currentTarget.dataset.attrs;
+				if (!attrs.ignore) {
+					var preview = true,
+						data = {
+							id: e.target.id,
+							src: attrs.src,
+							ignore: () => preview = false
+						};
+					global.Parser.onImgtap && global.Parser.onImgtap(data);
+					this.top.$emit('imgtap', data);
+					if (preview) {
+						var urls = this.top.imgList,
+							current = urls[attrs.i] ? parseInt(attrs.i) : (urls = [attrs.src], 0);
+						uni.previewImage({
+							current,
+							urls
+						})
+					}
+				}
+			},
+			loadImg(e) {
+				var i = e.currentTarget.dataset.i;
+				if (this.lazyLoad && !this.ctrl[i]) {
+					// #ifdef QUICKAPP-WEBVIEW
+					this.$set(this.ctrl, i, 0);
+					this.$nextTick(function() {
+						// #endif
+						// #ifndef APP-PLUS
+						this.$set(this.ctrl, i, 1);
+						// #endif
+						// #ifdef QUICKAPP-WEBVIEW
+					})
+					// #endif
+				} else if (this.loading && this.ctrl[i] != 2) {
+					// #ifdef QUICKAPP-WEBVIEW
+					this.$set(this.ctrl, i, 0);
+					this.$nextTick(function() {
+						// #endif
+						this.$set(this.ctrl, i, 2);
+						// #ifdef QUICKAPP-WEBVIEW
+					})
+					// #endif
+				}
+			},
+			linkpress(e) {
+				var jump = true,
+					attrs = e.currentTarget.dataset.attrs;
+				attrs.ignore = () => jump = false;
+				global.Parser.onLinkpress && global.Parser.onLinkpress(attrs);
+				this.top.$emit('linkpress', attrs);
+				if (jump) {
+					// #ifdef MP
+					if (attrs['app-id']) {
+						return uni.navigateToMiniProgram({
+							appId: attrs['app-id'],
+							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) {
+							// #ifdef APP-PLUS
+							plus.runtime.openWeb(attrs.href);
+							// #endif
+							// #ifndef APP-PLUS
+							uni.setClipboardData({
+								data: attrs.href,
+								success: () =>
+									uni.showToast({
+										title: '链接已复制'
+									})
+							})
+							// #endif
+						} else
+							uni.navigateTo({
+								url: attrs.href,
+								fail() {
+									uni.switchTab({
+										url: attrs.href,
+									})
+								}
+							})
+					}
+				}
+			},
+			error(e) {
+				var target = e.currentTarget,
+					source = target.dataset.source,
+					i = target.dataset.i;
+				if (source == 'video' || source == 'audio') {
+					// 加载其他 source
+					var index = this.ctrl[i] ? this.ctrl[i].i + 1 : 1;
+					if (index < this.nodes[i].attrs.source.length)
+						this.$set(this.ctrl, i, index);
+					if (e.detail.__args__)
+						e.detail = e.detail.__args__[0];
+				} else if (errorImg && source == 'img') {
+					this.top.imgList.setItem(target.dataset.index, errorImg);
+					this.$set(this.ctrl, i, 3);
+				}
+				this.top && this.top.$emit('error', {
+					source,
+					target,
+					errMsg: e.detail.errMsg
+				});
+			},
+			_loadVideo(e) {
+				this.$set(this.ctrl, e.target.dataset.i, 0);
+			},
+			use(item) {
+				return !item.c && !inline[item.name] && (item.attrs.style || '').indexOf('display:inline') == -1
+			}
+		}
+	}
+</script>
+
+<style>
+	/* 在这里引入自定义样式 */
+
+	/* 链接和图片效果 */
+	._a {
+		display: inline;
+		padding: 1.5px 0 1.5px 0;
+		color: #366092;
+		word-break: break-all;
+	}
+
+	._hover {
+		text-decoration: underline;
+		opacity: 0.7;
+	}
+
+	._img {
+		display: inline-block;
+		max-width: 100%;
+		overflow: hidden;
+	}
+
+	/* #ifdef MP-WEIXIN */
+	:host {
+		display: inline;
+	}
+
+	/* #endif */
+
+	/* #ifndef MP-ALIPAY || APP-PLUS */
+	.interlayer {
+		display: inherit;
+		flex-direction: inherit;
+		flex-wrap: inherit;
+		align-content: inherit;
+		align-items: inherit;
+		justify-content: inherit;
+		width: 100%;
+		white-space: inherit;
+	}
+
+	/* #endif */
+
+	._b,
+	._strong {
+		font-weight: bold;
+	}
+
+	/* #ifndef MP-ALIPAY */
+	._blockquote,
+	._div,
+	._p,
+	._ol,
+	._ul,
+	._li {
+		display: block;
+	}
+
+	/* #endif */
+
+	._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.83em;
+	}
+
+	._h6 {
+		font-size: 0.67em;
+	}
+
+	._h1,
+	._h2,
+	._h3,
+	._h4,
+	._h5,
+	._h6 {
+		display: block;
+		font-weight: bold;
+	}
+
+	._image {
+		display: block;
+		width: 100%;
+		height: 360px;
+		margin-top: -360px;
+		opacity: 0;
+	}
+
+	._ins {
+		text-decoration: underline;
+	}
+
+	._li {
+		flex: 1;
+		width: 0;
+	}
+
+	._ol-bef {
+		width: 36px;
+		margin-right: 5px;
+		text-align: right;
+	}
+
+	._ul-bef {
+		display: block;
+		margin: 0 12px 0 23px;
+		line-height: normal;
+	}
+
+	._ol-bef,
+	._ul-bef {
+		flex: none;
+		user-select: none;
+	}
+
+	._ul-p1 {
+		display: inline-block;
+		width: 0.3em;
+		height: 0.3em;
+		overflow: hidden;
+		line-height: 0.3em;
+	}
+
+	._ul-p2 {
+		display: inline-block;
+		width: 0.23em;
+		height: 0.23em;
+		border: 0.05em solid black;
+		border-radius: 50%;
+	}
+
+	._q::before {
+		content: '"';
+	}
+
+	._q::after {
+		content: '"';
+	}
+
+	._sub {
+		font-size: smaller;
+		vertical-align: sub;
+	}
+
+	._sup {
+		font-size: smaller;
+		vertical-align: super;
+	}
+
+	/* #ifdef MP-ALIPAY || APP-PLUS || QUICKAPP-WEBVIEW */
+	._abbr,
+	._b,
+	._code,
+	._del,
+	._em,
+	._i,
+	._ins,
+	._label,
+	._q,
+	._span,
+	._strong,
+	._sub,
+	._sup {
+		display: inline;
+	}
+
+	/* #endif */
+
+	/* #ifdef MP-WEIXIN || MP-QQ */
+	.__bdo,
+	.__bdi,
+	.__ruby,
+	.__rt {
+		display: inline-block;
+	}
+
+	/* #endif */
+	._video {
+		position: relative;
+		display: inline-block;
+		width: 300px;
+		height: 225px;
+		background-color: black;
+	}
+
+	._video::after {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		margin: -15px 0 0 -15px;
+		content: '';
+		border-color: transparent transparent transparent white;
+		border-style: solid;
+		border-width: 15px 0 15px 30px;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-parse/u-parse.vue b/uni_modules/vk-uview-ui/components/u-parse/u-parse.vue
new file mode 100644
index 0000000..0530fff
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-parse/u-parse.vue
@@ -0,0 +1,676 @@
+<template>
+	<view>
+		<slot v-if="!nodes.length" />
+		<!--#ifdef APP-PLUS-NVUE-->
+		<web-view id="_top" ref="web" :style="'margin-top:-2px;height:'+height+'px'" @onPostMessage="_message" />
+		<!--#endif-->
+		<!--#ifndef APP-PLUS-NVUE-->
+		<view id="_top" :style="showAm+(selectable?';user-select:text;-webkit-user-select:text':'')">
+			<!--#ifdef H5 || MP-360-->
+			<div :id="'rtf'+uid"></div>
+			<!--#endif-->
+			<!--#ifndef H5 || MP-360-->
+			<trees :nodes="nodes" :lazyLoad="lazyLoad" :loading="loadingImg" />
+			<!--#endif-->
+		</view>
+		<!--#endif-->
+	</view>
+</template>
+
+<script>
+	var search;
+	// #ifndef H5 || APP-PLUS-NVUE || MP-360
+	import trees from './libs/trees';
+  import Parser from './libs/MpHtmlParser.js'
+	var cache = {};
+		// #ifdef MP-WEIXIN || MP-TOUTIAO
+	var	fs = uni.getFileSystemManager ? uni.getFileSystemManager() : null;
+		// #endif
+	var dom;
+	// 计算 cache 的 key
+	function hash(str) {
+		for (var i = str.length, val = 5381; i--;)
+			val += (val << 5) + str.charCodeAt(i);
+		return val;
+	}
+	// #endif
+	// #ifdef H5 || APP-PLUS-NVUE || MP-360
+  import cfg from './libs/config.js'
+	var {
+		windowWidth,
+		platform
+	} = uni.getSystemInfoSync()
+	// #endif
+	// #ifdef APP-PLUS-NVUE
+	var weexDom = weex.requireModule('dom');
+	// #endif
+	/**
+	 * Parser 富文本组件
+	 * @tutorial https://github.com/jin-yufeng/Parser
+	 * @property {String} html 富文本数据
+	 * @property {Boolean} autopause 是否在播放一个视频时自动暂停其他视频
+	 * @property {Boolean} autoscroll 是否自动给所有表格添加一个滚动层
+	 * @property {Boolean} autosetTitle 是否自动将 title 标签中的内容设置到页面标题
+	 * @property {Number} compress 压缩等级
+	 * @property {String} domain 图片、视频等链接的主域名
+	 * @property {Boolean} lazyLoad 是否开启图片懒加载
+	 * @property {String} loadingImg 图片加载完成前的占位图
+	 * @property {Boolean} selectable 是否开启长按复制
+	 * @property {Object} tagStyle 标签的默认样式
+	 * @property {Boolean} showWithAnimation 是否使用渐显动画
+	 * @property {Boolean} useAnchor 是否使用锚点
+	 * @property {Boolean} useCache 是否缓存解析结果
+	 * @event {Function} parse 解析完成事件
+	 * @event {Function} load dom 加载完成事件
+	 * @event {Function} ready 所有图片加载完毕事件
+	 * @event {Function} error 错误事件
+	 * @event {Function} imgtap 图片点击事件
+	 * @event {Function} linkpress 链接点击事件
+	 * @author JinYufeng
+	 * @version 20201029
+	 * @listens MIT
+	 */
+	export default {
+		name: 'parser',
+    emits: ["parse", "load", "ready", "error", "imgtap", "linkpress"],
+		data() {
+			return {
+				// #ifdef H5 || MP-360
+				uid: this._uid,
+				// #endif
+				// #ifdef APP-PLUS-NVUE
+				height: 1,
+				// #endif
+				// #ifndef APP-PLUS-NVUE
+				showAm: '',
+				// #endif
+				nodes: []
+			}
+		},
+		// #ifndef H5 || APP-PLUS-NVUE || MP-360
+		components: {
+			trees
+		},
+		// #endif
+		props: {
+			html: String,
+			autopause: {
+				type: Boolean,
+				default: true
+			},
+      preview: {
+				type: Boolean,
+				default: true
+			},
+			autoscroll: Boolean,
+			autosetTitle: {
+				type: Boolean,
+				default: true
+			},
+			// #ifndef H5 || APP-PLUS-NVUE || MP-360
+			compress: Number,
+			loadingImg: String,
+			useCache: Boolean,
+			// #endif
+			domain: String,
+			lazyLoad: Boolean,
+			selectable: Boolean,
+			tagStyle: Object,
+			showWithAnimation: Boolean,
+			useAnchor: Boolean
+		},
+		watch: {
+			html(html) {
+				this.setContent(html);
+			}
+		},
+		created() {
+			// 图片数组
+			this.imgList = [];
+			this.imgList.each = function(f) {
+				for (var i = 0, len = this.length; i < len; i++)
+					this.setItem(i, f(this[i], i, this));
+			}
+			this.imgList.setItem = function(i, src) {
+				if (i == void 0 || !src) return;
+				// #ifndef MP-ALIPAY || APP-PLUS
+				// 去重
+				if (src.indexOf('http') == 0 && this.includes(src)) {
+					var newSrc = src.split('://')[0];
+					for (var j = newSrc.length, c; c = src[j]; j++) {
+						if (c == '/' && src[j - 1] != '/' && src[j + 1] != '/') break;
+						newSrc += Math.random() > 0.5 ? c.toUpperCase() : c;
+					}
+					newSrc += src.substr(j);
+					return this[i] = newSrc;
+				}
+				// #endif
+				this[i] = src;
+				// 暂存 data src
+				if (src.includes('data:image')) {
+					var filePath, info = src.match(/data:image\/(\S+?);(\S+?),(.+)/);
+					if (!info) return;
+					// #ifdef MP-WEIXIN || MP-TOUTIAO
+					filePath = `${wx.env.USER_DATA_PATH}/${Date.now()}.${info[1]}`;
+					fs && fs.writeFile({
+						filePath,
+						data: info[3],
+						encoding: info[2],
+						success: () => this[i] = filePath
+					})
+					// #endif
+					// #ifdef APP-PLUS
+					filePath = `_doc/parser_tmp/${Date.now()}.${info[1]}`;
+					var bitmap = new plus.nativeObj.Bitmap();
+					bitmap.loadBase64Data(src, () => {
+						bitmap.save(filePath, {}, () => {
+							bitmap.clear()
+							this[i] = filePath;
+						})
+					})
+					// #endif
+				}
+			}
+		},
+		mounted() {
+			// #ifdef H5 || MP-360
+			this.document = document.getElementById('rtf' + this._uid);
+			// #endif
+			// #ifndef H5 || APP-PLUS-NVUE || MP-360
+			if (dom) this.document = new dom(this);
+			// #endif
+			if (search) this.search = args => search(this, args);
+			// #ifdef APP-PLUS-NVUE
+			this.document = this.$refs.web;
+			setTimeout(() => {
+				// #endif
+				if (this.html) this.setContent(this.html);
+				// #ifdef APP-PLUS-NVUE
+			}, 30)
+			// #endif
+		},
+    // #ifndef VUE3
+    beforeDestroy() {
+    	// #ifdef H5 || MP-360
+    	if (this._observer) this._observer.disconnect();
+    	// #endif
+    	this.imgList.each(src => {
+    		// #ifdef APP-PLUS
+    		if (src && src.includes('_doc')) {
+    			plus.io.resolveLocalFileSystemURL(src, entry => {
+    				entry.remove();
+    			});
+    		}
+    		// #endif
+    		// #ifdef MP-WEIXIN || MP-TOUTIAO
+    		if (src && src.includes(uni.env.USER_DATA_PATH))
+    			fs && fs.unlink({
+    				filePath: src
+    			})
+    		// #endif
+    	})
+    	clearInterval(this._timer);
+    },
+    // #endif
+    
+    // #ifdef VUE3
+    beforeUnmount() {
+      // #ifdef H5 || MP-360
+      if (this._observer) this._observer.disconnect();
+      // #endif
+      this.imgList.each(src => {
+      	// #ifdef APP-PLUS
+      	if (src && src.includes('_doc')) {
+      		plus.io.resolveLocalFileSystemURL(src, entry => {
+      			entry.remove();
+      		});
+      	}
+      	// #endif
+      	// #ifdef MP-WEIXIN || MP-TOUTIAO
+      	if (src && src.includes(uni.env.USER_DATA_PATH))
+      		fs && fs.unlink({
+      			filePath: src
+      		})
+      	// #endif
+      })
+      clearInterval(this._timer);
+    },
+    // #endif
+		methods: {
+			// 设置富文本内容
+			setContent(html, append) {
+				// #ifdef APP-PLUS-NVUE
+				if (!html)
+					return this.height = 1;
+				if (append)
+					this.$refs.web.evalJs("var b=document.createElement('div');b.innerHTML='" + html.replace(/'/g, "\\'") +
+						"';document.getElementById('parser').appendChild(b)");
+				else {
+					html =
+						'<meta charset="utf-8" /><meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"><style>html,body{width:100%;height:100%;overflow:hidden}body{margin:0}</style><base href="' +
+						this.domain + '"><div id="parser"' + (this.selectable ? '>' : ' style="user-select:none">') + this._handleHtml(html).replace(/\n/g, '\\n') +
+						'</div><script>"use strict";function e(e){if(window.__dcloud_weex_postMessage||window.__dcloud_weex_){var t={data:[e]};window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessage(t):window.__dcloud_weex_.postMessage(JSON.stringify(t))}}document.body.onclick=function(){e({action:"click"})},' +
+						(this.showWithAnimation ? 'document.body.style.animation="_show .5s",' : '') +
+						'setTimeout(function(){e({action:"load",text:document.body.innerText,height:document.getElementById("parser").scrollHeight})},50);\x3c/script>';
+					if (platform == 'android') html = html.replace(/%/g, '%25');
+					this.$refs.web.evalJs("document.write('" + html.replace(/'/g, "\\'") + "');document.close()");
+				}
+				this.$refs.web.evalJs(
+					'var t=document.getElementsByTagName("title");t.length&&e({action:"getTitle",title:t[0].innerText});for(var o,n=document.getElementsByTagName("style"),r=1;o=n[r++];)o.innerHTML=o.innerHTML.replace(/body/g,"#parser");for(var a,c=document.getElementsByTagName("img"),s=[],i=0==c.length,d=0,l=0,g=0;a=c[l];l++)parseInt(a.style.width||a.getAttribute("width"))>' +
+					windowWidth + '&&(a.style.height="auto"),a.onload=function(){++d==c.length&&(i=!0)},a.onerror=function(){++d==c.length&&(i=!0),' + (cfg.errorImg ? 'this.src="' + cfg.errorImg + '",' : '') +
+					'e({action:"error",source:"img",target:this})},a.hasAttribute("ignore")||"A"==a.parentElement.nodeName||(a.i=g++,s.push(a.getAttribute("original-src")||a.src||a.getAttribute("data-src")),a.onclick=function(t){t.stopPropagation(),e({action:"preview",img:{i:this.i,src:this.src}})});e({action:"getImgList",imgList:s});for(var u,m=document.getElementsByTagName("a"),f=0;u=m[f];f++)u.onclick=function(m){m.stopPropagation();var t,o=this.getAttribute("href");if("#"==o[0]){var n=document.getElementById(o.substr(1));n&&(t=n.offsetTop)}return e({action:"linkpress",href:o,offset:t}),!1};for(var h,y=document.getElementsByTagName("video"),v=0;h=y[v];v++)h.style.maxWidth="100%",h.onerror=function(){e({action:"error",source:"video",target:this})}' +
+					(this.autopause ? ',h.onplay=function(){for(var e,t=0;e=y[t];t++)e!=this&&e.pause()}' : '') +
+					';for(var _,p=document.getElementsByTagName("audio"),w=0;_=p[w];w++)_.onerror=function(){e({action:"error",source:"audio",target:this})};' +
+					(this.autoscroll ? 'for(var T,E=document.getElementsByTagName("table"),B=0;T=E[B];B++){var N=document.createElement("div");N.style.overflow="scroll",T.parentNode.replaceChild(N,T),N.appendChild(T)}' : '') +
+					'var x=document.getElementById("parser");clearInterval(window.timer),window.timer=setInterval(function(){i&&clearInterval(window.timer),e({action:"ready",ready:i,height:x.scrollHeight})},350)'
+				)
+				this.nodes = [1];
+				// #endif
+				// #ifdef H5 || MP-360
+				if (!html) {
+					if (this.rtf && !append) this.rtf.parentNode.removeChild(this.rtf);
+					return;
+				}
+				var div = document.createElement('div');
+				if (!append) {
+					if (this.rtf) this.rtf.parentNode.removeChild(this.rtf);
+					this.rtf = div;
+				} else {
+					if (!this.rtf) this.rtf = div;
+					else this.rtf.appendChild(div);
+				}
+				div.innerHTML = this._handleHtml(html, append);
+				for (var styles = this.rtf.getElementsByTagName('style'), i = 0, style; style = styles[i++];) {
+					style.innerHTML = style.innerHTML.replace(/body/g, '#rtf' + this._uid);
+					style.setAttribute('scoped', 'true');
+				}
+				// 懒加载
+				if (!this._observer && this.lazyLoad && IntersectionObserver) {
+					this._observer = new IntersectionObserver(changes => {
+						for (let item, i = 0; item = changes[i++];) {
+							if (item.isIntersecting) {
+								item.target.src = item.target.getAttribute('data-src');
+								item.target.removeAttribute('data-src');
+								this._observer.unobserve(item.target);
+							}
+						}
+					}, {
+						rootMargin: '500px 0px 500px 0px'
+					})
+				}
+				var _ts = this;
+				// 获取标题
+				var title = this.rtf.getElementsByTagName('title');
+				if (title.length && this.autosetTitle)
+					uni.setNavigationBarTitle({
+						title: title[0].innerText
+					})
+				// 填充 domain
+				var fill = target => {
+					var src = target.getAttribute('src');
+					if (this.domain && src) {
+						if (src[0] == '/') {
+							if (src[1] == '/')
+								target.src = (this.domain.includes('://') ? this.domain.split('://')[0] : '') + ':' + src;
+							else target.src = this.domain + src;
+						} else if (!src.includes('://') && src.indexOf('data:') != 0) target.src = this.domain + '/' + src;
+					}
+				}
+				// 图片处理
+				this.imgList.length = 0;
+				var imgs = this.rtf.getElementsByTagName('img');
+				for (let i = 0, j = 0, img; img = imgs[i]; i++) {
+					if (parseInt(img.style.width || img.getAttribute('width')) > windowWidth)
+						img.style.height = 'auto';
+					fill(img);
+					if (!img.hasAttribute('ignore') && img.parentElement.nodeName != 'A') {
+						img.i = j++;
+						_ts.imgList.push(img.getAttribute('original-src') || img.src || img.getAttribute('data-src'));
+						img.onclick = function(e) {
+							e.stopPropagation();
+							var preview = _ts.preview;
+							this.ignore = () => preview = false;
+							_ts.$emit('imgtap', this);
+							if (preview) {
+								uni.previewImage({
+									current: this.i,
+									urls: _ts.imgList
+								});
+							}
+						}
+					}
+					img.onerror = function() {
+						if (cfg.errorImg)
+							_ts.imgList[this.i] = this.src = cfg.errorImg;
+						_ts.$emit('error', {
+							source: 'img',
+							target: this
+						});
+					}
+					if (_ts.lazyLoad && this._observer && img.src && img.i != 0) {
+						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) {
+						e.stopPropagation();
+						var jump = true,
+							href = this.getAttribute('href');
+						_ts.$emit('linkpress', {
+							href,
+							ignore: () => jump = false
+						});
+						if (jump && href) {
+							if (href[0] == '#') {
+								if (_ts.useAnchor) {
+									_ts.navigateTo({
+										id: href.substr(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');
+				_ts.videoContexts = videos;
+				for (let video, i = 0; video = videos[i++];) {
+					fill(video);
+					video.style.maxWidth = '100%';
+					video.onerror = function() {
+						_ts.$emit('error', {
+							source: 'video',
+							target: this
+						});
+					}
+					video.onplay = function() {
+						if (_ts.autopause)
+							for (let item, i = 0; item = _ts.videoContexts[i++];)
+								if (item != this) item.pause();
+					}
+				}
+				// 音频处理
+				var audios = this.rtf.getElementsByTagName('audio');
+				for (var audio of audios) {
+					fill(audio);
+					audio.onerror = function() {
+						_ts.$emit('error', {
+							source: 'audio',
+							target: this
+						});
+					}
+				}
+				// 表格处理
+				if (this.autoscroll) {
+					var tables = this.rtf.getElementsByTagName('table');
+					for (var table of tables) {
+						let div = document.createElement('div');
+						div.style.overflow = 'scroll';
+						table.parentNode.replaceChild(div, table);
+						div.appendChild(table);
+					}
+				}
+				if (!append) this.document.appendChild(this.rtf);
+				this.$nextTick(() => {
+					this.nodes = [1];
+					this.$emit('load');
+				});
+				setTimeout(() => this.showAm = '', 500);
+				// #endif
+				// #ifndef APP-PLUS-NVUE
+				// #ifndef H5 || MP-360
+				var nodes;
+				if (!html) return this.nodes = [];
+				var parser = new Parser(html, this);
+				// 缓存读取
+				if (this.useCache) {
+					var hashVal = hash(html);
+					if (cache[hashVal])
+						nodes = cache[hashVal];
+					else {
+						nodes = parser.parse();
+						cache[hashVal] = nodes;
+					}
+				} else nodes = parser.parse();
+				this.$emit('parse', nodes);
+				if (append) this.nodes = this.nodes.concat(nodes);
+				else this.nodes = nodes;
+				if (nodes.length && nodes.title && this.autosetTitle)
+					uni.setNavigationBarTitle({
+						title: nodes.title
+					})
+				if (this.imgList) this.imgList.length = 0;
+				this.videoContexts = [];
+				this.$nextTick(() => {
+					(function f(cs) {
+						for (var i = cs.length; i--;) {
+							if (cs[i].top) {
+								cs[i].controls = [];
+								cs[i].init();
+								f(cs[i].$children);
+							}
+						}
+					})(this.$children)
+					this.$emit('load');
+				})
+				// #endif
+				var height;
+				clearInterval(this._timer);
+				this._timer = setInterval(() => {
+					// #ifdef H5 || MP-360
+					this.rect = this.rtf.getBoundingClientRect();
+					// #endif
+					// #ifndef H5 || MP-360
+					uni.createSelectorQuery().in(this)
+						.select('#_top').boundingClientRect().exec(res => {
+							if (!res) return;
+							this.rect = res[0];
+							// #endif
+							if (this.rect.height == height) {
+								this.$emit('ready', this.rect)
+								clearInterval(this._timer);
+							}
+							height = this.rect.height;
+							// #ifndef H5 || MP-360
+						});
+					// #endif
+				}, 350);
+				if (this.showWithAnimation && !append) this.showAm = 'animation:_show .5s';
+				// #endif
+			},
+			// 获取文本内容
+			getText(ns = this.nodes) {
+				var txt = '';
+				// #ifdef APP-PLUS-NVUE
+				txt = this._text;
+				// #endif
+				// #ifdef H5 || MP-360
+				txt = this.rtf.innerText;
+				// #endif
+				// #ifndef H5 || APP-PLUS-NVUE || MP-360
+				for (var i = 0, n; n = ns[i++];) {
+					if (n.type == 'text') txt += n.text.replace(/&nbsp;/g, '\u00A0').replace(/&lt;/g, '<').replace(/&gt;/g, '>')
+						.replace(/&amp;/g, '&');
+					else if (n.type == 'br') txt += '\n';
+					else {
+						// 块级标签前后加换行
+						var block = n.name == 'p' || n.name == 'div' || n.name == 'tr' || n.name == 'li' || (n.name[0] == 'h' && n.name[1] >
+							'0' && n.name[1] < '7');
+						if (block && txt && txt[txt.length - 1] != '\n') txt += '\n';
+						if (n.children) txt += this.getText(n.children);
+						if (block && txt[txt.length - 1] != '\n') txt += '\n';
+						else if (n.name == 'td' || n.name == 'th') txt += '\t';
+					}
+				}
+				// #endif
+				return txt;
+			},
+			// 锚点跳转
+			in (obj) {
+				if (obj.page && obj.selector && obj.scrollTop) this._in = obj;
+			},
+			navigateTo(obj) {
+				if (!this.useAnchor) return obj.fail && obj.fail('Anchor is disabled');
+				// #ifdef APP-PLUS-NVUE
+				if (!obj.id)
+					weexDom.scrollToElement(this.$refs.web);
+				else
+					this.$refs.web.evalJs('var pos=document.getElementById("' + obj.id +
+						'");if(pos)post({action:"linkpress",href:"#",offset:pos.offsetTop+' + (obj.offset || 0) + '})');
+				obj.success && obj.success();
+				// #endif
+				// #ifndef APP-PLUS-NVUE
+				var d = ' ';
+				// #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO
+				d = '>>>';
+				// #endif
+				var selector = uni.createSelectorQuery().in(this._in ? this._in.page : this).select((this._in ? this._in.selector :
+					'#_top') + (obj.id ? `${d}#${obj.id},${this._in?this._in.selector:'#_top'}${d}.${obj.id}` : '')).boundingClientRect();
+				if (this._in) selector.select(this._in.selector).scrollOffset().select(this._in.selector).boundingClientRect();
+				else selector.selectViewport().scrollOffset();
+				selector.exec(res => {
+					if (!res[0]) return obj.fail && obj.fail('Label not found')
+					var scrollTop = res[1].scrollTop + res[0].top - (res[2] ? res[2].top : 0) + (obj.offset || 0);
+					if (this._in) this._in.page[this._in.scrollTop] = scrollTop;
+					else uni.pageScrollTo({
+						scrollTop,
+						duration: 300
+					})
+					obj.success && obj.success();
+				})
+				// #endif
+			},
+			// 获取视频对象
+			getVideoContext(id) {
+				// #ifndef APP-PLUS-NVUE
+				if (!id) return this.videoContexts;
+				else
+					for (var i = this.videoContexts.length; i--;)
+						if (this.videoContexts[i].id == id) return this.videoContexts[i];
+				// #endif
+			},
+			// #ifdef H5 || APP-PLUS-NVUE || MP-360
+			_handleHtml(html, append) {
+				if (!append) {
+					// 处理 tag-style 和 userAgentStyles
+					var style = '<style>@keyframes _show{0%{opacity:0}100%{opacity:1}}img{max-width:100%}';
+					for (var item in cfg.userAgentStyles)
+						style += `${item}{${cfg.userAgentStyles[item]}}`;
+					for (item in this.tagStyle)
+						style += `${item}{${this.tagStyle[item]}}`;
+					style += '</style>';
+					html = style + html;
+				}
+				// 处理 rpx
+				if (html.includes('rpx'))
+					html = html.replace(/[0-9.]+\s*rpx/g, $ => (parseFloat($) * windowWidth / 750) + 'px');
+				return html;
+			},
+			// #endif
+			// #ifdef APP-PLUS-NVUE
+			_message(e) {
+				// 接收 web-view 消息
+				var d = e.detail.data[0];
+				switch (d.action) {
+					case 'load':
+						this.$emit('load');
+						this.height = d.height;
+						this._text = d.text;
+						break;
+					case 'getTitle':
+						if (this.autosetTitle)
+							uni.setNavigationBarTitle({
+								title: d.title
+							})
+						break;
+					case 'getImgList':
+						this.imgList.length = 0;
+						for (var i = d.imgList.length; i--;)
+							this.imgList.setItem(i, d.imgList[i]);
+						break;
+					case 'preview':
+						var preview = true;
+						d.img.ignore = () => preview = false;
+						this.$emit('imgtap', d.img);
+						if (preview)
+							uni.previewImage({
+								current: d.img.i,
+								urls: this.imgList
+							})
+						break;
+					case 'linkpress':
+						var jump = true,
+							href = d.href;
+						this.$emit('linkpress', {
+							href,
+							ignore: () => jump = false
+						})
+						if (jump && href) {
+							if (href[0] == '#') {
+								if (this.useAnchor)
+									weexDom.scrollToElement(this.$refs.web, {
+										offset: d.offset
+									})
+							} else if (href.includes('://'))
+								plus.runtime.openWeb(href);
+							else
+								uni.navigateTo({
+									url: href
+								})
+						}
+						break;
+					case 'error':
+						if (d.source == 'img' && cfg.errorImg)
+							this.imgList.setItem(d.target.i, cfg.errorImg);
+						this.$emit('error', {
+							source: d.source,
+							target: d.target
+						})
+						break;
+					case 'ready':
+						this.height = d.height;
+						if (d.ready) uni.createSelectorQuery().in(this).select('#_top').boundingClientRect().exec(res => {
+							this.rect = res[0];
+							this.$emit('ready', res[0]);
+						})
+						break;
+					case 'click':
+						this.$emit('click');
+						this.$emit('tap');
+				}
+			},
+			// #endif
+		}
+	}
+</script>
+
+<style>
+	@keyframes _show {
+		0% {
+			opacity: 0;
+		}
+
+		100% {
+			opacity: 1;
+		}
+	}
+
+	/* #ifdef MP-WEIXIN */
+	:host {
+		display: block;
+		overflow: auto;
+		-webkit-overflow-scrolling: touch;
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-picker/u-picker.vue b/uni_modules/vk-uview-ui/components/u-picker/u-picker.vue
new file mode 100644
index 0000000..11cdd41
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-picker/u-picker.vue
@@ -0,0 +1,895 @@
+<!-- 选择器 -->
+<template>
+	<u-popup
+		:maskCloseAble="maskCloseAble"
+		mode="bottom"
+		:popup="false"
+		v-model="popupValue"
+		length="auto"
+		:safeAreaInsetBottom="safeAreaInsetBottom"
+		@close="close"
+		:z-index="uZIndex"
+		:blur="blur"
+	>
+		<view class="u-datetime-picker">
+			<view class="u-picker-header" @touchmove.stop.prevent="">
+				<view
+					class="u-btn-picker u-btn-picker--tips"
+					:style="{ color: cancelColor }"
+					hover-class="u-opacity"
+					:hover-stay-time="150"
+					@click="getResult('cancel')"
+				>
+					{{ cancelText }}
+				</view>
+				<view class="u-picker__title">{{ title }}</view>
+				<view
+					class="u-btn-picker u-btn-picker--primary"
+					:style="{ color: moving ? cancelColor : confirmColor }"
+					hover-class="u-opacity"
+					:hover-stay-time="150"
+					@touchmove.stop=""
+					@click.stop="getResult('confirm')"
+				>
+					{{ confirmText }}
+				</view>
+			</view>
+			<view class="u-picker-body">
+				<picker-view
+					v-if="mode == 'region'"
+					:value="valueArr"
+					@change="change"
+					class="u-picker-view"
+					@pickstart="pickstart"
+					@pickend="pickend"
+				>
+					<picker-view-column v-if="!reset && params.province">
+						<view class="u-column-item" v-for="(item, index) in provinces" :key="index">
+							<view class="u-line-1">{{ item.name }}</view>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && params.city">
+						<view class="u-column-item" v-for="(item, index) in citys" :key="index">
+							<view class="u-line-1">{{ item.name }}</view>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && params.area">
+						<view class="u-column-item" v-for="(item, index) in areas" :key="index">
+							<view class="u-line-1">{{ item.name }}</view>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<picker-view
+					v-else-if="mode == 'time'"
+					:value="valueArr"
+					@change="change"
+					class="u-picker-view"
+					@pickstart="pickstart"
+					@pickend="pickend"
+				>
+					<picker-view-column v-if="!reset && params.year">
+						<view class="u-column-item" v-for="(item, index) in years" :key="index">
+							{{ item }}
+							<text class="u-text" v-if="showTimeTag">年</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && params.month">
+						<view class="u-column-item" v-for="(item, index) in months" :key="index">
+							{{ formatNumber(item) }}
+							<text class="u-text" v-if="showTimeTag">月</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && params.day">
+						<view class="u-column-item" v-for="(item, index) in days" :key="index">
+							{{ formatNumber(item) }}
+							<text class="u-text" v-if="showTimeTag">日</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && params.hour">
+						<view class="u-column-item" v-for="(item, index) in hours" :key="index">
+							{{ formatNumber(item) }}
+							<text class="u-text" v-if="showTimeTag">时</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && params.minute">
+						<view class="u-column-item" v-for="(item, index) in minutes" :key="index">
+							{{ formatNumber(item) }}
+							<text class="u-text" v-if="showTimeTag">分</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && params.second">
+						<view class="u-column-item" v-for="(item, index) in seconds" :key="index">
+							{{ formatNumber(item) }}
+							<text class="u-text" v-if="showTimeTag">秒</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<picker-view
+					v-else-if="mode == 'selector'"
+					:value="valueArr"
+					@change="change"
+					class="u-picker-view"
+					@pickstart="pickstart"
+					@pickend="pickend"
+				>
+					<picker-view-column v-if="!reset">
+						<view class="u-column-item" v-for="(item, index) in range" :key="index">
+							<view class="u-line-1">{{ getItemValue(item, "selector") }}</view>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<picker-view
+					v-else-if="mode == 'multiSelector'"
+					:value="valueArr"
+					@change="change"
+					class="u-picker-view"
+					@pickstart="pickstart"
+					@pickend="pickend"
+				>
+					<picker-view-column v-if="!reset" v-for="(item, index) in range" :key="index">
+						<view class="u-column-item" v-for="(item1, index1) in item" :key="index1">
+							<view class="u-line-1">{{ getItemValue(item1, "multiSelector") }}</view>
+						</view>
+					</picker-view-column>
+				</picker-view>
+			</view>
+		</view>
+	</u-popup>
+</template>
+
+<script>
+import provinces from "../../libs/address/provinces.json";
+import citys from "../../libs/address/citys.json";
+import areas from "../../libs/address/areas.json";
+/**
+ * picker picker弹出选择器
+ * @description 此选择器有两种弹出模式：一是时间模式，可以配置年，日，月，时，分，秒参数 二是地区模式，可以配置省，市，区参数
+ * @tutorial https://www.uviewui.com/components/picker.html
+ * @property {Object} params 需要显示的参数，见官网说明
+ * @property {String} mode 模式选择，region-地区类型，time-时间类型（默认time）
+ * @property {String Number} start-year 可选的开始年份，mode=time时有效（默认1950）
+ * @property {String Number} end-year 可选的结束年份，mode=time时有效（默认2050）
+ * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配（默认false）
+ * @property {Boolean} show-time-tag 时间模式时，是否显示后面的年月日中文提示
+ * @property {String} cancel-color 取消按钮的颜色（默认#606266）
+ * @property {String} confirm-color 确认按钮的颜色（默认#2979ff）
+ * @property {String} default-time 默认选中的时间，mode=time时有效
+ * @property {String} confirm-text 确认按钮的文字
+ * @property {String} cancel-text 取消按钮的文字
+ * @property {String} default-region 默认选中的地区，中文形式，mode=region时有效
+ * @property {String} default-code 默认选中的地区，编号形式，mode=region时有效
+ * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭Picker（默认true）
+ * @property {String Number} z-index 弹出时的z-index值（默认1075）
+ * @property {Array} default-selector 数组形式，其中每一项表示选择了range对应项中的第几个
+ * @property {Array} range 自定义选择的数据，mode=selector或mode=multiSelector时有效
+ * @property {String} range-key 当range参数的元素为对象时，指定Object中的哪个key的值作为选择器显示内容
+ * @event {Function} confirm 点击确定按钮，返回当前选择的值
+ * @event {Function} cancel 点击取消按钮，返回当前选择的值
+ * @example <u-picker v-model="show" mode="time"></u-picker>
+ */
+export default {
+	name: "u-picker",
+	emits: ["update:modelValue", "input", "confirm", "cancel"],
+	props: {
+		// 通过双向绑定控制组件的弹出与收起
+		value: {
+			type: Boolean,
+			default: false
+		},
+		modelValue: {
+			type: Boolean,
+			default: false
+		},
+		// picker中需要显示的参数
+		params: {
+			type: Object,
+			default() {
+				return {
+					year: true,
+					month: true,
+					day: true,
+					hour: false,
+					minute: false,
+					second: false,
+					province: true,
+					city: true,
+					area: true,
+					timestamp: true
+				};
+			}
+		},
+		// 当mode=selector或者mode=multiSelector时，提供的数组
+		range: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 当mode=selector或者mode=multiSelector时，提供的默认选中的下标
+		defaultSelector: {
+			type: Array,
+			default() {
+				return [0];
+			}
+		},
+		// 当 range 是一个 Array＜Object＞ 时，通过 range-key 来指定 Object 中 key 的值作为选择器显示内容
+		rangeKey: {
+			type: String,
+			default: ""
+		},
+		// 模式选择，region-地区类型，time-时间类型，selector-单列模式，multiSelector-多列模式
+		mode: {
+			type: String,
+			default: "time"
+		},
+		// 年份开始时间
+		startYear: {
+			type: [String, Number],
+			default: 1950
+		},
+		// 年份结束时间
+		endYear: {
+			type: [String, Number],
+			default: 2050
+		},
+		// "取消"按钮的颜色
+		cancelColor: {
+			type: String,
+			default: "#606266"
+		},
+		// "确定"按钮的颜色
+		confirmColor: {
+			type: String,
+			default: "#2979ff"
+		},
+		// 默认显示的时间，2025-07-02 || 2025-07-02 13:01:00 || 2025/07/02
+		defaultTime: {
+			type: String,
+			default: ""
+		},
+		// 默认显示的地区，可传类似["河北省", "秦皇岛市", "北戴河区"]
+		defaultRegion: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 时间模式时，是否显示后面的年月日中文提示
+		showTimeTag: {
+			type: Boolean,
+			default: true
+		},
+		// 默认显示地区的编码，defaultRegion和areaCode同时存在，areaCode优先，可传类似["13", "1303", "130304"]
+		areaCode: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		safeAreaInsetBottom: {
+			type: Boolean,
+			default: false
+		},
+		// 是否允许通过点击遮罩关闭Picker
+		maskCloseAble: {
+			type: Boolean,
+			default: true
+		},
+		// 弹出的z-index值
+		zIndex: {
+			type: [String, Number],
+			default: 0
+		},
+		// 顶部标题
+		title: {
+			type: String,
+			default: ""
+		},
+		// 取消按钮的文字
+		cancelText: {
+			type: String,
+			default: "取消"
+		},
+		// 确认按钮的文字
+		confirmText: {
+			type: String,
+			default: "确认"
+		},
+		// 遮罩的模糊度
+		blur: {
+			type: [String, Number],
+			default: 0
+		}
+	},
+	data() {
+		return {
+			popupValue: false,
+			years: [],
+			months: [],
+			days: [],
+			hours: [],
+			minutes: [],
+			seconds: [],
+			year: 0,
+			month: 0,
+			day: 0,
+			hour: 0,
+			minute: 0,
+			second: 0,
+			reset: false,
+			startDate: "",
+			endDate: "",
+			valueArr: [],
+			provinces: provinces,
+			citys: citys[0],
+			areas: areas[0][0],
+			province: 0,
+			city: 0,
+			area: 0,
+			moving: false // 列是否还在滑动中，微信小程序如果在滑动中就点确定，结果可能不准确
+		};
+	},
+	mounted() {
+		this.init();
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		propsChange() {
+			// 引用这几个变量，是为了监听其变化
+			return `${this.mode}-${this.defaultTime}-${this.startYear}-${this.endYear}-${
+				this.defaultRegion
+			}-${this.areaCode}`;
+		},
+		regionChange() {
+			// 引用这几个变量，是为了监听其变化
+			return `${this.province}-${this.city}`;
+		},
+		yearAndMonth() {
+			return `${this.year}-${this.month}`;
+		},
+		uZIndex() {
+			// 如果用户有传递z-index值，优先使用
+			return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+		}
+	},
+	watch: {
+		propsChange() {
+			this.reset = true;
+			setTimeout(() => this.init(), 10);
+		},
+		// 如果地区发生变化，为了让picker联动起来，必须重置this.citys和this.areas
+		regionChange(val) {
+			this.citys = citys[this.province];
+			this.areas = areas[this.province][this.city];
+		},
+		// watch监听月份的变化，实时变更日的天数，因为不同月份，天数不一样
+		// 一个月可能有30，31天，甚至闰年2月的29天，平年2月28天
+		yearAndMonth(val) {
+			if (this.params.year) this.setDays();
+		},
+		// 微信和QQ小程序由于一些奇怪的原因(故同时对所有平台均初始化一遍)，需要重新初始化才能显示正确的值
+		valueCom:{
+			immediate: true,
+			handler(n){
+				if (n) {
+					this.reset = true;
+					setTimeout(() => this.init(), 10);
+				}
+				this.popupValue = n;
+			}
+		},
+	},
+	methods: {
+		// 标识滑动开始，只有微信小程序才有这样的事件
+		pickstart() {
+			// #ifdef MP-WEIXIN
+			this.moving = true;
+			// #endif
+		},
+		// 标识滑动结束
+		pickend() {
+			// #ifdef MP-WEIXIN
+			this.moving = false;
+			// #endif
+		},
+		// 对单列和多列形式的判断是否有传入变量的情况
+		getItemValue(item, mode) {
+			// 目前(2020-05-25)uni-app对微信小程序编译有错误，导致v-if为false中的内容也执行，错误导致
+			// 单列模式或者多列模式中的getItemValue同时被执行，故在这里再加一层判断
+			if (this.mode == mode) {
+				return typeof item == "object" ? item[this.rangeKey] : item;
+			}
+		},
+		// 小于10前面补0，用于月份，日期，时分秒等
+		formatNumber(num) {
+			return +num < 10 ? "0" + num : String(num);
+		},
+		// 生成递进的数组
+		generateArray: function(start, end) {
+			// 转为数值格式，否则用户给end-year等传递字符串值时，下面的end+1会导致字符串拼接，而不是相加
+			start = Number(start);
+			end = Number(end);
+			end = end > start ? end : start;
+			// 生成数组，获取其中的索引，并剪出来
+			return [...Array(end + 1).keys()].slice(start);
+		},
+		getIndex: function(arr, val) {
+			let index = arr.indexOf(val);
+			// 如果index为-1(即找不到index值)，~(-1)=-(-1)-1=0，导致条件不成立
+			return ~index ? index : 0;
+		},
+		//日期时间处理
+		initTimeValue() {
+			// 格式化时间，在IE浏览器(uni不存在此情况)，无法识别日期间的"-"间隔符号
+			let fdate = this.defaultTime.replace(/\-/g, "/");
+			fdate = fdate && fdate.indexOf("/") == -1 ? `2020/01/01 ${fdate}` : fdate;
+			let time = null;
+			if (fdate) time = new Date(fdate);
+			else time = new Date();
+			// 获取年日月时分秒
+			this.year = time.getFullYear();
+			this.month = Number(time.getMonth()) + 1;
+			this.day = time.getDate();
+			this.hour = time.getHours();
+			this.minute = time.getMinutes();
+			this.second = time.getSeconds();
+		},
+		init() {
+			this.valueArr = [];
+			this.reset = false;
+			if (this.mode == "time") {
+				this.initTimeValue();
+				if (this.params.year) {
+					this.valueArr.push(0);
+					this.setYears();
+				}
+				if (this.params.month) {
+					this.valueArr.push(0);
+					this.setMonths();
+				}
+				if (this.params.day) {
+					this.valueArr.push(0);
+					this.setDays();
+				}
+				if (this.params.hour) {
+					this.valueArr.push(0);
+					this.setHours();
+				}
+				if (this.params.minute) {
+					this.valueArr.push(0);
+					this.setMinutes();
+				}
+				if (this.params.second) {
+					this.valueArr.push(0);
+					this.setSeconds();
+				}
+			} else if (this.mode == "region") {
+				if (this.params.province) {
+					this.valueArr.push(0);
+					this.setProvinces();
+				}
+				if (this.params.city) {
+					this.valueArr.push(0);
+					this.setCitys();
+				}
+				if (this.params.area) {
+					this.valueArr.push(0);
+					this.setAreas();
+				}
+			} else if (this.mode == "selector") {
+				this.valueArr = this.defaultSelector;
+			} else if (this.mode == "multiSelector") {
+				this.valueArr = this.defaultSelector;
+				this.multiSelectorValue = this.defaultSelector;
+			}
+			this.$forceUpdate();
+		},
+		// 设置picker的某一列值
+		setYears() {
+			// 获取年份集合
+			this.years = this.generateArray(this.startYear, this.endYear);
+			// 设置this.valueArr某一项的值，是为了让picker预选中某一个值
+			this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.years, this.year));
+		},
+		setMonths() {
+			this.months = this.generateArray(1, 12);
+			this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.months, this.month));
+		},
+		setDays() {
+			let totalDays = new Date(this.year, this.month, 0).getDate();
+			this.days = this.generateArray(1, totalDays);
+			let index = 0;
+			// 这里不能使用类似setMonths()中的this.valueArr.splice(this.valueArr.length - 1, xxx)做法
+			// 因为this.month和this.year变化时，会触发watch中的this.setDays()，导致this.valueArr.length计算有误
+			if (this.params.year && this.params.month) index = 2;
+			else if (this.params.month) index = 1;
+			else if (this.params.year) index = 1;
+			else index = 0;
+			// 当月份变化时，会导致日期的天数也会变化，如果原来选的天数大于变化后的天数，则重置为变化后的最大值
+			// 比如原来选中3月31日，调整为2月后，日期变为最大29，这时如果day值继续为31显然不合理，于是将其置为29(picker-column从1开始)
+			if (this.day > this.days.length) this.day = this.days.length;
+			this.valueArr.splice(index, 1, this.getIndex(this.days, this.day));
+		},
+		setHours() {
+			this.hours = this.generateArray(0, 23);
+			this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.hours, this.hour));
+		},
+		setMinutes() {
+			this.minutes = this.generateArray(0, 59);
+			this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.minutes, this.minute));
+		},
+		setSeconds() {
+			this.seconds = this.generateArray(0, 59);
+			this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.seconds, this.second));
+		},
+		setProvinces() {
+			// 判断是否需要province参数
+			if (!this.params.province) return;
+			let tmp = "";
+			let useCode = false;
+			// 如果同时配置了defaultRegion和areaCode，优先使用areaCode参数
+			if (this.areaCode.length) {
+				tmp = this.areaCode[0];
+				useCode = true;
+			} else if (this.defaultRegion.length) tmp = this.defaultRegion[0];
+			else tmp = 0;
+			// 历遍省份数组匹配
+			provinces.map((v, k) => {
+				if (useCode ? v.code == tmp : v.name == tmp) {
+					tmp = k;
+				}
+			});
+			this.province = tmp;
+			this.provinces = provinces;
+			// 设置默认省份的值
+			this.valueArr.splice(0, 1, this.province);
+		},
+		setCitys() {
+			if (!this.params.city) return;
+			let tmp = "";
+			let useCode = false;
+			if (this.areaCode.length) {
+				tmp = this.areaCode[1];
+				useCode = true;
+			} else if (this.defaultRegion.length) tmp = this.defaultRegion[1];
+			else tmp = 0;
+			citys[this.province].map((v, k) => {
+				if (useCode ? v.code == tmp : v.name == tmp) {
+					tmp = k;
+				}
+			});
+			this.city = tmp;
+			this.citys = citys[this.province];
+			this.valueArr.splice(1, 1, this.city);
+		},
+		setAreas() {
+			if (!this.params.area) return;
+			let tmp = "";
+			let useCode = false;
+			if (this.areaCode.length) {
+				tmp = this.areaCode[2];
+				useCode = true;
+			} else if (this.defaultRegion.length) tmp = this.defaultRegion[2];
+			else tmp = 0;
+			areas[this.province][this.city].map((v, k) => {
+				if (useCode ? v.code == tmp : v.name == tmp) {
+					tmp = k;
+				}
+			});
+			this.area = tmp;
+			this.areas = areas[this.province][this.city];
+			this.valueArr.splice(2, 1, this.area);
+		},
+		close() {
+			this.$emit("input", false);
+			this.$emit("update:modelValue", false);
+		},
+		// 用户更改picker的列选项
+		change(e) {
+			this.valueArr = e.detail.value;
+			let i = 0;
+			if (this.mode == "time") {
+				// 这里使用i++，是因为this.valueArr数组的长度是不确定长度的，它根据this.params的值来配置长度
+				// 进入if规则，i会加1，保证了能获取准确的值
+				if (this.params.year) this.year = this.years[this.valueArr[i++]];
+				if (this.params.month) this.month = this.months[this.valueArr[i++]];
+				if (this.params.day) this.day = this.days[this.valueArr[i++]];
+				if (this.params.hour) this.hour = this.hours[this.valueArr[i++]];
+				if (this.params.minute) this.minute = this.minutes[this.valueArr[i++]];
+				if (this.params.second) this.second = this.seconds[this.valueArr[i++]];
+			} else if (this.mode == "region") {
+				if (this.params.province) this.province = this.valueArr[i++];
+				if (this.params.city) this.city = this.valueArr[i++];
+				if (this.params.area) this.area = this.valueArr[i++];
+			} else if (this.mode == "multiSelector") {
+				let index = null;
+				// 对比前后两个数组，寻找变更的是哪一列，如果某一个元素不同，即可判定该列发生了变化
+				this.defaultSelector.map((val, idx) => {
+					if (val != e.detail.value[idx]) index = idx;
+				});
+				// 为了让用户对多列变化时，对动态设置其他列的变更
+				if (index != null) {
+					this.$emit("columnchange", {
+						column: index,
+						index: e.detail.value[index]
+					});
+				}
+			}
+		},
+		// 用户点击确定按钮
+		getResult(event = null) {
+			// #ifdef MP-WEIXIN
+			if (this.moving) return;
+			// #endif
+			let result = {};
+			// 只返回用户在this.params中配置了为true的字段
+			if (this.mode == "time") {
+				if (this.params.year) result.year = this.formatNumber(this.year || 0);
+				if (this.params.month) result.month = this.formatNumber(this.month || 0);
+				if (this.params.day) result.day = this.formatNumber(this.day || 0);
+				if (this.params.hour) result.hour = this.formatNumber(this.hour || 0);
+				if (this.params.minute) result.minute = this.formatNumber(this.minute || 0);
+				if (this.params.second) result.second = this.formatNumber(this.second || 0);
+				if (this.params.timestamp) result.timestamp = this.getTimestamp();
+			} else if (this.mode == "region") {
+				if (this.params.province) result.province = provinces[this.province];
+				if (this.params.city) result.city = citys[this.province][this.city];
+				if (this.params.area) result.area = areas[this.province][this.city][this.area];
+			} else if (this.mode == "selector") {
+				result = this.valueArr;
+			} else if (this.mode == "multiSelector") {
+				result = this.valueArr;
+			}
+			if (event) this.$emit(event, result);
+			this.close();
+		},
+		// 获取时间戳
+		getTimestamp() {
+			// yyyy-mm-dd为安卓写法，不支持iOS，需要使用"/"分隔，才能二者兼容
+			let time =
+				this.year +
+				"/" +
+				this.month +
+				"/" +
+				this.day +
+				" " +
+				this.hour +
+				":" +
+				this.minute +
+				":" +
+				this.second;
+			return new Date(time).getTime() / 1000;
+		},
+		// 获得数据源
+		getDateSource() {
+			return {
+				provinces,
+				citys,
+				areas
+			};
+		},
+		// 智能识别省市区
+		regionDiscern(addressText){
+			// 街道地址
+			let address = "";
+			// 省
+			let province = {};
+			// 市
+			let city = {};
+			// 区
+			let area = {};
+			if (!addressText) return { code: -1, msg: "地址文本不能为空" };
+			addressText.trim(); // 去除前后空格
+			// 省
+			// 1.先找出省份，通过匹配前面两个字(中国34个省份中，前面两个字不会重复)
+			let firstTwoKey = addressText.substring(0, 2); //字符串开始的两个字符
+			// 所在省的下标
+			let provinceIndex = -1;
+			
+			for (let i = 0; i < provinces.length; i++) {
+				let { code, name } = provinces[i];
+				if (name.indexOf(firstTwoKey) == 0) {
+					province = { code, name };
+					provinceIndex = i;
+					break;
+				}
+			}
+			if (provinceIndex == -1) return { code: -1, msg: `省份【${firstTwoKey}】没有找到，请输入正确的地址` };
+			
+			// 获取市
+			let citysArr = citys[provinceIndex];
+			// 所在市的下标
+			let cityIndex = -1;
+			
+			for (let i = 0; i < citysArr.length; i++) {
+				let { name, code } = citysArr[i];
+				// 除去最后一个 市 字
+				let cityName = name.substr(0, name.length - 1);
+				// 用城市的名字去匹配 addressText 地址
+				if (addressText.indexOf(cityName) > -1) {
+					city = { code, name };
+					cityIndex = i;
+					break;
+				}
+			}
+			if (cityIndex == -1) return { code: -1, msg: `地级市没有找到，请输入正确的地址` };
+			
+			// 区
+			let areasArr = areas[provinceIndex][cityIndex];
+			// 所在区的下标
+			let areaIndex = -1;
+			
+			for (let i = 0; i < areasArr.length; i++) {
+				let { code, name } = areasArr[i];
+				// 区名(县名)一般为3个字，如江干区，有可能会简写成 江干
+				// 区名(县名)为2个字时，不会简写，如蓉县
+				let reg = name;
+				if (name.length > 2) reg += `|${name.substr(0, name.length - 1)}`;
+				// 查找地址中是否存在该区名
+				let areaRegExp = new RegExp(reg);
+				
+				if (addressText.search(areaRegExp) > -1) {
+					area = { code, name };
+					// 详情地址
+					address = addressText.replace(new RegExp(reg), "{{~}}").split("{{~}}")[1];
+					areaIndex = i;
+					break;
+				}
+			}
+			if (areaIndex == -1) return { code: -1, msg: "县级市没有找到，请输入正确的地址" };
+			let formatted_address = `${province.name}${city.name}${area.name}${address}`;
+			let res = {
+				code: 0,
+				msg: "ok",
+				data: {
+					province, // 省
+					city,	// 市
+					area,	// 区
+					address, // 街道地址
+					formatted_address, // 完整格式化地址
+				}
+			};
+			return res;
+		},
+		
+		// 智能识别收货信息
+		addressDiscern(text) {
+			// 收货人姓名
+			let name = "";
+			// 收货人手机
+			let mobile = "";
+			// 街道地址
+			let address = "";
+			// 省
+			let province = {};
+			// 市
+			let city = {};
+			// 区
+			let area = {};
+
+			if (!text) return { code: -1, msg: "地址文本不能为空" };
+			//let newText = text.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5\ ]/g,' ');
+			let textArr = text.split(/[^\u4e00-\u9fa5a-zA-Z0-9+-（）()]+/g).filter(v => v.length);
+			if (textArr.length != 3) return { code: -1, msg: "地址格式不正确，请按姓名 手机号 收货地址格式。" };
+			// 获取姓名和手机号
+			let temp;
+			let addressText; // 地址原文
+			for (let [k, v] of textArr.entries()) {
+				if (/^1[3,4,5,6,7,8,9][0-9]{9}$/.test(v)) {
+					mobile = v;
+					continue;
+				}
+				//记录第一次出现的字符串
+				if (!temp) {
+					temp = v;
+					continue;
+				}
+				// 当前字符串的长度和之前字符串的长度的对比，进而确定姓名和地址信息
+				temp.length > v.length? ((addressText = temp), (name = v)): ((addressText = v), (name = temp));
+			}
+			let positionRes = this.regionDiscern(addressText);
+			if (positionRes.code !== 0) return positionRes;
+			
+			let res = {
+				code: 0,
+				msg: "ok",
+				data: {
+					name, // 姓名
+					mobile, // 手机号
+					position: positionRes.data, // 省市区街道信息
+				}
+			};
+			return res;
+		}
+		
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.u-datetime-picker {
+	position: relative;
+	z-index: 999;
+}
+
+.u-picker-view {
+	height: 100%;
+	box-sizing: border-box;
+}
+
+.u-picker-header {
+	width: 100%;
+	height: 90rpx;
+	padding: 0 40rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	box-sizing: border-box;
+	font-size: 30rpx;
+	background: #fff;
+	position: relative;
+}
+
+.u-picker-header::after {
+	content: "";
+	position: absolute;
+	border-bottom: 1rpx solid #eaeef1;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	bottom: 0;
+	right: 0;
+	left: 0;
+}
+
+.u-picker__title {
+	color: $u-content-color;
+}
+
+.u-picker-body {
+	width: 100%;
+	height: 500rpx;
+	overflow: hidden;
+	background-color: #fff;
+}
+
+.u-column-item {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 32rpx;
+	color: $u-main-color;
+	padding: 0 8rpx;
+}
+
+.u-text {
+	font-size: 24rpx;
+	padding-left: 8rpx;
+}
+
+.u-btn-picker {
+	padding: 16rpx;
+	box-sizing: border-box;
+	text-align: center;
+	text-decoration: none;
+}
+
+.u-opacity {
+	opacity: 0.5;
+}
+
+.u-btn-picker--primary {
+	color: $u-type-primary;
+}
+
+.u-btn-picker--tips {
+	color: $u-tips-color;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-popup/u-popup.vue b/uni_modules/vk-uview-ui/components/u-popup/u-popup.vue
new file mode 100644
index 0000000..44b4d7f
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-popup/u-popup.vue
@@ -0,0 +1,480 @@
+<template>
+	<view v-if="visibleSync" :style="[customStyle, {
+		zIndex: uZindex - 1
+	}]" class="u-drawer" hover-stop-propagation>
+		<u-mask :blur="blur" :duration="duration" :custom-style="maskCustomStyle" :maskClickAble="maskCloseAble" :z-index="uZindex - 2" :show="showDrawer && mask" @click="maskClick"></u-mask>
+		<!-- 移除	@tap.stop.prevent -->
+		<view
+			class="u-drawer-content"
+			@tap="modeCenterClose(mode)"
+			:class="[
+				safeAreaInsetBottom ? 'safe-area-inset-bottom' : '',
+				'u-drawer-' + mode,
+				showDrawer ? 'u-drawer-content-visible' : '',
+				zoom && mode == 'center' ? 'u-animation-zoom' : ''
+			]"
+			@touchmove.stop.prevent
+			:style="[style]"
+		>
+			<view class="u-mode-center-box" @tap.stop.prevent @touchmove.stop.prevent v-if="mode == 'center'" :style="[centerStyle]">
+				<u-icon
+					@click="close"
+					v-if="closeable"
+					class="u-close"
+					:class="['u-close--' + closeIconPos]"
+					:name="closeIcon"
+					:color="closeIconColor"
+					:size="closeIconSize"
+				></u-icon>
+				<scroll-view class="u-drawer__scroll-view" scroll-y="true">
+					<slot></slot>
+				</scroll-view>
+			</view>
+			<scroll-view class="u-drawer__scroll-view" scroll-y="true" v-else>
+				<slot></slot>
+			</scroll-view>
+			<view @tap="close" class="u-close" :class="['u-close--' + closeIconPos]">
+				<u-icon
+					v-if="mode != 'center' && closeable"
+					:name="closeIcon"
+					:color="closeIconColor"
+					:size="closeIconSize"
+				></u-icon>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * popup 弹窗
+ * @description 弹出层容器，用于展示弹窗、信息提示等内容，支持上、下、左、右和中部弹出。组件只提供容器，内部内容由用户自定义
+ * @tutorial https://www.uviewui.com/components/popup.html
+ * @property {String} mode 弹出方向（默认left）
+ * @property {Boolean} mask 是否显示遮罩（默认true）
+ * @property {Stringr | Number} length mode=left | 见官网说明（默认auto）
+ * @property {Boolean} zoom 是否开启缩放动画，只在mode为center时有效（默认true）
+ * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配（默认false）
+ * @property {Boolean} mask-close-able 点击遮罩是否可以关闭弹出层（默认true）
+ * @property {Object} custom-style 用户自定义样式
+ * @property {Stringr | Number} negative-top 中部弹出时，往上偏移的值
+ * @property {Numberr | String} border-radius 弹窗圆角值（默认0）
+ * @property {Numberr | String} z-index 弹出内容的z-index值（默认1075）
+ * @property {Boolean} closeable 是否显示关闭图标（默认false）
+ * @property {String} close-icon 关闭图标的名称，只能uView的内置图标
+ * @property {String} close-icon-pos 自定义关闭图标位置（默认top-right）
+ * @property {String} close-icon-color 关闭图标的颜色（默认#909399）
+ * @property {Number | String} close-icon-size 关闭图标的大小，单位rpx（默认30）
+ * @event {Function} open 弹出层打开
+ * @event {Function} close 弹出层收起
+ * @example <u-popup v-model="show"><view>出淤泥而不染，濯清涟而不妖</view></u-popup>
+ */
+export default {
+	name: 'u-popup',
+	emits: ["update:modelValue", "input", "open", "close"],
+	props: {
+		value: {
+			type: Boolean,
+			default: false
+		},
+		modelValue: {
+			type: Boolean,
+			default: false
+		},
+		/**
+		 * 显示状态
+		 */
+		show: {
+			type: Boolean,
+			default: false
+		},
+		/**
+		 * 弹出方向，left|right|top|bottom|center
+		 */
+		mode: {
+			type: String,
+			default: 'left'
+		},
+		/**
+		 * 是否显示遮罩
+		 */
+		mask: {
+			type: Boolean,
+			default: true
+		},
+		// 抽屉的宽度(mode=left|right)，或者高度(mode=top|bottom)，单位rpx，或者"auto"
+		// 或者百分比"50%"，表示由内容撑开高度或者宽度
+		length: {
+			type: [Number, String],
+			default: 'auto'
+		},
+		// 是否开启缩放动画，只在mode=center时有效
+		zoom: {
+			type: Boolean,
+			default: true
+		},
+		// 是否开启底部安全区适配，开启的话，会在iPhoneX机型底部添加一定的内边距
+		safeAreaInsetBottom: {
+			type: Boolean,
+			default: false
+		},
+		// 是否可以通过点击遮罩进行关闭
+		maskCloseAble: {
+			type: Boolean,
+			default: true
+		},
+		// 用户自定义样式
+		customStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 此为内部参数，不在文档对外使用，为了解决Picker和keyboard等融合了弹窗的组件
+		// 对v-model双向绑定多层调用造成报错不能修改props值的问题
+		popup: {
+			type: Boolean,
+			default: true
+		},
+		// 显示显示弹窗的圆角，单位rpx
+		borderRadius: {
+			type: [Number, String],
+			default: 0
+		},
+		zIndex: {
+			type: [Number, String],
+			default: ''
+		},
+		// 是否显示关闭图标
+		closeable: {
+			type: Boolean,
+			default: false
+		},
+		// 关闭图标的名称，只能uView的内置图标
+		closeIcon: {
+			type: String,
+			default: 'close'
+		},
+		// 自定义关闭图标位置，top-left为左上角，top-right为右上角，bottom-left为左下角，bottom-right为右下角
+		closeIconPos: {
+			type: String,
+			default: 'top-right'
+		},
+		// 关闭图标的颜色
+		closeIconColor: {
+			type: String,
+			default: '#909399'
+		},
+		// 关闭图标的大小，单位rpx
+		closeIconSize: {
+			type: [String, Number],
+			default: '30'
+		},
+		// 宽度，只对左，右，中部弹出时起作用，单位rpx，或者"auto"
+		// 或者百分比"50%"，表示由内容撑开高度或者宽度，优先级高于length参数
+		width: {
+			type: String,
+			default: ''
+		},
+		// 高度，只对上，下，中部弹出时起作用，单位rpx，或者"auto"
+		// 或者百分比"50%"，表示由内容撑开高度或者宽度，优先级高于length参数
+		height: {
+			type: String,
+			default: ''
+		},
+		// 给一个负的margin-top，往上偏移，避免和键盘重合的情况，仅在mode=center时有效
+		negativeTop: {
+			type: [String, Number],
+			default: 0
+		},
+		// 遮罩的样式，一般用于修改遮罩的透明度
+		maskCustomStyle: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		// 遮罩打开或收起的动画过渡时间，单位ms
+		duration: {
+			type: [String, Number],
+			default: 250
+		},
+		// 遮罩的模糊度
+		blur: {
+			type: [String, Number],
+			default: 0
+		},
+		
+	},
+	data() {
+		return {
+			visibleSync: false,
+			showDrawer: false,
+			timer: null,
+			closeFromInner: false, // value的值改变，是发生在内部还是外部
+		};
+	},
+	computed: {
+		valueCom(){
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+			
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		// 根据mode的位置，设定其弹窗的宽度(mode = left|right)，或者高度(mode = top|bottom)
+		style() {
+			let style = {};
+			// 如果是左边或者上边弹出时，需要给translate设置为负值，用于隐藏
+			if (this.mode == 'left' || this.mode == 'right') {
+				style = {
+					width: this.width ? this.getUnitValue(this.width) : this.getUnitValue(this.length),
+					height: '100%',
+					transform: `translate3D(${this.mode == 'left' ? '-100%' : '100%'},0px,0px)`
+				};
+			} else if (this.mode == 'top' || this.mode == 'bottom') {
+				style = {
+					width: '100%',
+					height: this.height ? this.getUnitValue(this.height) : this.getUnitValue(this.length),
+					transform: `translate3D(0px,${this.mode == 'top' ? '-100%' : '100%'},0px)`
+				};
+			}
+			style.zIndex = this.uZindex;
+			// 如果用户设置了borderRadius值，添加弹窗的圆角
+			if (this.borderRadius) {
+				switch (this.mode) {
+					case 'left':
+						style.borderRadius = `0 ${this.borderRadius}rpx ${this.borderRadius}rpx 0`;
+						break;
+					case 'top':
+						style.borderRadius = `0 0 ${this.borderRadius}rpx ${this.borderRadius}rpx`;
+						break;
+					case 'right':
+						style.borderRadius = `${this.borderRadius}rpx 0 0 ${this.borderRadius}rpx`;
+						break;
+					case 'bottom':
+						style.borderRadius = `${this.borderRadius}rpx ${this.borderRadius}rpx 0 0`;
+						break;
+					default:
+				}
+				// 不加可能圆角无效
+				style.overflow = 'hidden';
+			}
+			if(this.duration) style.transition = `all ${this.duration / 1000}s linear`;
+			return style;
+		},
+		// 中部弹窗的特有样式
+		centerStyle() {
+			let style = {};
+			style.width = this.width ? this.getUnitValue(this.width) : this.getUnitValue(this.length);
+			// 中部弹出的模式，如果没有设置高度，就用auto值，由内容撑开高度
+			style.height = this.height ? this.getUnitValue(this.height) : 'auto';
+			style.zIndex = this.uZindex;
+			style.marginTop = `-${this.$u.addUnit(this.negativeTop)}`;
+			if (this.borderRadius) {
+				style.borderRadius = `${this.borderRadius}rpx`;
+				// 不加可能圆角无效
+				style.overflow = 'hidden';
+			}
+			return style;
+		},
+		// 计算整理后的z-index值
+		uZindex() {
+			return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+		}
+	},
+	watch: {
+		valueCom:{
+			immediate: true,
+			handler(val){
+				if (val) {
+					this.open();
+				} else if(!this.closeFromInner) {
+					this.close();
+				}
+				this.closeFromInner = false;
+			}
+		}
+	},
+	mounted() {
+		// 组件渲染完成时，检查value是否为true，如果是，弹出popup
+		this.valueCom && this.open();
+	},
+	methods: {
+		// 判断传入的值，是否带有单位，如果没有，就默认用rpx单位
+		getUnitValue(val) {
+			if(/(%|px|rpx|auto)$/.test(val)) return val;
+			else return val + 'rpx'
+		},
+		// 遮罩被点击
+		maskClick() {
+			this.close();
+		},
+		close() {
+			// 标记关闭是内部发生的，否则修改了value值，导致watch中对value检测，导致再执行一遍close
+			// 造成@close事件触发两次
+			this.closeFromInner = true;
+			this.change('showDrawer', 'visibleSync', false);
+		},
+		// 中部弹出时，需要.u-drawer-content将居中内容，此元素会铺满屏幕，点击需要关闭弹窗
+		// 让其只在mode=center时起作用
+		modeCenterClose(mode) {
+			if (mode != 'center' || !this.maskCloseAble) return;
+			this.close();
+		},
+		open() {
+			this.change('visibleSync', 'showDrawer', true);
+		},
+		// 此处的原理是，关闭时先通过动画隐藏弹窗和遮罩，再移除整个组件
+		// 打开时，先渲染组件，延时一定时间再让遮罩和弹窗的动画起作用
+		change(param1, param2, status) {
+			// 如果this.popup为false，意味着为picker，actionsheet等组件调用了popup组件
+			if (this.popup == true) {
+				this.$emit('input', status);
+				this.$emit("update:modelValue", status);
+			}
+			this[param1] = status;
+			if(status) {
+				// #ifdef H5 || MP
+				this.timer = setTimeout(() => {
+					this[param2] = status;
+					this.$emit(status ? 'open' : 'close');
+				}, 50);
+				// #endif
+				// #ifndef H5 || MP
+				this.$nextTick(() => {
+					this[param2] = status;
+					this.$emit(status ? 'open' : 'close');
+				})
+				// #endif
+			} else {
+				this.timer = setTimeout(() => {
+					this[param2] = status;
+					this.$emit(status ? 'open' : 'close');
+				}, this.duration);
+			}
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../libs/css/style.components.scss";
+
+.u-drawer {
+	/* #ifndef APP-NVUE */
+	display: block;
+	/* #endif */
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	overflow: hidden;
+}
+
+.u-drawer-content {
+	/* #ifndef APP-NVUE */
+	display: block;
+	/* #endif */
+	position: absolute;
+	z-index: 1003;
+	transition: all 0.25s linear;
+}
+
+.u-drawer__scroll-view {
+	width: 100%;
+	height: 100%;
+}
+
+.u-drawer-left {
+	top: 0;
+	bottom: 0;
+	left: 0;
+	background-color: #ffffff;
+}
+
+.u-drawer-right {
+	right: 0;
+	top: 0;
+	bottom: 0;
+	background-color: #ffffff;
+}
+
+.u-drawer-top {
+	top: 0;
+	left: 0;
+	right: 0;
+	background-color: #ffffff;
+}
+
+.u-drawer-bottom {
+	bottom: 0;
+	left: 0;
+	right: 0;
+	background-color: #ffffff;
+}
+
+.u-drawer-center {
+	@include vue-flex;
+	flex-direction: column;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	top: 0;
+	justify-content: center;
+	align-items: center;
+	opacity: 0;
+	z-index: 99999;
+}
+
+.u-mode-center-box {
+	min-width: 100rpx;
+	min-height: 100rpx;
+	/* #ifndef APP-NVUE */
+	display: block;
+	/* #endif */
+	position: relative;
+	background-color: #ffffff;
+}
+
+.u-drawer-content-visible.u-drawer-center {
+	transform: scale(1);
+	opacity: 1;
+}
+
+.u-animation-zoom {
+	transform: scale(1.15);
+}
+
+.u-drawer-content-visible {
+	transform: translate3D(0px, 0px, 0px) !important;
+}
+
+.u-close {
+	position: absolute;
+	z-index: 3;
+}
+
+.u-close--top-left {
+	top: 30rpx;
+	left: 30rpx;
+}
+
+.u-close--top-right {
+	top: 30rpx;
+	right: 30rpx;
+}
+
+.u-close--bottom-left {
+	bottom: 30rpx;
+	left: 30rpx;
+}
+
+.u-close--bottom-right {
+	right: 30rpx;
+	bottom: 30rpx;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-radio-group/u-radio-group.vue b/uni_modules/vk-uview-ui/components/u-radio-group/u-radio-group.vue
new file mode 100644
index 0000000..adb6788
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-radio-group/u-radio-group.vue
@@ -0,0 +1,176 @@
+<template>
+	<view class="u-radio-group u-clearfix" :class="uFromData.inputAlign == 'right' ? 'flex-end' : ''">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+import Emitter from "../../libs/util/emitter.js";
+/**
+ * radioRroup 单选框父组件
+ * @description 单选框用于有一个选择，用户只能选择其中一个的场景。搭配u-radio使用
+ * @tutorial https://www.uviewui.com/components/radio.html
+ * @property {Boolean} disabled 是否禁用所有radio（默认false）
+ * @property {String Number} size 组件整体的大小，单位rpx（默认40）
+ * @property {String} active-color 选中时的颜色，应用到所有子Radio组件（默认#2979ff）
+ * @property {String Number} icon-size 图标大小，单位rpx（默认20）
+ * @property {String} shape 外观形状，shape-方形，circle-圆形(默认circle)
+ * @property {Boolean} label-disabled 是否禁止点击文本操作checkbox(默认false)
+ * @property {String} width 宽度，需带单位
+ * @property {Boolean} wrap 是否每个radio都换行（默认false）
+ * @event {Function} change 任一个radio状态发生变化时触发
+ * @example <u-radio-group v-model="value"></u-radio-group>
+ */
+export default {
+	name: "u-radio-group",
+	emits: ["update:modelValue", "input", "change"],
+	mixins: [Emitter],
+	props: {
+		// 匹配某一个radio组件，如果某个radio的name值等于此值，那么这个radio就被会选中
+		value: {
+			type: [String, Number],
+			default: ""
+		},
+		modelValue: {
+			type: [String, Number],
+			default: ""
+		},
+		// 是否禁用所有单选框
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 选中状态下的颜色
+		activeColor: {
+			type: String,
+			default: "#2979ff"
+		},
+		// 组件的整体大小
+		size: {
+			type: [String, Number],
+			default: 34
+		},
+		// 是否禁止点击提示语选中复选框
+		labelDisabled: {
+			type: Boolean,
+			default: false
+		},
+		// 形状，square为方形，circle为圆型
+		shape: {
+			type: String,
+			default: "circle"
+		},
+		// 图标的大小，单位rpx
+		iconSize: {
+			type: [String, Number],
+			default: 20
+		},
+		// 每个checkbox占u-checkbox-group的宽度
+		width: {
+			type: [String, Number],
+			default: "auto"
+		},
+		// 是否每个checkbox都换行
+		wrap: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			uFromData: {
+				inputAlign: "left"
+			}
+		};
+	},
+	created() {
+		// 如果将children定义在data中，在微信小程序会造成循环引用而报错
+		this.children = [];
+	},
+	mounted() {
+		// 支付宝、头条小程序不支持provide/inject，所以使用这个方法获取整个父组件，在created定义，避免循环应用
+		let parent = this.$u.$parent.call(this, "u-form");
+		if (parent) {
+			Object.keys(this.uFromData).map(key => {
+				this.uFromData[key] = parent[key];
+			});
+		}
+	},
+	watch: {
+		// 当父组件需要子组件需要共享的参数发生了变化，手动通知子组件
+		parentData() {
+			if (this.children.length) {
+				this.children.map(child => {
+					// 判断子组件(u-radio)如果有updateParentData方法的话，就就执行(执行的结果是子组件重新从父组件拉取了最新的值)
+					typeof child.updateParentData == "function" && child.updateParentData();
+				});
+			}
+		}
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		// 这里computed的变量，都是子组件u-radio需要用到的，由于头条小程序的兼容性差异，子组件无法实时监听父组件参数的变化
+		// 所以需要手动通知子组件，这里返回一个parentData变量，供watch监听，在其中去通知每一个子组件重新从父组件(u-radio-group)
+		// 拉取父组件新的变化后的参数
+		parentData() {
+			return [
+				this.value,
+				this.disabled,
+				this.activeColor,
+				this.size,
+				this.labelDisabled,
+				this.shape,
+				this.iconSize,
+				this.width,
+				this.wrap
+			];
+		}
+	},
+	methods: {
+		// 该方法有子组件radio调用，当一个radio被选中的时候，给父组件设置value值(props传递的value)
+		setValue(val) {
+			// 通过子组件传递过来的val值(此被选中的子组件内部已将parentValue设置等于val的值)，将其他
+			// u-radio设置未选中的状态
+			this.children.map(child => {
+				if (child.parentData.value != val) child.parentData.value = "";
+			});
+			// 通过emit事件，设置父组件通过v-model双向绑定的值
+			this.$emit("input", val);
+			this.$emit("update:modelValue", val);
+			this.$emit("change", val);
+			// 等待下一个周期再执行，因为this.$emit('input')作用于父组件，再反馈到子组件内部，需要时间
+			// 由于头条小程序执行迟钝，故需要用几十毫秒的延时
+			setTimeout(() => {
+				// 将当前的值发送到 u-form-item 进行校验
+				this.dispatch("u-form-item", "onFieldChange", val);
+			}, 60);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-radio-group {
+	/* #ifndef MP || APP-NVUE */
+	display: inline-flex;
+	flex-wrap: wrap;
+	/* #endif */
+}
+.u-radio-group.flex-end {
+	/* #ifndef APP-NVUE */
+	display: inline-flex;
+	justify-content: flex-end;
+	flex-wrap: wrap;
+	/* #endif */
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-radio/u-radio.vue b/uni_modules/vk-uview-ui/components/u-radio/u-radio.vue
new file mode 100644
index 0000000..41503aa
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-radio/u-radio.vue
@@ -0,0 +1,276 @@
+<template>
+	<view class="u-radio" :style="[radioStyle]">
+		<view class="u-radio__icon-wrap" @tap="toggle" :class="[iconClass]" :style="[iconStyle]">
+			<u-icon
+				class="u-radio__icon-wrap__icon"
+				name="checkbox-mark"
+				:size="elIconSize"
+				:color="iconColor"
+			/>
+		</view>
+		<view class="u-radio__label" @tap="onClickLabel" :style="{ fontSize: $u.addUnit(labelSize) }">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * radio 单选框
+ * @description 单选框用于有一个选择，用户只能选择其中一个的场景。搭配u-radio-group使用
+ * @tutorial https://www.uviewui.com/components/radio.html
+ * @property {String Number} icon-size 图标大小，单位rpx（默认24）
+ * @property {String Number} label-size label字体大小，单位rpx（默认28）
+ * @property {String Number} name radio组件的标示符
+ * @property {String} shape 形状，见上方说明（默认circle）
+ * @property {Boolean} disabled 是否禁用（默认false）
+ * @property {Boolean} label-disabled 点击文本是否可以操作radio（默认true）
+ * @property {String} active-color 选中时的颜色，如设置parent的active-color将失效
+ * @event {Function} change 某个radio状态发生变化时触发(选中状态)
+ * @example <u-radio :label-disabled="false">门掩黄昏，无计留春住</u-radio>
+ */
+export default {
+	name: "u-radio",
+	emits: ["change"],
+	props: {
+		// radio的名称
+		name: {
+			type: [String, Number],
+			default: ""
+		},
+		// 组件的整体大小
+		size: {
+			type: [String, Number],
+			default: 34
+		},
+		// 形状，square为方形，circle为原型
+		shape: {
+			type: String,
+			default: ""
+		},
+		// 是否禁用
+		disabled: {
+			type: [String, Boolean],
+			default: ""
+		},
+		// 是否禁止点击提示语选中复选框
+		labelDisabled: {
+			type: [String, Boolean],
+			default: ""
+		},
+		// 选中状态下的颜色，如设置此值，将会覆盖parent的activeColor值
+		activeColor: {
+			type: String,
+			default: ""
+		},
+		// 图标的大小，单位rpx
+		iconSize: {
+			type: [String, Number],
+			default: ""
+		},
+		// label的字体大小，rpx单位
+		labelSize: {
+			type: [String, Number],
+			default: ""
+		}
+	},
+	data() {
+		return {
+			// 父组件的默认值，因为头条小程序不支持在computed中使用this.parent.shape的形式
+			// 故只能使用如此方法
+			parentData: {
+				iconSize: null,
+				labelDisabled: null,
+				disabled: null,
+				shape: null,
+				activeColor: null,
+				size: null,
+				width: null,
+				height: null,
+				value: null,
+				wrap: null
+			}
+		};
+	},
+	created() {
+		this.parent = false;
+		// 支付宝小程序不支持provide/inject，所以使用这个方法获取整个父组件，在created定义，避免循环引用
+		this.updateParentData();
+		this.parent.children.push(this);
+	},
+	computed: {
+		// 是否禁用，如果父组件u-raios-group禁用的话，将会忽略子组件的配置
+		elDisabled() {
+			return this.disabled !== ""? this.disabled: this.parentData.disabled !== null? this.parentData.disabled: false;
+		},
+		// 是否禁用label点击
+		elLabelDisabled() {
+			return this.labelDisabled !== ""? this.labelDisabled: this.parentData.labelDisabled !== null? this.parentData.labelDisabled: false;
+		},
+		// 组件尺寸，对应size的值，默认值为34rpx
+		elSize() {
+			return this.size ? this.size : this.parentData.size ? this.parentData.size : 34;
+		},
+		// 组件的勾选图标的尺寸，默认20
+		elIconSize() {
+			return this.iconSize? this.iconSize: this.parentData.iconSize? this.parentData.iconSize: 20;
+		},
+		// 组件选中激活时的颜色
+		elActiveColor() {
+			return this.activeColor? this.activeColor: this.parentData.activeColor? this.parentData.activeColor: "primary";
+		},
+		// 组件的形状
+		elShape() {
+			return this.shape ? this.shape : this.parentData.shape ? this.parentData.shape : "circle";
+		},
+		// 设置radio的状态，要求radio的name等于parent的value时才为选中状态
+		iconStyle() {
+			let style = {};
+			if (this.elActiveColor && this.parentData.value === this.name && !this.elDisabled) {
+				style.borderColor = this.elActiveColor;
+				style.backgroundColor = this.elActiveColor;
+			}
+			style.width = this.$u.addUnit(this.elSize);
+			style.height = this.$u.addUnit(this.elSize);
+			return style;
+		},
+		iconColor() {
+			return this.name === this.parentData.value ? "#ffffff" : "transparent";
+		},
+		iconClass() {
+			let classes = [];
+			classes.push("u-radio__icon-wrap--" + this.elShape);
+			if (this.name === this.parentData.value) classes.push("u-radio__icon-wrap--checked");
+			if (this.elDisabled) classes.push("u-radio__icon-wrap--disabled");
+			if (this.name === this.parentData.value && this.elDisabled)
+				classes.push("u-radio__icon-wrap--disabled--checked");
+			// 支付宝小程序无法动态绑定一个数组类名，否则解析出来的结果会带有","，而导致失效
+			return classes.join(" ");
+		},
+		radioStyle() {
+			let style = {};
+			if (this.parentData.width) {
+				style.width = this.$u.addUnit(this.parentData.width);
+				// #ifdef MP
+				// 各家小程序因为它们特殊的编译结构，使用float布局
+				style.float = "left";
+				// #endif
+				// #ifndef MP
+				// H5和APP使用flex布局
+				style.flex = `0 0 ${this.$u.addUnit(this.parentData.width)}`;
+				// #endif
+			}
+			if (this.parentData.wrap) {
+				style.width = "100%";
+				// #ifndef MP
+				// H5和APP使用flex布局，将宽度设置100%，即可自动换行
+				style.flex = "0 0 100%";
+				// #endif
+			}
+			return style;
+		}
+	},
+	methods: {
+		updateParentData() {
+			this.getParentData("u-radio-group");
+		},
+		onClickLabel() {
+			if (!this.elLabelDisabled && !this.elDisabled) {
+				this.setRadioCheckedStatus();
+			}
+		},
+		toggle() {
+			if (!this.elDisabled) {
+				this.setRadioCheckedStatus();
+			}
+		},
+		emitEvent() {
+			// u-radio的name不等于父组件的v-model的值时(意味着未选中)，才发出事件，避免多次点击触发事件
+			if (this.parentData.value != this.name) this.$emit("change", this.name);
+		},
+		// 改变组件选中状态
+		// 这里的改变的依据是，更改本组件的parentData.value值为本组件的name值，同时通过父组件遍历所有u-radio实例
+		// 将本组件外的其他u-radio的parentData.value都设置为空(由computed计算后，都被取消选中状态)，因而只剩下一个为选中状态
+		setRadioCheckedStatus() {
+			this.emitEvent();
+			if (this.parent) {
+				this.parent.setValue(this.name);
+				this.parentData.value = this.name;
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-radio {
+	/* #ifndef APP-NVUE */
+	display: inline-flex;
+	/* #endif */
+	align-items: center;
+	overflow: hidden;
+	user-select: none;
+	line-height: 1.8;
+
+	&__icon-wrap {
+		color: $u-content-color;
+		@include vue-flex;
+		flex: none;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+		width: 42rpx;
+		height: 42rpx;
+		color: transparent;
+		text-align: center;
+		transition-property: color, border-color, background-color;
+		font-size: 20px;
+		border: 1px solid #c8c9cc;
+		transition-duration: 0.2s;
+
+		/* #ifdef MP-TOUTIAO */
+		// 头条小程序兼容性问题，需要设置行高为0，否则图标偏下
+		&__icon {
+			line-height: 0;
+		}
+		/* #endif */
+
+		&--circle {
+			border-radius: 100%;
+		}
+
+		&--square {
+			border-radius: 3px;
+		}
+
+		&--checked {
+			color: #fff;
+			background-color: #2979ff;
+			border-color: #2979ff;
+		}
+
+		&--disabled {
+			background-color: #ebedf0;
+			border-color: #c8c9cc;
+		}
+
+		&--disabled--checked {
+			color: #c8c9cc !important;
+		}
+	}
+
+	&__label {
+		word-wrap: break-word;
+		margin-left: 10rpx;
+		margin-right: 24rpx;
+		color: $u-content-color;
+		font-size: 30rpx;
+
+		&--disabled {
+			color: #c8c9cc;
+		}
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-rate/u-rate.vue b/uni_modules/vk-uview-ui/components/u-rate/u-rate.vue
new file mode 100644
index 0000000..6c55f01
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-rate/u-rate.vue
@@ -0,0 +1,293 @@
+<template>
+	<view class="u-rate" :id="elId" @touchmove.stop.prevent="touchMove">
+		<view class="u-star-wrap" v-for="(item, index) in count" :key="index" :class="[elClass]">
+			<u-icon
+				:name="activeIndex > index ? elActiveIcon : inactiveIcon"
+				@click="click(index + 1, $event)"
+				:color="activeIndex > index ? elActiveColor : inactiveColor"
+				:custom-style="{
+					fontSize: size + 'rpx',
+					padding: `0 ${gutter / 2 + 'rpx'}`
+				}"
+				:custom-prefix="customPrefix"
+				:show-decimal-icon="showDecimalIcon(index)"
+				:percent="decimal"
+				:inactive-color="inactiveColor"
+			></u-icon>
+		</view>
+	</view>
+</template>
+
+<script>/**
+ * rate 评分
+ * @description 该组件一般用于满意度调查，星型评分的场景
+ * @tutorial https://www.uviewui.com/components/rate.html
+ * @property {String Number} count 最多可选的星星数量（默认5）
+ * @property {String Number} current 默认选中的星星数量（默认0）
+ * @property {Boolean} disabled 是否禁止用户操作（默认false）
+ * @property {String Number} size 星星的大小，单位rpx（默认32）
+ * @property {String} inactive-color 未选中星星的颜色（默认#b2b2b2）
+ * @property {String} active-color 选中的星星颜色（默认#FA3534）
+ * @property {String} active-icon 选中时的图标名，只能为uView的内置图标（默认star-fill）
+ * @property {String} inactive-icon 未选中时的图标名，只能为uView的内置图标（默认star）
+ * @property {String} gutter 星星之间的距离（默认10）
+ * @property {String Number} min-count 最少选中星星的个数（默认0）
+ * @property {Boolean} allow-half 是否允许半星选择（默认false）
+ * @event {Function} change 选中的星星发生变化时触发
+ * @example <u-rate :count="count" :current="2"></u-rate>
+ */
+
+export default {
+	name: 'u-rate',
+  emits: ["update:modelValue", "input", "change"],
+	props: {
+		// 用于v-model双向绑定选中的星星数量
+		// 1.4.5版新增
+		value: {
+			type: [Number, String],
+			default: -1
+		},
+    modelValue: {
+      type: [Number, String],
+      default: -1
+    },
+		// 要显示的星星数量
+		count: {
+			type: [Number, String],
+			default: 5
+		},
+		// 当前需要默认选中的星星(选中的个数)
+		// 1.4.5后通过value双向绑定，不再建议使用此参数
+		current: {
+			type: [Number, String],
+			default: 0
+		},
+		// 是否不可选中
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 星星的大小，单位rpx
+		size: {
+			type: [Number, String],
+			default: 32
+		},
+		// 未选中时的颜色
+		inactiveColor: {
+			type: String,
+			default: '#b2b2b2'
+		},
+		// 选中的颜色
+		activeColor: {
+			type: String,
+			default: '#FA3534'
+		},
+		// 星星之间的间距，单位rpx
+		gutter: {
+			type: [Number, String],
+			default: 10
+		},
+		// 最少能选择的星星个数
+		minCount: {
+			type: [Number, String],
+			default: 0
+		},
+		// 是否允许半星(功能尚未实现)
+		allowHalf: {
+			type: Boolean,
+			default: false
+		},
+		// 选中时的图标(星星)
+		activeIcon: {
+			type: String,
+			default: 'star-fill'
+		},
+		// 未选中时的图标(星星)
+		inactiveIcon: {
+			type: String,
+			default: 'star'
+		},
+		// 自定义扩展前缀，方便用户扩展自己的图标库
+		customPrefix: {
+			type: String,
+			default: 'uicon'
+		},
+		colors: {
+			type: Array,
+			default() {
+				return []
+			}
+		},
+		icons: {
+			type: Array,
+			default() {
+				return []
+			}
+		}
+	},
+	data() {
+		return {
+			// 生成一个唯一id，否则一个页面多个评分组件，会造成冲突
+			elId: this.$u.guid(),
+			elClass: this.$u.guid(),
+			starBoxLeft: 0, // 评分盒子左边到屏幕左边的距离，用于滑动选择时计算距离
+			// 当前激活的星星的index，如果存在value，优先使用value，因为它可以双向绑定(1.4.5新增)
+			activeIndex: 0,
+			starWidth: 0, // 每个星星的宽度
+			starWidthArr: [] //每个星星最右边到组件盒子最左边的距离
+		}
+	},
+	created() {
+		this.activeIndex = this.valueCom != -1 ? this.valueCom : this.current;
+	},
+	watch: {
+		current(val) {
+			this.activeIndex = val
+		},
+		valueCom(val) {
+			this.activeIndex = val
+		}
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+		
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		decimal() {
+			if (this.disabled) {
+				return this.activeIndex * 100 % 100
+			} else if (this.allowHalf) {
+				return 50
+			}
+		},
+		elActiveIcon() {
+			const len = this.icons.length
+			// 此处规则类似于下方的elActiveColor参数，都是根据一定的规则，显示不同的图标
+			// 结果可能如此：icons参数传递了3个图标，当选中两个时，用第一个图标，4个时，用第二个图标
+			// 第三个时，用第三个图标作为激活的图标
+			if (len && len <= this.count) {
+				const step = Math.round(this.activeIndex / Math.round(this.count / len))
+				if (step < 1) return this.icons[0]
+				if (step > len) return this.icons[len - 1]
+				return this.icons[step - 1]
+			}
+			return this.activeIcon
+		},
+		elActiveColor() {
+			const len = this.colors.length
+			// 如果有设置colors参数(此参数用于将图标分段，比如一共5颗星，colors传3个颜色值，那么根据一定的规则，2颗星可能为第一个颜色
+			// 4颗星为第二个颜色值，5颗星为第三个颜色值)
+			if (len && len <= this.count) {
+				const step = Math.round(this.activeIndex / Math.round(this.count / len))
+				if (step < 1) return this.colors[0]
+				if (step > len) return this.colors[len - 1]
+				return this.colors[step - 1]
+			}
+			return this.activeColor
+		}
+	},
+	methods: {
+		// 获取评分组件盒子的布局信息
+		getElRectById() {
+			// uView封装的获取节点的方法，详见文档
+			this.$uGetRect('#' + this.elId).then(res => {
+				this.starBoxLeft = res.left
+			})
+		},
+		// 获取单个星星的尺寸
+		getElRectByClass() {
+			// uView封装的获取节点的方法，详见文档
+			this.$uGetRect('.' + this.elClass).then(res => {
+				this.starWidth = res.width
+				// 把每个星星右边到组件盒子左边的距离放入数组中
+				for (let i = 0; i < this.count; i++) {
+					this.starWidthArr[i] = (i + 1) * this.starWidth
+				}
+			})
+		},
+		// 手指滑动
+		touchMove(e) {
+			if (this.disabled) {
+				return
+			}
+			if (!e.changedTouches[0]) {
+				return
+			}
+			const movePageX = e.changedTouches[0].pageX
+			// 滑动点相对于评分盒子左边的距离
+			const distance = movePageX - this.starBoxLeft
+
+			// 如果滑动到了评分盒子的左边界，就设置为0星
+			if (distance <= 0) {
+				this.activeIndex = 0
+			}
+			// 滑动的距离，相当于多少颗星星
+			let index = Math.ceil(distance / this.starWidth)
+			this.activeIndex = index > this.count ? this.count : index
+			// 对最少颗星星的限制
+			if (this.activeIndex < this.minCount) this.activeIndex = this.minCount
+			this.emitEvent()
+		},
+		// 通过点击，直接选中
+		click(index, e) {
+			if (this.disabled) {
+				return
+			}
+			// 半星选择，尚未实现
+			if (this.allowHalf) {
+			}
+			// 对第一个星星特殊处理，只有一个的时候，点击可以取消，否则无法作0星评价
+			if (index == 1) {
+				if (this.activeIndex == 1) {
+					this.activeIndex = 0
+				} else {
+					this.activeIndex = 1
+				}
+			} else {
+				this.activeIndex = index
+			}
+			// 对最少颗星星的限制
+			if (this.activeIndex < this.minCount) this.activeIndex = this.minCount
+			this.emitEvent()
+		},
+		// 发出事件
+		emitEvent() {
+			// 发出change事件
+			this.$emit('change', this.activeIndex)
+			// 同时修改双向绑定的value的值
+			if (this.valueCom != -1) {
+				this.$emit('input', this.activeIndex)
+        this.$emit("update:modelValue", this.activeIndex);
+			}
+		},
+		showDecimalIcon(index) {
+			return this.disabled && parseInt(this.activeIndex) === index
+		}
+	},
+	mounted() {
+		this.getElRectById()
+		this.getElRectByClass()
+	}
+}
+</script>
+
+<style scoped lang="scss">
+@import "../../libs/css/style.components.scss";
+
+.u-rate {
+	display: -webkit-inline-flex;
+	display: inline-flex;
+	align-items: center;
+	margin: 0;
+	padding: 0;
+}
+
+.u-icon {
+	box-sizing: border-box;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-read-more/u-read-more.vue b/uni_modules/vk-uview-ui/components/u-read-more/u-read-more.vue
new file mode 100644
index 0000000..56beeb8
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-read-more/u-read-more.vue
@@ -0,0 +1,180 @@
+<template>
+	<view class="">
+		<view class="u-content" :class="[elId]" :style="{ 
+			height: isLongContent && !showMore ? showHeight + 'rpx' : 'auto',
+			textIndent: textIndent
+		}">
+			<slot></slot>
+		</view>
+		<view @tap="toggleReadMore" v-if="isLongContent" class="u-content__showmore-wrap"
+		    :class="{ 'u-content__show-more': showMore }"
+		    :style="[innerShadowStyle]">
+			<text class="u-content__showmore-wrap__readmore-btn" :style="{
+				fontSize: fontSize + 'rpx',
+				color: color
+			}">
+				{{ showMore ? openText : closeText }}
+			</text>
+			<view class="u-content__showmore-wrap__readmore-btn__icon u-flex">
+				<u-icon :color="color" :size="fontSize" :name="showMore ? 'arrow-up' : 'arrow-down'"></u-icon>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * readMore 阅读更多
+	 * @description 该组件一般用于内容较长，预先收起一部分，点击展开全部内容的场景。
+	 * @tutorial https://www.uviewui.com/components/readMore.html
+	 * @property {String Number} show-height 内容超出此高度才会显示展开全文按钮，单位rpx（默认400）
+	 * @property {Boolean} toggle 展开后是否显示收起按钮（默认false）
+	 * @property {String} close-text 关闭时的提示文字（默认“展开阅读全文”）
+	 * @property {String Number} font-size 提示文字的大小，单位rpx（默认28）
+	 * @property {String} text-indent 段落首行缩进的字符个数（默认2em）
+	 * @property {String} open-text 展开时的提示文字（默认“收起”）
+	 * @property {String} color 提示文字的颜色（默认#2979ff）
+	 * @example <u-read-more><rich-text :nodes="content"></rich-text></u-read-more>
+	 */
+	export default {
+		name: "u-read-more",
+    emits: ["open", "close"],
+		props: {
+			// 默认的显示占位高度，单位为rpx
+			showHeight: {
+				type: [Number, String],
+				default: 400
+			},
+			// 展开后是否显示"收起"按钮
+			toggle: {
+				type: Boolean,
+				default: false
+			},
+			// 关闭时的提示文字
+			closeText: {
+				type: String,
+				default: '展开阅读全文'
+			},
+			// 展开时的提示文字
+			openText: {
+				type: String,
+				default: '收起'
+			},
+			// 提示的文字颜色
+			color: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 提示文字的大小
+			fontSize: {
+				type: [String, Number],
+				default: 28
+			},
+			// 是否显示阴影
+			shadowStyle: {
+				type: Object,
+				default () {
+					return {
+						backgroundImage: "linear-gradient(-180deg, rgba(255, 255, 255, 0) 0%, #fff 80%)",
+						paddingTop: "300rpx",
+						marginTop: "-300rpx"
+					}
+				}
+			},
+			// 段落首行缩进的字符个数
+			textIndent: {
+				type: String,
+				default: '2em'
+			},
+			// open和close事件时，将此参数返回在回调参数中
+			index: {
+				type: [Number, String],
+				default: ''
+			}
+		},
+		watch: {
+			paramsChange(val) {
+				this.init();
+			}
+		},
+		computed: {
+			paramsChange() {
+				return `${this.toggle}-${this.showHeight}`;
+			},
+			// 展开后无需阴影，收起时才需要阴影样式
+			innerShadowStyle() {
+				if (this.showMore) return {};
+				else return this.shadowStyle
+			}
+		},
+		data() {
+			return {
+				isLongContent: false, // 是否需要隐藏一部分内容
+				showMore: false, // 当前隐藏与显示的状态，true-显示，false-收起
+				elId: this.$u.guid(), // 生成唯一class
+			};
+		},
+		mounted() {
+			this.$nextTick(() => {
+				this.init();
+			})
+		},
+		methods: {
+			init() {
+				this.$uGetRect('.' + this.elId).then(res => {
+					// 判断高度，如果真实内容高度大于占位高度，则显示收起与展开的控制按钮
+					if (res.height > uni.upx2px(this.showHeight)) {
+						this.isLongContent = true;
+						this.showMore = false;
+					}
+				})
+			},
+			// 展开或者收起
+			toggleReadMore() {
+				this.showMore = !this.showMore;
+				// 如果toggle为false，隐藏"收起"部分的内容
+				if (this.toggle == false) this.isLongContent = false;
+				// 发出打开或者收齐的事件
+				this.$emit(this.showMore ? 'open' : 'close', this.index);
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-content {
+		font-size: 30rpx;
+		color: $u-content-color;
+		line-height: 1.8;
+		text-align: left;
+		overflow: hidden;
+
+		&__show-more {
+			padding-top: 0;
+			background: none;
+			margin-top: 20rpx;
+		}
+
+		&__showmore-wrap {
+			position: relative;
+			width: 100%;
+			padding-bottom: 26rpx;
+			@include vue-flex;
+			align-items: center;
+			justify-content: center;
+
+			&__readmore-btn {
+				@include vue-flex;
+				align-items: center;
+				justify-content: center;
+				line-height: 1;
+
+				&__icon {
+					margin-left: 14rpx;
+				}
+			}
+		}
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-row-notice/u-row-notice.vue b/uni_modules/vk-uview-ui/components/u-row-notice/u-row-notice.vue
new file mode 100644
index 0000000..3e53278
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-row-notice/u-row-notice.vue
@@ -0,0 +1,270 @@
+<template>
+	<view
+		v-if="show"
+		class="u-notice-bar"
+		:style="{
+			background: computeBgColor,
+			padding: padding
+		}"
+		:class="[
+			type ? `u-type-${type}-light-bg` : ''
+		]"
+	>
+		<view class="u-direction-row">
+			<view class="u-icon-wrap">
+				<u-icon class="u-left-icon" v-if="volumeIcon" name="volume-fill" :size="volumeSize" :color="computeColor"></u-icon>
+			</view>
+			<view class="u-notice-box" id="u-notice-box">
+				<view
+					class="u-notice-content"
+					id="u-notice-content"
+					:style="{
+						animationDuration: animationDuration,
+						animationPlayState: animationPlayState,
+					}"
+				>
+					<text class="u-notice-text" @tap="click" :style="[textStyle]"
+					:class="['u-type-' + type]">{{showText}}</text>
+				</view>
+			</view>
+			<view class="u-icon-wrap">
+				<u-icon @click="getMore" class="u-right-icon" v-if="moreIcon" name="arrow-right" :size="26" :color="computeColor"></u-icon>
+				<u-icon @click="close" class="u-right-icon" v-if="closeIcon" name="close" :size="24" :color="computeColor"></u-icon>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+  emits: ["close", "getMore"],
+	props: {
+		// 显示的内容，数组
+		list: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 显示的主题，success|error|primary|info|warning|none
+		// none主题默认为透明背景，黑色(contentColor)字体
+		type: {
+			type: String,
+			default: 'warning'
+		},
+		// 是否显示左侧的音量图标
+		volumeIcon: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示右侧的右箭头图标
+		moreIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示右侧的关闭图标
+		closeIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 是否自动播放
+		autoplay: {
+			type: Boolean,
+			default: true
+		},
+		// 文字颜色，各图标也会使用文字颜色
+		color: {
+			type: String,
+			default: ''
+		},
+		// 背景颜色
+		bgColor: {
+			type: String,
+			default: ''
+		},
+		// 是否显示
+		show: {
+			type: Boolean,
+			default: true
+		},
+		// 字体大小，单位rpx
+		fontSize: {
+			type: [Number, String],
+			default: 26
+		},
+		// 音量喇叭的大小
+		volumeSize: {
+			type: [Number, String],
+			default: 34
+		},
+		// 水平滚动时的滚动速度，即每秒滚动多少rpx，这有利于控制文字无论多少时，都能有一个恒定的速度
+		speed: {
+			type: [Number, String],
+			default: 160
+		},
+		// 播放状态，play-播放，paused-暂停
+		playState: {
+			type: String,
+			default: 'play'
+		},
+		// 通知的边距
+		padding: {
+			type: [Number, String],
+			default: '18rpx 24rpx'
+		}
+	},
+	data() {
+		return {
+			textWidth: 0, // 滚动的文字宽度
+			boxWidth: 0, // 供文字滚动的父盒子的宽度，和前者一起为了计算滚动速度
+			animationDuration: '10s', // 动画执行时间
+			animationPlayState: 'paused', // 动画的开始和结束执行
+			showText: '' // 显示的文本
+		};
+	},
+	watch: {
+		list: {
+			immediate: true,
+			handler(val) {
+				this.showText = val.join('，');
+				this.$nextTick(() => {
+					this.initSize();
+				});
+			}
+		},
+		playState(val) {
+			if(val == 'play') this.animationPlayState = 'running';
+			else this.animationPlayState = 'paused';
+		},
+		speed(val) {
+			this.initSize();
+		}
+	},
+	computed: {
+		// 计算字体颜色，如果没有自定义的，就用uview主题颜色
+		computeColor() {
+			if (this.color) return this.color;
+			// 如果是无主题，就默认使用content-color
+			else if(this.type == 'none') return '#606266';
+			else return this.type;
+		},
+		// 文字内容的样式
+		textStyle() {
+			let style = {};
+			if (this.color) style.color = this.color;
+			else if(this.type == 'none') style.color = '#606266';
+			style.fontSize = this.fontSize + 'rpx';
+			return style;
+		},
+		// 计算背景颜色
+		computeBgColor() {
+			if (this.bgColor) return this.bgColor;
+			else if(this.type == 'none') return 'transparent';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.initSize();
+		});
+	},
+	methods: {
+		initSize() {
+			let query = [],
+				boxWidth = 0,
+				textWidth = 0;
+			let textQuery = new Promise((resolve, reject) => {
+				uni.createSelectorQuery()
+					.in(this)
+					.select(`#u-notice-content`)
+					.boundingClientRect()
+					.exec(ret => {
+						this.textWidth = ret[0].width;
+						resolve();
+					});
+			});
+			query.push(textQuery);
+			Promise.all(query).then(() => {
+				// 根据t=s/v(时间=路程/速度)，这里为何不需要加上#u-notice-box的宽度，因为中设置了.u-notice-content样式中设置了padding-left: 100%
+				// 恰巧计算出来的结果中已经包含了#u-notice-box的宽度
+				this.animationDuration = `${this.textWidth / uni.upx2px(this.speed)}s`;
+				// 这里必须这样开始动画，否则在APP上动画速度不会改变(HX版本2.4.6，IOS13)
+				this.animationPlayState = 'paused';
+				setTimeout(() => {
+					if(this.playState == 'play' && this.autoplay) this.animationPlayState = 'running';
+				}, 10);
+			});
+		},
+		// 点击通告栏
+		click(index) {
+			this.$emit('click');
+		},
+		// 点击关闭按钮
+		close() {
+			this.$emit('close');
+		},
+		// 点击更多箭头按钮
+		getMore() {
+			this.$emit('getMore');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+	
+.u-notice-bar {
+	padding: 18rpx 24rpx;
+	overflow: hidden;
+}
+
+.u-direction-row {
+	@include vue-flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.u-left-icon {
+	/* #ifndef APP-NVUE */
+	display: inline-flex;
+	/* #endif */
+	align-items: center;
+}
+
+.u-notice-box {
+	flex: 1;
+	@include vue-flex;
+	overflow: hidden;
+	margin-left: 12rpx;
+}
+
+.u-right-icon {
+	margin-left: 12rpx;
+	display: inline-flex;
+	align-items: center;
+}
+
+.u-notice-content {
+	animation: u-loop-animation 10s linear infinite both;
+	text-align: right;
+	// 这一句很重要，为了能让滚动左右连接起来
+	padding-left: 100%;
+	@include vue-flex;
+	flex-wrap: nowrap;
+}
+
+.u-notice-text {
+	font-size: 26rpx;
+	word-break: keep-all;
+	white-space: nowrap
+}
+
+@keyframes u-loop-animation {
+	0% {
+		transform: translate3d(0, 0, 0);
+	}
+
+	100% {
+		transform: translate3d(-100%, 0, 0);
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-row/u-row.vue b/uni_modules/vk-uview-ui/components/u-row/u-row.vue
new file mode 100644
index 0000000..bdb99d5
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-row/u-row.vue
@@ -0,0 +1,85 @@
+<template>
+	<view class="u-row" :style="{
+			alignItems: uAlignItem,
+			justifyContent: uJustify
+		}"
+		@tap="click"
+	>
+		<slot />
+	</view>
+</template>
+
+<script>
+	/**
+	 * row 行布局
+	 * @description 通过基础的 12 分栏，迅速简便地创建布局。
+	 * @tutorial https://www.uviewui.com/components/layout.html#row-props
+	 * @property {String Number} gutter 栅格间隔，左右各为此值的一半，单位rpx（默认0）
+	 * @property {String} justify 水平排列方式(微信小程序暂不支持)默认（start(或flex-start)）
+	 * @property {String} align 垂直排列方式（默认center）
+	 * @example <u-row gutter="16"></u-row>
+	 */
+	export default {
+		name: "u-row",
+		emits: ["click"],
+		props: {
+			// 给col添加间距，左右边距各占一半
+			gutter: {
+				type: [String, Number],
+				default: 20
+			},
+			// 水平排列方式，可选值为`start`(或`flex-start`)、`end`(或`flex-end`)、`center`、`around`(或`space-around`)、`between`(或`space-between`)
+			justify: {
+				type: String,
+				default: 'start'
+			},
+			// 垂直对齐方式，可选值为top、center、bottom
+			align: {
+				type: String,
+				default: 'center'
+			},
+			// 是否阻止事件传播
+			stop: {
+				type: Boolean,
+				default: true
+			}
+		},
+		computed: {
+			uJustify() {
+				if (this.justify == 'end' || this.justify == 'start') return 'flex-' + this.justify;
+				else if (this.justify == 'around' || this.justify == 'between') return 'space-' + this.justify;
+				else return this.justify;
+			},
+			uAlignItem() {
+				if (this.align == 'top') return 'flex-start';
+				if (this.align == 'bottom') return 'flex-end';
+				else return this.align;
+			}
+		},
+		methods: {
+			click(e) {
+				this.$emit('click',e);
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	.u-row {
+		// 由于微信小程序编译后奇怪的页面结构，只能使用float布局实现，flex无法实现
+		/* #ifndef MP-WEIXIN || MP-QQ || MP-TOUTIAO */
+		@include vue-flex;
+		/* #endif */
+		flex-wrap: wrap;
+	}
+
+	.u-row:after {
+		/* #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO */
+		display: table;
+		clear: both;
+		content: "";
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-search/u-search.vue b/uni_modules/vk-uview-ui/components/u-search/u-search.vue
new file mode 100644
index 0000000..eb5fc32
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-search/u-search.vue
@@ -0,0 +1,357 @@
+<template>
+	<view class="u-search" @tap="clickHandler" :style="{
+		margin: margin,
+	}">
+		<view
+			class="u-content"
+			:style="{
+				backgroundColor: bgColor,
+				borderRadius: shape == 'round' ? '100rpx' : '10rpx',
+				border: borderStyle,
+				height: height + 'rpx'
+			}"
+		>
+			<view class="u-icon-wrap">
+				<u-icon class="u-clear-icon" :size="30" :name="searchIcon" :color="searchIconColor ? searchIconColor : color"></u-icon>
+			</view>
+			<input
+				confirm-type="search"
+				@blur="blur"
+				:value="valueCom"
+				@confirm="search"
+				@input="inputChange"
+				:disabled="disabled"
+				@focus="getFocus"
+				:focus="focus"
+				:maxlength="maxlength"
+				placeholder-class="u-placeholder-class"
+				:placeholder="placeholder"
+				:placeholder-style="`color: ${placeholderColor}`"
+				class="u-input"
+				type="text"
+				:style="[{
+					textAlign: inputAlign,
+					color: color,
+					backgroundColor: bgColor,
+				}, inputStyle]"
+			/>
+			<view class="u-close-wrap" v-if="keyword && clearabled && focused" @tap="clear">
+				<u-icon class="u-clear-icon" name="close-circle-fill" size="34" color="#c0c4cc"></u-icon>
+			</view>
+		</view>
+		<view :style="[actionStyle]" class="u-action" 
+			:class="[showActionBtn || show ? 'u-action-active' : '']" 
+			@tap.stop.prevent="custom"
+		>{{ actionText }}</view>
+	</view>
+</template>
+
+<script>
+/**
+ * search 搜索框
+ * @description 搜索组件，集成了常见搜索框所需功能，用户可以一键引入，开箱即用。
+ * @tutorial https://www.uviewui.com/components/search.html
+ * @property {String} shape 搜索框形状，round-圆形，square-方形（默认round）
+ * @property {String} bg-color 搜索框背景颜色（默认#f2f2f2）
+ * @property {String} border-color 边框颜色，配置了颜色，才会有边框
+ * @property {String} placeholder 占位文字内容（默认“请输入关键字”）
+ * @property {Boolean} clearabled 是否启用清除控件（默认true）
+ * @property {Boolean} focus 是否自动获得焦点（默认false）
+ * @property {Boolean} show-action 是否显示右侧控件（默认true）
+ * @property {String} action-text 右侧控件文字（默认“搜索”）
+ * @property {Object} action-style 右侧控件的样式，对象形式
+ * @property {String} input-align 输入框内容水平对齐方式（默认left）
+ * @property {Object} input-style 自定义输入框样式，对象形式
+ * @property {Boolean} disabled 是否启用输入框（默认false）
+ * @property {String} search-icon-color 搜索图标的颜色，默认同输入框字体颜色
+ * @property {String} color 输入框字体颜色（默认#606266）
+ * @property {String} placeholder-color placeholder的颜色（默认#909399）
+ * @property {String} search-icon 输入框左边的图标，可以为uView图标名称或图片路径
+ * @property {String} margin 组件与其他上下左右元素之间的距离，带单位的字符串形式，如"30rpx"
+ * @property {Boolean} animation 是否开启动画，见上方说明（默认false）
+ * @property {String} value 输入框初始值
+ * @property {String | Number} maxlength 输入框最大能输入的长度，-1为不限制长度
+ * @property {Boolean} input-style input输入框的样式，可以定义文字颜色，大小等，对象形式
+ * @property {String | Number} height 输入框高度，单位rpx（默认64）
+ * @event {Function} change 输入框内容发生变化时触发
+ * @event {Function} search 用户确定搜索时触发，用户按回车键，或者手机键盘右下角的"搜索"键时触发
+ * @event {Function} custom 用户点击右侧控件时触发
+ * @event {Function} clear 用户点击清除按钮时触发
+ * @example <u-search placeholder="日照香炉生紫烟" v-model="keyword"></u-search>
+ */
+export default {
+	name: "u-search",
+  emits: ["update:modelValue", "input", "change", "search", "custom", "clear", "focus", "blur"],
+	props: {
+    // 输入框的初始化内容
+    value: {
+    	type: String,
+    	default: ''
+    },
+    modelValue: {
+      type: String,
+      default: ''
+    },
+		// 搜索框形状，round-圆形，square-方形
+		shape: {
+			type: String,
+			default: 'round'
+		},
+		// 搜索框背景色，默认值#f2f2f2
+		bgColor: {
+			type: String,
+			default: '#f2f2f2'
+		},
+		// 占位提示文字
+		placeholder: {
+			type: String,
+			default: '请输入关键字'
+		},
+		// 是否启用清除控件
+		clearabled: {
+			type: Boolean,
+			default: true
+		},
+		// 是否自动聚焦
+		focus: {
+			type: Boolean,
+			default: false
+		},
+		// 是否在搜索框右侧显示取消按钮
+		showAction: {
+			type: Boolean,
+			default: true
+		},
+		// 右边控件的样式
+		actionStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 取消按钮文字
+		actionText: {
+			type: String,
+			default: '搜索'
+		},
+		// 输入框内容对齐方式，可选值为 left|center|right
+		inputAlign: {
+			type: String,
+			default: 'left'
+		},
+		// 是否启用输入框
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 开启showAction时，是否在input获取焦点时才显示
+		animation: {
+			type: Boolean,
+			default: false
+		},
+		// 边框颜色，只要配置了颜色，才会有边框
+		borderColor: {
+			type: String,
+			default: 'none'
+		},
+		// 搜索框高度，单位rpx
+		height: {
+			type: [Number, String],
+			default: 64
+		},
+		// input输入框的样式，可以定义文字颜色，大小等，对象形式
+		inputStyle: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		// 输入框最大能输入的长度，-1为不限制长度(来自uniapp文档)
+		maxlength: {
+			type: [Number, String],
+			default: '-1'
+		},
+		// 搜索图标的颜色，默认同输入框字体颜色
+		searchIconColor: {
+			type: String,
+			default: ''
+		},
+		// 输入框字体颜色
+		color: {
+			type: String,
+			default: '#606266'
+		},
+		// placeholder的颜色
+		placeholderColor: {
+			type: String,
+			default: '#909399'
+		},
+		// 组件与其他上下左右元素之间的距离，带单位的字符串形式，如"30rpx"、"30rpx 20rpx"等写法
+		margin: {
+			type: String,
+			default: '0'
+		},
+		// 左边输入框的图标，可以为uView图标名称或图片路径
+		searchIcon: {
+			type: String,
+			default: 'search'
+		}
+	},
+	data() {
+		return {
+			keyword: '',
+			showClear: false, // 是否显示右边的清除图标
+			show: false,
+			// 标记input当前状态是否处于聚焦中，如果是，才会显示右侧的清除控件
+			focused: this.focus
+			// 绑定输入框的值
+			// inputValue: this.value
+		};
+	},
+	watch: {
+		keyword(nVal) {
+			// 双向绑定值，让v-model绑定的值双向变化
+			this.$emit('input', nVal);
+      this.$emit("update:modelValue", nVal);
+			// 触发change事件，事件效果和v-model双向绑定的效果一样，让用户多一个选择
+			this.$emit('change', nVal);
+		},
+		valueCom: {
+			immediate: true,
+			handler(nVal) {
+				this.keyword = nVal;
+			}
+		}
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+		
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		showActionBtn() {
+			if (!this.animation && this.showAction) return true;
+			else return false;
+		},
+		// 样式，根据用户传入的颜色值生成，如果不传入，默认为none
+		borderStyle() {
+			if (this.borderColor) return `1px solid ${this.borderColor}`;
+			else return 'none';
+		},
+	},
+	methods: {
+		// 目前HX2.6.9 v-model双向绑定无效，故监听input事件获取输入框内容的变化
+		inputChange(e) {
+			this.keyword = e.detail.value;
+		},
+		// 清空输入
+		// 也可以作为用户通过this.$refs形式调用清空输入框内容
+		clear() {
+			this.keyword = '';
+			// 延后发出事件，避免在父组件监听clear事件时，value为更新前的值(不为空)
+			this.$nextTick(() => {
+				this.$emit('clear');
+			})
+		},
+		// 确定搜索
+		search(e) {
+			this.$emit('search', e.detail.value);
+			try{
+				// 收起键盘
+				uni.hideKeyboard();
+			}catch(e){}
+		},
+		// 点击右边自定义按钮的事件
+		custom() {
+			this.$emit('custom', this.keyword);
+			try{
+				// 收起键盘
+				uni.hideKeyboard();
+			}catch(e){}
+		},
+		// 获取焦点
+		getFocus() {
+			this.focused = true;
+			// 开启右侧搜索按钮展开的动画效果
+			if (this.animation && this.showAction) this.show = true;
+			this.$emit('focus', this.keyword);
+		},
+		// 失去焦点
+		blur() {
+			// 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错
+			// 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时
+			setTimeout(() => {
+				this.focused = false;
+			}, 100)
+			this.show = false;
+			this.$emit('blur', this.keyword);
+		},
+		// 点击搜索框，只有disabled=true时才发出事件，因为禁止了输入，意味着是想跳转真正的搜索页
+		clickHandler() {
+			if(this.disabled) this.$emit('click');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-search {
+	@include vue-flex;
+	align-items: center;
+	flex: 1;
+}
+
+.u-content {
+	@include vue-flex;
+	align-items: center;
+	padding: 0 18rpx;
+	flex: 1;
+}
+
+.u-clear-icon {
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-input {
+	flex: 1;
+	font-size: 28rpx;
+	line-height: 1;
+	margin: 0 10rpx;
+	color: $u-tips-color;
+}
+
+.u-close-wrap {
+	width: 40rpx;
+	height: 100%;
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: 50%;
+}
+
+.u-placeholder-class {
+	color: $u-tips-color;
+}
+
+.u-action {
+	font-size: 28rpx;
+	color: $u-main-color;
+	width: 0;
+	overflow: hidden;
+	transition: all 0.3s;
+	white-space: nowrap;
+	text-align: center;
+}
+
+.u-action-active {
+	width: 80rpx;
+	margin-left: 10rpx;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-section/u-section.vue b/uni_modules/vk-uview-ui/components/u-section/u-section.vue
new file mode 100644
index 0000000..dae0cd8
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-section/u-section.vue
@@ -0,0 +1,155 @@
+<template>
+	<view class="u-section">
+		<view class="u-section__title" :style="{
+			fontWeight: bold ? 'bold' : 'normal',
+			color: color,
+			fontSize: fontSize + 'rpx',
+			paddingLeft: showLine ? (fontSize * 0.7) + 'rpx' : 0
+		}" :class="{
+			'u-section--line': showLine
+		}">
+			<view class="u-section__title__icon-wrap u-flex" :style="[lineStyle]" v-if="showLine">
+				<u-icon top="0" name="column-line" :size="fontSize * 1.25" bold :color="lineColor ? lineColor : color"></u-icon>
+			</view>
+			<text class="u-flex u-section__title__text">{{title}}</text>
+		</view>
+		<view class="u-section__right-info" v-if="right || $slots.right" :style="{
+			color: subColor
+		}" @tap="rightClick"> 
+			<slot name="right" v-if="$slots.right" />
+			<block v-else>
+				{{subTitle}}
+				<view class="u-section__right-info__icon-arrow u-flex" v-if="arrow">
+					<u-icon name="arrow-right" size="24" :color="subColor"></u-icon>
+				</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * section 查看更多
+	 * @description 该组件一般用于分类信息有很多，但是限于篇幅只能列出一部分，让用户通过"查看更多"获得更多信息的场景，实际效果见演示。
+	 * @tutorial https://www.uviewui.com/components/section.html
+	 * @property {String} title 左边主标题
+	 * @property {String} sub-title 右边副标题（默认更多）
+	 * @property {Boolean} right 是否显示右边的内容（默认true）
+	 * @property {Boolean} showLine 是否显示左边的竖条（默认true）
+	 * @property {Boolean} arrow 是否显示右边箭头（默认true）
+	 * @property {String Number} font-size 主标题的字体大小（默认28）
+	 * @property {Boolean} bold 主标题是否加粗（默认true）
+	 * @property {String} color 主标题颜色（默认#303133）
+	 * @event {Function} click 组件右侧的内容被点击时触发，用于跳转"更多"
+	 * @example <u-section title="今日热门" :right="false"></u-section>
+	 */
+	export default {
+		emits: ["click"],
+		name: "u-section",
+		props: {
+			// 标题信息
+			title: {
+				type: String,
+				default: ''
+			},
+			// 右边副标题内容
+			subTitle: {
+				type: String,
+				default: '更多'
+			},
+			// 是否显示右边的内容
+			right: {
+				type: Boolean,
+				default: true
+			},
+			fontSize: {
+				type: [Number, String],
+				default: 28
+			},
+			// 主标题是否加粗
+			bold: {
+				type: Boolean,
+				default: true
+			},
+			// 主标题的颜色
+			color: {
+				type: String,
+				default: '#303133'
+			},
+			// 右边副标题的颜色
+			subColor: {
+				type: String,
+				default: '#909399'
+			},
+			// 是否显示左边的竖条
+			showLine: {
+				type: Boolean,
+				default: true
+			},
+			// 左边竖线的颜色
+			lineColor: {
+				type: String,
+				default: ''
+			},
+			// 是否显示右边箭头
+			arrow: {
+				type: Boolean,
+				default: true
+			},
+		},
+		computed: {
+			// 左边竖条的样式
+			lineStyle() {
+				// 由于安卓和iOS的，需要稍微调整绝对定位的top值，才能让左边的竖线和右边的文字垂直居中
+				return {
+					// 由于竖线为字体图标，具有比实际线宽更宽的宽度，所以也需要根据字体打下动态调整
+					left: -(Number(this.fontSize) * 0.9) + 'rpx',
+					top: -(Number(this.fontSize) * (this.$u.os() == 'ios' ? 0.14 : 0.15)) + 'rpx',
+				}
+			}
+		},
+		methods: {
+			rightClick() {
+				this.$emit('click');
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-section {
+		@include vue-flex;
+		justify-content: space-between;
+		align-items: center;
+		width: 100%;
+		
+		&__title {
+			position: relative;
+			font-size: 28rpx;
+			padding-left: 20rpx;
+			@include vue-flex;
+			align-items: center;
+			
+			&__icon-wrap {
+				position: absolute;
+			}
+			
+			&__text {
+				line-height: 1;
+			}
+		}
+		
+		&__right-info {
+			color: $u-tips-color;
+			font-size: 26rpx;
+			@include vue-flex;
+			align-items: center;
+			
+			&__icon-arrow {
+				margin-left: 6rpx;
+			}
+		}
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-select/u-select.vue b/uni_modules/vk-uview-ui/components/u-select/u-select.vue
new file mode 100644
index 0000000..ac655b9
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-select/u-select.vue
@@ -0,0 +1,437 @@
+<template>
+	<view class="u-select">
+		<!-- <view class="u-select__action" :class="{
+			'u-select--border': border
+		}" @tap.stop="selectHandler">
+			<view class="u-select__action__icon" :class="{
+				'u-select__action__icon--reverse': value == true
+			}">
+				<u-icon name="arrow-down-fill" size="26" color="#c0c4cc"></u-icon>
+			</view>
+		</view> -->
+		<u-popup :blur="blur" :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="popupValue" length="auto" :safeAreaInsetBottom="safeAreaInsetBottom" @close="close" :z-index="uZIndex">
+			<view class="u-select">
+				<view class="u-select__header" @touchmove.stop.prevent="">
+					<view
+						class="u-select__header__cancel u-select__header__btn"
+						:style="{ color: cancelColor }"
+						hover-class="u-hover-class"
+						:hover-stay-time="150"
+						@tap.stop="getResult('cancel')"
+					>
+						{{cancelText}}
+					</view>
+					<view class="u-select__header__title">
+						{{title}}
+					</view>
+					<view
+						class="u-select__header__confirm u-select__header__btn"
+						:style="{ color: moving ? cancelColor : confirmColor }"
+						hover-class="u-hover-class"
+						:hover-stay-time="150"
+						@touchmove.stop=""
+						@tap.stop="getResult('confirm')"
+					>
+						{{confirmText}}
+					</view>
+				</view>
+				<view class="u-select__body">
+					<picker-view @change="columnChange" class="u-select__body__picker-view" :value="defaultSelector" @pickstart="pickstart" @pickend="pickend">
+						<picker-view-column v-for="(item, index) in columnData" :key="index">
+							<view class="u-select__body__picker-view__item" v-for="(item1, index1) in item" :key="index1">
+								<view class="u-line-1">{{ item1[labelName] }}</view>
+							</view>
+						</picker-view-column>
+					</picker-view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	/**
+	 * select 列选择器
+	 * @description 此选择器用于单列，多列，多列联动的选择场景。(从1.3.0版本起，不建议使用Picker组件的单列和多列模式，Select组件是专门为列选择而构造的组件，更简单易用。)
+	 * @tutorial http://uviewui.com/components/select.html
+	 * @property {String} mode 模式选择，"single-column"-单列模式，"mutil-column"-多列模式，"mutil-column-auto"-多列联动模式
+	 * @property {Array} list 列数据，数组形式，见官网说明
+	 * @property {Boolean} v-model 布尔值变量，用于控制选择器的弹出与收起
+	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配(默认false)
+	 * @property {String} cancel-color 取消按钮的颜色（默认#606266）
+	 * @property {String} confirm-color 确认按钮的颜色(默认#2979ff)
+	 * @property {String} confirm-text 确认按钮的文字
+	 * @property {String} cancel-text 取消按钮的文字
+	 * @property {String} default-value 提供的默认选中的下标，见官网说明
+	 * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭Picker(默认true)
+	 * @property {String Number} z-index 弹出时的z-index值(默认10075)
+	 * @property {String} value-name 自定义list数据的value属性名 1.3.6
+	 * @property {String} label-name 自定义list数据的label属性名 1.3.6
+	 * @property {String} child-name 自定义list数据的children属性名，只对多列联动模式有效 1.3.7
+	 * @event {Function} confirm 点击确定按钮，返回当前选择的值
+	 * @example <u-select v-model="show" :list="list"></u-select>
+	 */
+
+export default {
+  emits: ["update:modelValue", "input", "confirm","cancel"],
+	props: {
+    // 通过双向绑定控制组件的弹出与收起
+    value: {
+    	type: Boolean,
+    	default: false
+    },
+    modelValue: {
+      type: Boolean,
+      default: false
+    },
+		// 列数据
+		list: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 是否显示边框
+		border: {
+			type: Boolean,
+			default: true
+		},
+		// "取消"按钮的颜色
+		cancelColor: {
+			type: String,
+			default: '#606266'
+		},
+		// "确定"按钮的颜色
+		confirmColor: {
+			type: String,
+			default: '#2979ff'
+		},
+		// 弹出的z-index值
+		zIndex: {
+			type: [String, Number],
+			default: 0
+		},
+		safeAreaInsetBottom: {
+			type: Boolean,
+			default: false
+		},
+		// 是否允许通过点击遮罩关闭Picker
+		maskCloseAble: {
+			type: Boolean,
+			default: true
+		},
+		// 提供的默认选中的下标
+		defaultValue: {
+			type: Array,
+			default() {
+				return [0];
+			}
+		},
+		// 模式选择，single-column-单列，mutil-column-多列，mutil-column-auto-多列联动
+		mode: {
+			type: String,
+			default: 'single-column'
+		},
+		// 自定义value属性名
+		valueName: {
+			type: String,
+			default: 'value'
+		},
+		// 自定义label属性名
+		labelName: {
+			type: String,
+			default: 'label'
+		},
+		// 自定义多列联动模式的children属性名
+		childName: {
+			type: String,
+			default: 'children'
+		},
+		// 顶部标题
+		title: {
+			type: String,
+			default: ''
+		},
+		// 取消按钮的文字
+		cancelText: {
+			type: String,
+			default: '取消'
+		},
+		// 确认按钮的文字
+		confirmText: {
+			type: String,
+			default: '确认'
+		},
+		// 遮罩的模糊度
+		blur: {
+			type: [Number, String],
+			default: 0
+		},
+	},
+	data() {
+		return {
+      popupValue: false,
+			// 用于列改变时，保存当前的索引，下一次变化时比较得出是哪一列发生了变化
+			defaultSelector: [0],
+			// picker-view的数据
+			columnData: [],
+			// 每次队列发生变化时，保存选择的结果
+			selectValue: [],
+			// 上一次列变化时的index
+			lastSelectIndex: [],
+			// 列数
+			columnNum: 0,
+			// 列是否还在滑动中，微信小程序如果在滑动中就点确定，结果可能不准确
+			moving: false
+		};
+	},
+	watch: {
+		// 在select弹起的时候，重新初始化所有数据
+		value: {
+			immediate: true,
+			handler(val) {
+				if(val) setTimeout(() => this.init(), 10);
+        this.popupValue = val;
+			}
+		},
+    modelValue: {
+    	immediate: true,
+    	handler(val) {
+    		if(val) setTimeout(() => this.init(), 10);
+        this.popupValue = val;
+    	}
+    },
+	},
+	computed: {
+		uZIndex() {
+			// 如果用户有传递z-index值，优先使用
+			return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+		},
+	},
+	methods: {
+		// 标识滑动开始，只有微信小程序才有这样的事件
+		pickstart() {
+			// #ifdef MP-WEIXIN
+			this.moving = true;
+			// #endif
+		},
+		// 标识滑动结束
+		pickend() {
+			// #ifdef MP-WEIXIN
+			this.moving = false;
+			// #endif
+		},
+		init() {
+			this.setColumnNum();
+			this.setDefaultSelector();
+			this.setColumnData();
+			this.setSelectValue();
+		},
+		// 获取默认选中列下标
+		setDefaultSelector() {
+			// 如果没有传入默认选中的值，生成长度为columnNum，用0填充的数组
+			this.defaultSelector = this.defaultValue.length == this.columnNum ? this.defaultValue : Array(this.columnNum).fill(0);
+			this.lastSelectIndex = this.$u.deepClone(this.defaultSelector);
+		},
+		// 计算列数
+		setColumnNum() {
+			// 单列的列数为1
+			if(this.mode == 'single-column') this.columnNum = 1;
+			// 多列时，this.list数组长度就是列数
+			else if(this.mode == 'mutil-column') this.columnNum = this.list.length;
+			// 多列联动时，通过历遍this.list的第一个元素，得出有多少列
+			else if(this.mode == 'mutil-column-auto') {
+				let num = 1;
+				let column = this.list;
+				// 只要有元素并且第一个元素有children属性，继续历遍
+				while(column[0][this.childName]) {
+					column = column[0] ? column[0][this.childName] : {};
+					num ++;
+				}
+				this.columnNum = num;
+			}
+		},
+		// 获取需要展示在picker中的列数据
+		setColumnData() {
+			let data = [];
+			this.selectValue = [];
+			if(this.mode == 'mutil-column-auto') {
+				// 获得所有数据中的第一个元素
+				let column = this.list[this.defaultSelector.length ? this.defaultSelector[0] : 0];
+				// 通过循环所有的列数，再根据设定列的数组，得出当前需要渲染的整个列数组
+				for (let i = 0; i < this.columnNum; i++) {
+					// 第一列默认为整个list数组
+					if (i == 0) {
+						data[i] = this.list;
+						column = column[this.childName];
+					} else {
+						// 大于第一列时，判断是否有默认选中的，如果没有就用该列的第一项
+						data[i] = column;
+						column = column[this.defaultSelector[i]][this.childName];
+					}
+				}
+			} else if(this.mode == 'single-column') {
+				data[0] = this.list;
+			} else {
+				data = this.list;
+			}
+			this.columnData = data;
+		},
+		// 获取默认选中的值，如果没有设置defaultValue，就默认选中每列的第一个
+		setSelectValue() {
+			let tmp = null;
+			for(let i = 0; i < this.columnNum; i++) {
+				tmp = this.columnData[i][this.defaultSelector[i]];
+				let data = {
+					value: tmp ? tmp[this.valueName] : null,
+					label: tmp ? tmp[this.labelName] : null
+				};
+				// 判断是否存在额外的参数，如果存在，就返回
+				if(tmp && tmp.extra) data.extra = tmp.extra;
+				this.selectValue.push(data)
+			}
+		},
+		// 列选项
+		columnChange(e) {
+			let index = null;
+			let columnIndex = e.detail.value;
+			// 由于后面是需要push进数组的，所以需要先清空数组
+			this.selectValue = [];
+			if(this.mode == 'mutil-column-auto') {
+				// 对比前后两个数组，寻找变更的是哪一列，如果某一个元素不同，即可判定该列发生了变化
+				this.lastSelectIndex.map((val, idx) => {
+					if (val != columnIndex[idx]) index = idx;
+				});
+				this.defaultSelector = columnIndex;
+				for (let i = index + 1; i < this.columnNum; i++) {
+					// 当前变化列的下一列的数据，需要获取上一列的数据，同时需要指定是上一列的第几个的children，再往后的
+					// 默认是队列的第一个为默认选项
+					this.columnData[i] = this.columnData[i - 1][i - 1 == index ? columnIndex[index] : 0][this.childName];
+					// 改变的列之后的所有列，默认选中第一个
+					this.defaultSelector[i] = 0;
+				}
+				// 在历遍的过程中，可能由于上一步修改this.columnData，导致产生连锁反应，程序触发columnChange，会有多次调用
+				// 只有在最后一次数据稳定后的结果是正确的，此前的历遍中，可能会产生undefined，故需要判断
+				columnIndex.map((item, index) => {
+					let data = this.columnData[index][columnIndex[index]];
+					let tmp = {
+						value: data ? data[this.valueName] : null,
+						label: data ? data[this.labelName] : null,
+					};
+					// 判断是否有需要额外携带的参数
+					if(data && data.extra !== undefined) tmp.extra = data.extra;
+					this.selectValue.push(tmp);
+
+				})
+				// 保存这一次的结果，用于下次列发生变化时作比较
+				this.lastSelectIndex = columnIndex;
+			} else if(this.mode == 'single-column') {
+				let data = this.columnData[0][columnIndex[0]];
+				// 初始默认选中值
+				let tmp = {
+					value: data ? data[this.valueName] : null,
+					label: data ? data[this.labelName] : null,
+				};
+				// 判断是否有需要额外携带的参数
+				if(data && data.extra !== undefined) tmp.extra = data.extra;
+				this.selectValue.push(tmp);
+			} else if(this.mode == 'mutil-column') {
+				// 初始默认选中值
+				columnIndex.map((item, index) => {
+					let data = this.columnData[index][columnIndex[index]];
+					// 初始默认选中值
+					let tmp = {
+						value: data ? data[this.valueName] : null,
+						label: data ? data[this.labelName] : null,
+					};
+					// 判断是否有需要额外携带的参数
+					if(data && data.extra !== undefined) tmp.extra = data.extra;
+					this.selectValue.push(tmp);
+				})
+			}
+		},
+		close() {
+			this.$emit('input', false);
+      this.$emit("update:modelValue", false);
+		},
+		// 点击确定或者取消
+		getResult(event = null) {
+			// #ifdef MP-WEIXIN
+			if (this.moving) return;
+			// #endif
+			if (event) this.$emit(event, this.selectValue);
+			this.close();
+		},
+		selectHandler() {
+			this.$emit('click');
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../libs/css/style.components.scss";
+
+.u-select {
+
+	&__action {
+		position: relative;
+		line-height: $u-form-item-height;
+		height: $u-form-item-height;
+
+		&__icon {
+			position: absolute;
+			right: 20rpx;
+			top: 50%;
+			transition: transform .4s;
+			transform: translateY(-50%);
+			z-index: 1;
+
+			&--reverse {
+				transform: rotate(-180deg) translateY(50%);
+			}
+		}
+	}
+
+	&__hader {
+		&__title {
+			color: $u-content-color;
+		}
+	}
+
+	&--border {
+		border-radius: 6rpx;
+		border-radius: 4px;
+		border: 1px solid $u-form-item-border-color;
+	}
+
+	&__header {
+		@include vue-flex;
+		align-items: center;
+		justify-content: space-between;
+		height: 80rpx;
+		padding: 0 40rpx;
+	}
+
+	&__body {
+		width: 100%;
+		height: 300rpx;
+		overflow: hidden;
+		background-color: #fff;
+
+		&__picker-view {
+			height: 100%;
+			box-sizing: border-box;
+
+			&__item {
+				@include vue-flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 32rpx;
+				color: $u-main-color;
+				padding: 0 8rpx;
+			}
+		}
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-skeleton/u-skeleton.vue b/uni_modules/vk-uview-ui/components/u-skeleton/u-skeleton.vue
new file mode 100644
index 0000000..c8cb19e
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-skeleton/u-skeleton.vue
@@ -0,0 +1,199 @@
+<template>
+	<view v-if="loading" :style="{
+		width: windowWinth + 'px', 
+		height: windowHeight + 'px', 
+		backgroundColor: bgColor, 
+		position: 'absolute', 
+		left: left + 'px', 
+		top: top + 'px', 
+		zIndex: 9998, 
+		overflow: 'hidden'
+	}"
+	 @touchmove.stop.prevent>
+		<view v-for="(item, index) in RectNodes" :key="$u.guid()" :class="[animation ? 'skeleton-fade' : '']" :style="{
+			width: item.width + 'px', 
+			height: item.height + 'px', 
+			backgroundColor: elColor, 
+			position: 'absolute', 
+			left: (item.left - left) + 'px', 
+			top: (item.top - top) + 'px'
+		}"></view>
+		<view v-for="(item, index) in circleNodes" :key="$u.guid()" :class="animation ? 'skeleton-fade' : ''" :style="{
+			width: item.width + 'px', 
+			height: item.height + 'px', 
+			backgroundColor: elColor, 
+			borderRadius: item.width/2 + 'px', 
+			position: 'absolute', 
+			left: (item.left - left) + 'px',
+			top: (item.top - top) + 'px'
+		}"></view>
+		<view v-for="(item, index) in filletNodes" :key="$u.guid()" :class="animation ? 'skeleton-fade' : ''" :style="{
+			width: item.width + 'px', 
+			height: item.height + 'px', 
+			backgroundColor: elColor, 
+			borderRadius: borderRadius + 'rpx', 
+			position: 'absolute', 
+			left: (item.left - left) + 'px',
+			top: (item.top - top) + 'px'
+		}"></view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * skeleton 骨架屏
+	 * @description 骨架屏一般用于页面在请求远程数据尚未完成时，页面用灰色块预显示本来的页面结构，给用户更好的体验。
+	 * @tutorial https://www.uviewui.com/components/skeleton.html
+	 * @property {String} el-color 骨架块状元素的背景颜色（默认#e5e5e5）
+	 * @property {String} bg-color 骨架组件背景颜色（默认#ffffff）
+	 * @property {Boolean} animation 骨架块是否显示动画效果（默认false）
+	 * @property {String Number} border-radius u-skeleton-fillet类名元素，对应的骨架块的圆角大小，单位rpx（默认10）
+	 * @property {Boolean} loading 是否显示骨架组件，请求完成后，将此值设置为false（默认true）
+	 * @example <u-skeleton :loading="true" :animation="true"></u-skeleton>
+	 */
+	export default {
+		name: "u-skeleton",
+		props: {
+			// 需要渲染的元素背景颜色，十六进制或者rgb等都可以
+			elColor: {
+				type: String,
+				default: '#e5e5e5'
+			},
+			// 整个骨架屏页面的背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 是否显示加载动画
+			animation: {
+				type: Boolean,
+				default: false
+			},
+			// 圆角值，只对类名为u-skeleton-fillet的元素生效，为数值，不带单位
+			borderRadius: {
+				type: [String, Number],
+				default: "10"
+			},
+			// 是否显示骨架，true-显示，false-隐藏
+			loading: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				windowWinth: 750, // 骨架屏宽度
+				windowHeight: 1500, // 骨架屏高度
+				filletNodes: [], // 圆角元素
+				circleNodes: [], // 圆形元素
+				RectNodes: [], // 矩形元素
+				top: 0,
+				left: 0,
+			}
+		},
+		methods: {
+			// 查询各节点的信息
+			selecterQueryInfo() {
+				// 获取整个父组件容器的高度，当做骨架屏的高度 
+				// 在微信小程序中，如果把骨架屏放入组件中使用的话，需要调in(this)上下文为父组件才有效
+				let query = '';
+				// #ifdef MP-WEIXIN
+				query = uni.createSelectorQuery().in(this.$parent);
+				// #endif
+				// #ifndef MP-WEIXIN
+				query = uni.createSelectorQuery()
+				// #endif
+				query.selectAll('.u-skeleton').boundingClientRect().exec((res) => {
+					this.windowHeight = res[0][0].height;
+					this.windowWinth = res[0][0].width;
+					this.top = res[0][0].bottom - res[0][0].height;
+					this.left = res[0][0].left;
+				});
+				// 矩形骨架元素
+				this.getRectEls();
+				// 圆形骨架元素
+				this.getCircleEls();
+				// 圆角骨架元素
+				this.getFilletEls();
+			},
+			// 矩形元素列表
+			getRectEls() {
+				let query = '';
+				// 在微信小程序中，如果把骨架屏放入组件中使用的话，需要调in(this)上下文为父组件才有效
+				// #ifdef MP-WEIXIN
+				query = uni.createSelectorQuery().in(this.$parent);
+				// #endif
+				// #ifndef MP-WEIXIN
+				query = uni.createSelectorQuery()
+				// #endif
+				query.selectAll('.u-skeleton-rect').boundingClientRect().exec((res) => {
+					this.RectNodes = res[0];
+				});
+			},
+			// 圆角元素列表
+			getFilletEls() {
+				let query = '';
+				// 在微信小程序中，如果把骨架屏放入组件中使用的话，需要调in(this)上下文为父组件才有效
+				// #ifdef MP-WEIXIN
+				query = uni.createSelectorQuery().in(this.$parent);
+				// #endif
+				// #ifndef MP-WEIXIN
+				query = uni.createSelectorQuery()
+				// #endif
+				query.selectAll('.u-skeleton-fillet').boundingClientRect().exec((res) => {
+					this.filletNodes = res[0];
+				});
+			},
+			// 圆形元素列表
+			getCircleEls() {
+				let query = '';
+				// 在微信小程序中，如果把骨架屏放入组件中使用的话，需要调in(this)上下文为父组件才有效
+				// #ifdef MP-WEIXIN
+				query = uni.createSelectorQuery().in(this.$parent);
+				// #endif
+				// #ifndef MP-WEIXIN
+				query = uni.createSelectorQuery()
+				// #endif
+				query.selectAll('.u-skeleton-circle').boundingClientRect().exec((res) => {
+					this.circleNodes = res[0];
+				});
+			}
+		},
+		// 组件被挂载
+		mounted() {
+			// 获取系统信息
+			let systemInfo = uni.getSystemInfoSync();
+			this.windowHeight = systemInfo.windowHeight;
+			this.windowWinth = systemInfo.windowWidth;
+			this.selecterQueryInfo();
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.skeleton-fade {
+		width: 100%;
+		height: 100%;
+		background: rgb(194, 207, 214);
+		animation-duration: 1.5s;
+		animation-name: blink;
+		animation-timing-function: ease-in-out;
+		animation-iteration-count: infinite;
+	}
+
+	@keyframes blink {
+		0% {
+			opacity: 1;
+		}
+
+		50% {
+			opacity: 0.4;
+		}
+
+		100% {
+			opacity: 1;
+		}
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-slider/u-slider.vue b/uni_modules/vk-uview-ui/components/u-slider/u-slider.vue
new file mode 100644
index 0000000..0f27e8a
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-slider/u-slider.vue
@@ -0,0 +1,290 @@
+<template>
+	<view
+		class="u-slider"
+		@tap="onClick"
+		:class="[disabled ? 'u-slider--disabled' : '']"
+		:style="{
+			backgroundColor: inactiveColor
+		}"
+	>
+		<view
+			class="u-slider__gap"
+			:style="[
+				barStyle,
+				{
+					height: height + 'rpx',
+					backgroundColor: activeColor
+				}
+			]"
+		>
+			<view
+				class="u-slider__button-wrap"
+				@touchstart="onTouchStart"
+				@touchmove="onTouchMove"
+				@touchend="onTouchEnd"
+				@touchcancel="onTouchEnd"
+			>
+				<slot v-if="$slots.default || $slots.$default" />
+				<view
+					v-else
+					class="u-slider__button"
+					:style="[
+						blockStyle,
+						{
+							height: blockWidth + 'rpx',
+							width: blockWidth + 'rpx',
+							backgroundColor: blockColor
+						}
+					]"
+				></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * slider 滑块选择器
+ * @tutorial https://uviewui.com/components/slider.html
+ * @property {Number | String} value 滑块默认值（默认0）
+ * @property {Number | String} min 最小值（默认0）
+ * @property {Number | String} max 最大值（默认100）
+ * @property {Number | String} step 步长（默认1）
+ * @property {Number | String} blockWidth 滑块宽度，高等于宽（30）
+ * @property {Number | String} height 滑块条高度，单位rpx（默认6）
+ * @property {String} inactiveColor 底部条背景颜色（默认#c0c4cc）
+ * @property {String} activeColor 底部选择部分的背景颜色（默认#2979ff）
+ * @property {String} blockColor 滑块颜色（默认#ffffff）
+ * @property {Object} blockStyle 给滑块自定义样式，对象形式
+ * @property {Boolean} disabled 是否禁用滑块(默认为false)
+ * @event {Function} start 滑动触发
+ * @event {Function} moving 正在滑动中
+ * @event {Function} end 滑动结束
+ * @example <u-slider v-model="value" />
+ */
+export default {
+	name: "u-slider",
+	emits: ["update:modelValue", "input", "start", "moving", "end"],
+	props: {
+		// 当前进度百分比值，范围0-100
+		value: {
+			type: [Number, String],
+			default: 0
+		},
+		modelValue: {
+			type: [Number, String],
+			default: 0
+		},
+		// 是否禁用滑块
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 滑块宽度，高等于宽，单位rpx
+		blockWidth: {
+			type: [Number, String],
+			default: 30
+		},
+		// 最小值
+		min: {
+			type: [Number, String],
+			default: 0
+		},
+		// 最大值
+		max: {
+			type: [Number, String],
+			default: 100
+		},
+		// 步进值
+		step: {
+			type: [Number, String],
+			default: 1
+		},
+		// 滑块条高度，单位rpx
+		height: {
+			type: [Number, String],
+			default: 6
+		},
+		// 进度条的激活部分颜色
+		activeColor: {
+			type: String,
+			default: "#2979ff"
+		},
+		// 进度条的背景颜色
+		inactiveColor: {
+			type: String,
+			default: "#c0c4cc"
+		},
+		// 滑块的背景颜色
+		blockColor: {
+			type: String,
+			default: "#ffffff"
+		},
+		// 用户对滑块的自定义颜色
+		blockStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		}
+	},
+	data() {
+		return {
+			startX: 0,
+			status: "end",
+			newValue: 0,
+			distanceX: 0,
+			startValue: 0,
+			barStyle: {},
+			sliderRect: {
+				left: 0,
+				width: 0
+			}
+		};
+	},
+	watch: {
+		valueCom(n) {
+			// 只有在非滑动状态时，才可以通过value更新滑块值，这里监听，是为了让用户触发
+			if (this.status == "end") this.updateValue(this.valueCom, false);
+		}
+	},
+	created() {
+		this.updateValue(this.valueCom, false);
+	},
+	mounted() {
+		// 获取滑块条的尺寸信息
+		this.$uGetRect(".u-slider").then(rect => {
+			this.sliderRect = rect;
+		});
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		}
+	},
+	methods: {
+		onTouchStart(event) {
+			if (this.disabled) return;
+			this.startX = 0;
+			// 触摸点集
+			let touches = event.touches[0];
+			// 触摸点到屏幕左边的距离
+			this.startX = touches.clientX;
+			// 此处的this.value虽为props值，但是通过$emit('input')进行了修改
+			this.startValue = this.format(this.valueCom);
+			// 标示当前的状态为开始触摸滑动
+			this.status = "start";
+		},
+		onTouchMove(event) {
+			if (this.disabled) return;
+			// 连续触摸的过程会一直触发本方法，但只有手指触发且移动了才被认为是拖动了，才发出事件
+			// 触摸后第一次移动已经将status设置为moving状态，故触摸第二次移动不会触发本事件
+			if (this.status == "start") this.$emit("start");
+			let touches = event.touches[0];
+			// 滑块的左边不一定跟屏幕左边接壤，所以需要减去最外层父元素的左边值
+			this.distanceX = touches.clientX - this.sliderRect.left;
+			// 获得移动距离对整个滑块的百分比值，此为带有多位小数的值，不能用此更新视图
+			// 否则造成通信阻塞，需要每改变一个step值时修改一次视图
+			this.newValue = (this.distanceX / this.sliderRect.width) * 100;
+			this.status = "moving";
+			// 发出moving事件
+			this.$emit("moving");
+			this.updateValue(this.newValue, true);
+		},
+		onTouchEnd() {
+			if (this.disabled) return;
+			if (this.status === "moving") {
+				this.updateValue(this.newValue, false);
+				this.$emit("end");
+			}
+			this.status = "end";
+		},
+		updateValue(value, drag) {
+			// 去掉小数部分，同时也是对step步进的处理
+			const width = this.format(value);
+			// 不允许滑动的值超过max最大值，百分比也不能超过100
+			if (width > this.max || width > 100) return;
+			// 设置移动的百分比值
+			let barStyle = {
+				width: width + "%"
+			};
+			// 移动期间无需过渡动画
+			if (drag == true) {
+				barStyle.transition = "none";
+			} else {
+				// 非移动期间，删掉对过渡为空的声明，让css中的声明起效
+				delete barStyle.transition;
+			}
+			// 修改value值
+			this.$emit("input", width);
+			this.$emit("update:modelValue", width);
+			this.barStyle = barStyle;
+		},
+		format(value) {
+			// 将小数变成整数，为了减少对视图的更新，造成视图层与逻辑层的阻塞
+			return Math.round(Math.max(this.min, Math.min(value, this.max)) / this.step) * this.step;
+		},
+		onClick(event) {
+			if (this.disabled) return;
+			// 直接点击滑块的情况，计算方式与onTouchMove方法相同
+			const value = ((event.detail.x - this.sliderRect.left) / this.sliderRect.width) * 100;
+			this.updateValue(value, false);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-slider {
+	position: relative;
+	border-radius: 999px;
+	border-radius: 999px;
+	background-color: #ebedf0;
+}
+
+.u-slider:before {
+	position: absolute;
+	right: 0;
+	left: 0;
+	content: "";
+	top: -8px;
+	bottom: -8px;
+	z-index: -1;
+}
+
+.u-slider__gap {
+	position: relative;
+	border-radius: inherit;
+	transition: width 0.2s;
+	transition: width 0.2s;
+	background-color: #1989fa;
+}
+
+.u-slider__button {
+	width: 24px;
+	height: 24px;
+	border-radius: 50%;
+	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
+	background-color: #fff;
+	cursor: pointer;
+}
+
+.u-slider__button-wrap {
+	position: absolute;
+	top: 50%;
+	right: 0;
+	transform: translate3d(50%, -50%, 0);
+}
+
+.u-slider--disabled {
+	opacity: 0.5;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-steps/u-steps.vue b/uni_modules/vk-uview-ui/components/u-steps/u-steps.vue
new file mode 100644
index 0000000..a72cfcf
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-steps/u-steps.vue
@@ -0,0 +1,200 @@
+<template>
+	<view class="">
+		<view
+			class="u-steps"
+			:style="{
+				flexDirection: direction
+			}"
+		>
+			<view class="u-steps__item" 
+				:class="['u-steps__item--' + direction]" 
+				v-for="(item, index) in list" :key="index"
+			>
+				<view
+					class="u-steps__item__num"
+					v-if="mode == 'number'"
+					:style="{
+						backgroundColor: current < index ? 'transparent' : activeColor,
+						borderColor: current < index ? unActiveColor : activeColor
+					}"
+				>
+					<text v-if="current < index" :style="{
+						color: current < index ? unActiveColor : activeColor,
+					}">
+						{{ index + 1 }}
+					</text>
+					<u-icon v-else size="22" color="#ffffff" :name="icon"></u-icon>
+				</view>
+				<view class="u-steps__item__dot" v-if="mode == 'dot'" :style="{ 
+					backgroundColor: index <= current ? activeColor : unActiveColor 
+				}"></view>
+				<text class="u-line-1" :style="{ 
+					color: index <= current ? activeColor : unActiveColor,
+				}" :class="['u-steps__item__text--' + direction]">
+					{{ item.name }}
+				</text>
+				<view class="u-steps__item__line" :class="['u-steps__item__line--' + mode]" v-if="index < list.length - 1">
+					<u-line :direction="direction" length="100%" :hair-line="false" :color="unActiveColor"></u-line>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * steps 步骤条
+ * @description 该组件一般用于完成一个任务要分几个步骤，标识目前处于第几步的场景。
+ * @tutorial https://www.uviewui.com/components/steps.html
+ * @property {String} mode 设置模式（默认dot）
+ * @property {Array} list 数轴条数据，数组。具体见上方示例
+ * @property {String} type type主题（默认primary）
+ * @property {String} direction row-横向，column-竖向（默认row）
+ * @property {Number String} current 设置当前处于第几步
+ * @property {String} active-color 已完成步骤的激活颜色，如设置，type值会失效
+ * @property {String} un-active-color 未激活的颜色，用于表示未完成步骤的颜色（默认#606266）
+ * @example <u-steps :list="numList" active-color="#fa3534"></u-steps>
+ */
+export default {
+	name: 'u-steps',
+	props: {
+		// 步骤条的类型，dot|number
+		mode: {
+			type: String,
+			default: 'dot'
+		},
+		// 步骤条的数据
+		list: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 主题类型, primary|success|info|warning|error
+		type: {
+			type: String,
+			default: 'primary'
+		},
+		// 当前哪一步是激活的
+		current: {
+			type: [Number, String],
+			default: 0
+		},
+		// 激活步骤的颜色
+		activeColor: {
+			type: String,
+			default: '#2979ff'
+		},
+		// 未激活的颜色
+		unActiveColor: {
+			type: String,
+			default: '#909399'
+		},
+		// 自定义图标
+		icon: {
+			type: String,
+			default: 'checkmark'
+		},
+		// step的排列方向，row-横向，column-竖向
+		direction: {
+			type: String,
+			default: 'row'
+		}
+	},
+	data() {
+		return {};
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+@import '../../libs/css/style.components.scss';
+
+$u-steps-item-number-width: 44rpx;
+$u-steps-item-dot-width: 20rpx;
+
+.u-steps {
+	@include vue-flex;
+	
+	.u-steps__item {
+		flex: 1;
+		text-align: center;
+		position: relative;
+		min-width: 100rpx;
+		font-size: 26rpx;
+		color: #8799a3;
+		@include vue-flex;
+		justify-content: center;
+		flex-direction: column;
+		align-items: center;
+		
+		&--row {
+			@include vue-flex;
+			flex-direction: column;
+			
+			.u-steps__item__line {
+				position: absolute;
+				z-index: 0;
+				left: 75%;
+				width: 50%;
+				
+				&--dot {
+					top: calc(#{$u-steps-item-dot-width} / 2);
+				}
+				
+				&--number {
+					top: calc(#{$u-steps-item-number-width} / 2);
+				}
+			}
+		}
+		
+		&--column {
+			@include vue-flex;
+			flex-direction: row;
+			justify-content: flex-start;
+			min-height: 120rpx;
+			
+			.u-steps__item__line {
+				position: absolute;
+				z-index: 0;
+				height: 50%;
+				top: 75%;
+				
+				&--dot {
+					left: calc(#{$u-steps-item-dot-width} / 2);
+				}
+				
+				&--number {
+					left: calc(#{$u-steps-item-number-width} / 2);
+				}
+			}
+		}
+		
+		&__num {
+			@include vue-flex;
+			align-items: center;
+			justify-content: center;
+			width: $u-steps-item-number-width;
+			height: $u-steps-item-number-width;
+			border: 1px solid #8799a3;
+			border-radius: 50%;
+			overflow: hidden;
+		}
+		
+		&__dot {
+			width: $u-steps-item-dot-width;
+			height: $u-steps-item-dot-width;
+			@include vue-flex;
+			border-radius: 50%;
+		}
+		
+		&__text--row {
+			margin-top: 14rpx;
+		}
+		
+		&__text--column {
+			margin-left: 14rpx;
+		}
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-sticky/u-sticky.vue b/uni_modules/vk-uview-ui/components/u-sticky/u-sticky.vue
new file mode 100644
index 0000000..583a22c
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-sticky/u-sticky.vue
@@ -0,0 +1,166 @@
+<template>
+	<view class="">
+		<view class="u-sticky-wrap" :class="[elClass]" :style="{
+			height: fixed ? height + 'px' : 'auto',
+			backgroundColor: bgColor
+		}">
+			<view class="u-sticky" :style="{
+				position: fixed ? 'fixed' : 'static',
+				top: stickyTop + 'px',
+				left: left + 'px',
+				width: width == 'auto' ? 'auto' : width + 'px',
+				zIndex: uZIndex
+			}">
+				<slot></slot>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * sticky 吸顶
+	 * @description 该组件与CSS中position: sticky属性实现的效果一致，当组件达到预设的到顶部距离时， 就会固定在指定位置，组件位置大于预设的顶部距离时，会重新按照正常的布局排列。
+	 * @tutorial https://www.uviewui.com/components/sticky.html
+	 * @property {String Number} offset-top 吸顶时与顶部的距离，单位rpx（默认0）
+	 * @property {String Number} index 自定义标识，用于区分是哪一个组件
+	 * @property {Boolean} enable 是否开启吸顶功能（默认true）
+	 * @property {String} bg-color 组件背景颜色（默认#ffffff）
+	 * @property {String Number} z-index 吸顶时的z-index值（默认970）
+	 * @property {String Number} h5-nav-height 导航栏高度，自定义导航栏时(无导航栏时需设置为0)，需要传入此值，单位px（默认44）
+	 * @event {Function} fixed 组件吸顶时触发
+	 * @event {Function} unfixed 组件取消吸顶时触发
+	 * @example <u-sticky offset-top="200"><view>塞下秋来风景异，衡阳雁去无留意</view></u-sticky>
+	 */
+	export default {
+		name: "u-sticky",
+    emits: ["fixed", "unfixed"],
+		props: {
+			// 吸顶容器到顶部某个距离的时候，进行吸顶，在H5平台，NavigationBar为44px
+			offsetTop: {
+				type: [Number, String],
+				default: 0
+			},
+			//列表中的索引值
+			index: {
+				type: [Number, String],
+				default: ''
+			},
+			// 是否开启吸顶功能
+			enable: {
+				type: Boolean,
+				default: true
+			},
+			// h5顶部导航栏的高度
+			h5NavHeight: {
+				type: [Number, String],
+				default: 44
+			},
+			// 吸顶区域的背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// z-index值
+			zIndex: {
+				type: [Number, String],
+				default: ''
+			}
+		},
+		data() {
+			return {
+				fixed: false,
+				height: 'auto',
+				stickyTop: 0,
+				elClass: this.$u.guid(),
+				left: 0,
+				width: 'auto',
+			};
+		},
+		watch: {
+			offsetTop(val) {
+				this.initObserver();
+			},
+			enable(val) {
+				if (val == false) {
+					this.fixed = false;
+					this.disconnectObserver('contentObserver');
+				} else {
+					this.initObserver();
+				}
+			}
+		},
+		computed: {
+			uZIndex() {
+				return this.zIndex ? this.zIndex : this.$u.zIndex.sticky;
+			}
+		},
+		mounted() {
+			this.initObserver();
+		},
+		methods: {
+			initObserver() {
+				if (!this.enable) return;
+				// #ifdef H5
+				this.stickyTop = this.offsetTop != 0 ? uni.upx2px(this.offsetTop) + this.h5NavHeight : this.h5NavHeight;
+				// #endif
+				// #ifndef H5
+				this.stickyTop = this.offsetTop != 0 ? uni.upx2px(this.offsetTop) : 0;
+				// #endif
+
+				this.disconnectObserver('contentObserver');
+				this.$uGetRect('.' + this.elClass).then((res) => {
+					this.height = res.height;
+					this.left = res.left;
+					this.width = res.width;
+					this.$nextTick(() => {
+						this.observeContent();
+					});
+				});
+			},
+			observeContent() {
+				this.disconnectObserver('contentObserver');
+				const contentObserver = uni.createIntersectionObserver(this,{
+					thresholds: [0.95, 0.98, 1]
+				});
+				contentObserver.relativeToViewport({
+					top: -this.stickyTop
+				});
+				contentObserver.observe('.' + this.elClass, res => {
+					if (!this.enable) return;
+					this.setFixed(res.boundingClientRect.top);
+				});
+				this.contentObserver = contentObserver;
+			},
+			setFixed(top) {
+				const fixed = top < this.stickyTop;
+				if (fixed) this.$emit('fixed', this.index);
+				else if(this.fixed) this.$emit('unfixed', this.index);
+				this.fixed = fixed;
+			},
+			disconnectObserver(observerName) {
+				const observer = this[observerName];
+				observer && observer.disconnect();
+			},
+		},
+    // #ifndef VUE3
+    beforeDestroy() {
+      this.disconnectObserver('contentObserver');
+    },
+    // #endif
+    
+    // #ifdef VUE3
+    beforeUnmount() {
+      this.disconnectObserver('contentObserver');
+    },
+    // #endif
+	};
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	
+	.u-sticky {
+		z-index: 9999999999;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-subsection/u-subsection.vue b/uni_modules/vk-uview-ui/components/u-subsection/u-subsection.vue
new file mode 100644
index 0000000..a942c87
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-subsection/u-subsection.vue
@@ -0,0 +1,406 @@
+<template>
+	<view class="u-subsection" :style="[subsectionStyle]">
+		<view class="u-item u-line-1" :style="[itemStyle(index)]" @tap="click(index)"
+			:class="[noBorderRight(index), 'u-item-' + index]" v-for="(item, index) in listInfo" :key="index">
+			<view :style="[textStyle(index)]" class="u-item-text u-line-1">{{ item.name }}</view>
+			<u-badge v-if="item.num > 0" :count="item.num" :offset="offset" size="mini"></u-badge>
+		</view>
+		<view class="u-item-bg" :style="[itemBarStyle]"></view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * subsection 分段器
+	 * @description 该分段器一般用于用户从几个选项中选择某一个的场景
+	 * @tutorial https://www.uviewui.com/components/subsection.html
+	 * @property {Array} list 选项的数组，形式见上方"基本使用"
+	 * @property {String Number} current 初始化时默认选中的选项索引值（默认0）
+	 * @property {String} active-color 激活时的颜色，mode为subsection时固定为白色（默认#303133）
+	 * @property {String} inactive-color 未激活时字体的颜色，mode为subsection时无效（默认#606266）
+	 * @property {String} mode 模式选择，见官网"模式选择"说明（默认button）
+	 * @property {String Number} font-size 字体大小，单位rpx（默认28）
+	 * @property {String Number} height 组件高度，单位rpx（默认70）
+	 * @property {Boolean} animation 是否开启动画效果，见上方说明（默认true）
+	 * @property {Boolean} bold 激活选项的字体是否加粗（默认true）
+	 * @property {String} bg-color 组件背景颜色，mode为button时有效（默认#eeeeef）
+	 * @property {String} button-color 按钮背景颜色，mode为button时有效（默认#ffffff）
+	 * @event {Function} change 分段器选项发生改变时触发
+	 * @example <u-subsection active-color="#ff9900"></u-subsection>
+	 */
+	export default {
+		name: "u-subsection",
+		emits: ["change", "update:modelValue", "input"],
+		props: {
+			// tab的数据
+			list: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			value: {
+				type: [String, Number],
+				default: 0
+			},
+			modelValue: {
+				type: [String, Number],
+				default: 0
+			},
+			// 当前活动的tab的index
+			current: {
+				type: [Number, String],
+				default: 0
+			},
+			// 激活的颜色
+			activeColor: {
+				type: String,
+				default: '#303133'
+			},
+			// 未激活的颜色
+			inactiveColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 模式选择，mode=button为按钮形式，mode=subsection时为分段模式
+			mode: {
+				type: String,
+				default: 'button'
+			},
+			// 字体大小，单位rpx
+			fontSize: {
+				type: [Number, String],
+				default: 28
+			},
+			// 是否开启动画效果
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 组件的高度，单位rpx
+			height: {
+				type: [Number, String],
+				default: 70
+			},
+			// 激活tab的字体是否加粗
+			bold: {
+				type: Boolean,
+				default: true
+			},
+			// mode=button时，组件背景颜色
+			bgColor: {
+				type: String,
+				default: '#eeeeef'
+			},
+			// mode = button时，滑块背景颜色
+			buttonColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 在切换分段器的时候，是否让设备震一下
+			vibrateShort: {
+				type: Boolean,
+				default: false
+			},
+			offset: {
+				type: Array,
+				default: function() {
+					return [0, 0]
+				}
+			},
+		},
+		data() {
+			return {
+				itemBgStyle: {
+					width: 0,
+					left: 0,
+					backgroundColor: '#ffffff',
+					height: '100%',
+					transition: ''
+				},
+				currentIndex: this.current,
+				buttonPadding: 3, // mode = button 时，组件的内边距
+				borderRadius: 5, // 圆角值
+				firstTimeVibrateShort: true, // 组件初始化时，会触发current变化，此时不应震动
+				listInfo: []
+			};
+		},
+		watch: {
+			valueCom: {
+				immediate: true,
+				handler(nVal) {
+					if (nVal) {
+						this.currentIndex = nVal;
+						this.changeSectionStatus(nVal);
+					}
+				}
+			},
+			current: {
+				immediate: true,
+				handler(nVal) {
+					if (nVal) {
+						this.currentIndex = nVal;
+						this.changeSectionStatus(nVal);
+					}
+				}
+			},
+			list: {
+				deep: true,
+				handler(nVal = []) {
+					this.listInfoFn();
+					setTimeout(() => {
+						this.getTabsInfo();
+					}, 10);
+				}
+			},
+
+		},
+		computed: {
+			valueCom() {
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+			},
+			// 设置mode=subsection时，滑块特有的样式
+			noBorderRight() {
+				return index => {
+					if (this.mode != 'subsection') return;
+					let classs = '';
+					// 不显示右边的边框
+					if (index < this.list.length - 1) classs += ' u-none-border-right';
+					// 显示整个组件的左右边圆角
+					if (index == 0) classs += ' u-item-first';
+					if (index == this.list.length - 1) classs += ' u-item-last';
+					return classs;
+				};
+			},
+			// 文字的样式
+			textStyle() {
+				return index => {
+					let style = {};
+					// 设置字体颜色
+					if (this.mode == 'subsection') {
+						if (index == this.currentIndex) {
+							style.color = '#ffffff';
+						} else {
+							style.color = this.activeColor;
+						}
+					} else {
+						if (index == this.currentIndex) {
+							style.color = this.activeColor;
+						} else {
+							style.color = this.inactiveColor;
+						}
+					}
+					// 字体加粗
+					if (index == this.currentIndex && this.bold) style.fontWeight = 'bold';
+					// 文字大小
+					style.fontSize = this.fontSize + 'rpx';
+					return style;
+				};
+			},
+			// 每个分段器item的样式
+			itemStyle() {
+				return index => {
+					let style = {};
+					if (this.mode == 'subsection') {
+						// 设置border的样式
+						style.borderColor = this.activeColor;
+						style.borderWidth = '1px';
+						style.borderStyle = 'solid';
+					}
+					return style;
+				};
+			},
+			// mode=button时，外层view的样式
+			subsectionStyle() {
+				let style = {};
+				style.height = uni.upx2px(this.height) + 'px';
+				if (this.mode == 'button') {
+					style.backgroundColor = this.bgColor;
+					style.padding = `${this.buttonPadding}px`;
+					style.borderRadius = `${this.borderRadius}px`;
+				}
+				return style;
+			},
+			// 滑块的样式
+			itemBarStyle() {
+				let style = {};
+				style.backgroundColor = this.activeColor;
+				style.zIndex = 1;
+				if (this.mode == 'button') {
+					style.backgroundColor = this.buttonColor;
+					style.borderRadius = `${this.borderRadius}px`;
+					style.bottom = `${this.buttonPadding}px`;
+					style.height = uni.upx2px(this.height) - this.buttonPadding * 2 + 'px';
+					style.zIndex = 0;
+				}
+				return Object.assign(this.itemBgStyle, style);
+			}
+		},
+		mounted() {
+			this.listInfoFn();
+			setTimeout(() => {
+				this.getTabsInfo();
+			}, 10);
+		},
+		methods: {
+			listInfoFn() {
+				let {
+					list = []
+				} = this;
+				this.listInfo = this.list.map((val, index) => {
+					if (typeof val != 'object') {
+						let obj = {
+							width: 0,
+							name: val,
+						};
+						return obj;
+					} else {
+						return val;
+					}
+				});
+				return this.listInfo;
+			},
+			// 改变滑块的样式
+			changeSectionStatus(nVal) {
+				if (this.mode == 'subsection') {
+					// 根据滑块在最左边和最右边时，显示左边和右边的圆角
+					if (nVal == this.list.length - 1) {
+						this.itemBgStyle.borderRadius = `0 ${this.buttonPadding}px ${this.buttonPadding}px 0`;
+					}
+					if (nVal == 0) {
+						this.itemBgStyle.borderRadius = `${this.buttonPadding}px 0 0 ${this.buttonPadding}px`;
+					}
+					if (nVal > 0 && nVal < this.list.length - 1) {
+						this.itemBgStyle.borderRadius = '0';
+					}
+				}
+				// 更新滑块的位置
+				setTimeout(() => {
+					this.itemBgLeft();
+				}, 10);
+				if (this.vibrateShort && !this.firstTimeVibrateShort) {
+					// 使手机产生短促震动，微信小程序有效，APP(HX 2.6.8)和H5无效
+					// #ifndef H5
+					uni.vibrateShort();
+					// #endif
+				}
+				// 第一次过后，设置firstTimeVibrateShort为false，让其下一次可以震动(如果允许震动的话)
+				this.firstTimeVibrateShort = false;
+			},
+			click(index) {
+				// 不允许点击当前激活选项
+				if (index == this.currentIndex) return;
+				this.currentIndex = index;
+				this.changeSectionStatus(index);
+				this.$emit('change', Number(index));
+				this.$emit("input", Number(index));
+				this.$emit("update:modelValue", Number(index));
+			},
+			// 获取各个tab的节点信息
+			getTabsInfo() {
+				let view = uni.createSelectorQuery().in(this);
+				for (let i = 0; i < this.list.length; i++) {
+					view.select('.u-item-' + i).boundingClientRect();
+				}
+				view.exec(res => {
+					if (!res.length) {
+						setTimeout(() => {
+							this.getTabsInfo();
+							return;
+						}, 10);
+					}
+					// 将分段器每个item的宽度，放入listInfo数组
+					res.map((val, index) => {
+						this.listInfo[index].width = val.width;
+					});
+					// 初始化滑块的宽度
+					if (this.mode == 'subsection') {
+						this.itemBgStyle.width = this.listInfo[0].width + 'px';
+					} else if (this.mode == 'button') {
+						this.itemBgStyle.width = this.listInfo[0].width + 'px';
+					}
+					// 初始化滑块的位置
+					this.itemBgLeft();
+				});
+			},
+			itemBgLeft() {
+				// 根据是否开启动画效果，
+				if (this.animation) {
+					this.itemBgStyle.transition = 'all 0.35s';
+				} else {
+					this.itemBgStyle.transition = 'all 0s';
+				}
+				let left = 0;
+				// 计算当前活跃item到组件左边的距离
+				this.listInfo.map((val, index) => {
+					if (index < this.currentIndex) left += val.width;
+				});
+				// 根据mode不同模式，计算滑块需要移动的距离
+				if (this.mode == 'subsection') {
+					this.itemBgStyle.left = left + 'px';
+				} else if (this.mode == 'button') {
+					this.itemBgStyle.left = left + this.buttonPadding + 'px';
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-subsection {
+		@include vue-flex;
+		align-items: center;
+		overflow: hidden;
+		position: relative;
+	}
+
+	.u-item {
+		flex: 1;
+		text-align: center;
+		font-size: 26rpx;
+		height: 100%;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		color: $u-main-color;
+		padding: 0 6rpx;
+		position: relative;
+	}
+
+	.u-item-bg {
+		background-color: $u-type-primary;
+		position: absolute;
+		z-index: -1;
+	}
+
+	.u-none-border-right {
+		border-right: none !important;
+	}
+
+	.u-item-first {
+		border-top-left-radius: 8rpx;
+		border-bottom-left-radius: 8rpx;
+	}
+
+	.u-item-last {
+		border-top-right-radius: 8rpx;
+		border-bottom-right-radius: 8rpx;
+	}
+
+	.u-item-text {
+		transition: all 0.35s;
+		color: $u-main-color;
+		@include vue-flex;
+		align-items: center;
+		position: relative;
+		z-index: 3;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-swipe-action/u-swipe-action.vue b/uni_modules/vk-uview-ui/components/u-swipe-action/u-swipe-action.vue
new file mode 100644
index 0000000..761af39
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-swipe-action/u-swipe-action.vue
@@ -0,0 +1,256 @@
+<template>
+	<view class="">
+		<movable-area class="u-swipe-action" :style="{ backgroundColor: bgColor }">
+			<movable-view
+				class="u-swipe-view"
+				@change="change"
+				@touchend="touchend"
+				@touchstart="touchstart"
+				direction="horizontal"
+				:disabled="disabled"
+				:x="moveX"
+				:style="{
+					width: movableViewWidth ? movableViewWidth : '100%'
+				}"
+			>
+				<view
+					class="u-swipe-content"
+					@tap.stop="contentClick"
+				>
+					<slot></slot>
+				</view>
+				<view class="u-swipe-del" v-if="showBtn" @tap.stop="btnClick(index)" :style="[btnStyle(item.style)]" v-for="(item, index) in options" :key="index">
+					<view class="u-btn-text">{{ item.text }}</view>
+				</view>
+			</movable-view>
+		</movable-area>
+	</view>
+</template>
+
+<script>
+/**
+ * swipeAction 左滑单元格
+ * @description 该组件一般用于左滑唤出操作菜单的场景，用的最多的是左滑删除操作。
+ * @tutorial https://www.uviewui.com/components/swipeAction.html
+ * @property {String} bg-color 整个组件背景颜色（默认#ffffff）
+ * @property {Array} options 数组形式，可以配置背景颜色和文字
+ * @property {String Number} index 标识符，点击时候用于区分点击了哪一个，用v-for循环时的index即可
+ * @property {String Number} btn-width 按钮宽度，单位rpx（默认180）
+ * @property {Boolean} disabled 是否禁止某个swipeAction滑动（默认false）
+ * @property {Boolean} show 打开或者关闭某个组件（默认false）
+ * @event {Function} click 点击组件时触发
+ * @event {Function} close 组件触发关闭状态时
+ * @event {Function} content-click 点击内容时触发
+ * @event {Function} open 组件触发打开状态时
+ * @example <u-swipe-action btn-text="收藏">...</u-swipe-action>
+ */
+export default {
+	name: 'u-swipe-action',
+  emits: ["click", "content-click", "open", "close"],
+	props: {
+		// index值，用于得知点击删除的是哪个按钮
+		index: {
+			type: [Number, String],
+			default: ''
+		},
+		// 滑动按钮的宽度，单位为rpx
+		btnWidth: {
+			type: [String, Number],
+			default: 180
+		},
+		// 是否禁止某个action滑动
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 打开或者关闭组件
+		show: {
+			type: Boolean,
+			default: false
+		},
+		// 组件背景颜色
+		bgColor: {
+			type: String,
+			default: '#ffffff'
+		},
+		// 是否使手机发生短促震动，目前只在iOS的微信小程序有效(2020-05-06)
+		vibrateShort: {
+			type: Boolean,
+			default: false
+		},
+		// 按钮操作参数
+		options: {
+			type: Array,
+			default() {
+				return [];
+			}
+		}
+	},
+	watch: {
+		show: {
+			immediate: true,
+			handler(nVal, oVal) {
+				if (nVal) {
+					this.open();
+				} else {
+					this.close();
+				}
+			}
+		}
+	},
+	data() {
+		return {
+			moveX: 0, // movable-view元素在x轴上需要移动的目标移动距离，用于展开或收起滑动的按钮
+			scrollX: 0, // movable-view移动过程中产生的change事件中的x轴移动值
+			status: false, // 滑动的状态，表示当前是展开还是关闭按钮的状态
+			movableAreaWidth: 0, // 滑动区域
+			elId: this.$u.guid(), // id，用于通知另外组件关闭时的识别
+			showBtn: false, // 刚开始渲染视图时不显示右边的按钮，避免视图闪动
+		};
+	},
+	computed: {
+		movableViewWidth() {
+			return this.movableAreaWidth + this.allBtnWidth + 'px';
+		},
+		innerBtnWidth() {
+			return uni.upx2px(this.btnWidth);
+		},
+		allBtnWidth() {
+			return uni.upx2px(this.btnWidth) * this.options.length;
+		},
+		btnStyle() {
+			return style => {
+				let css = {};
+				style.width = this.btnWidth + 'rpx';
+				return style;
+			};
+		}
+	},
+	mounted() {
+		this.getActionRect();
+	},
+	methods: {
+		// 点击按钮
+		btnClick(index) {
+			this.status = false;
+			// this.index为点击的几个组件，index为点击某个组件的第几个按钮(options数组的索引)
+			this.$emit('click', this.index, index);
+		},
+		// movable-view元素移动事件
+		change(e) {
+			this.scrollX = e.detail.x;
+		},
+		// 关闭按钮状态
+		close() {
+			this.moveX = 0;
+			this.status = false;
+		},
+		// 打开按钮的状态
+		open() {
+			if (this.disabled) return;
+			this.moveX = -this.allBtnWidth;
+			this.status = true;
+		},
+		// 用户手指离开movable-view元素，停止触摸
+		touchend() {
+			this.moveX = this.scrollX;
+			// 停止触摸时候，判断当前是展开还是关闭状态
+			// 关闭状态
+			// 这一步很重要，需要先给this.moveX一个变化的随机值，否则因为前后设置的为同一个值
+			// props单向数据流的原因，导致movable-view元素不会发生变化，切记，详见文档：
+			// https://uniapp.dcloud.io/use?id=%e5%b8%b8%e8%a7%81%e9%97%ae%e9%a2%98
+			this.$nextTick(function() {
+				if (this.status == false) {
+					// 关闭状态左滑，产生的x轴位移为负值，也就是说滑动的距离大于按钮的四分之一宽度，自动展开按钮
+					if (this.scrollX <= -this.allBtnWidth / 4) {
+						this.moveX = -this.allBtnWidth; // 按钮宽度的负值，即为展开状态movable-view元素左滑的距离
+						this.status = true; // 标志当前为展开状态
+						this.emitOpenEvent();
+						// 产生震动效果
+						if (this.vibrateShort) uni.vibrateShort();
+					} else {
+						this.moveX = 0; // 如果距离没有按钮宽度的四分之一，自动收起
+						this.status = false;
+						this.emitCloseEvent();
+					}
+				} else {
+					// 如果在打开的状态下，右滑动的距离X轴偏移超过按钮的四分之一(负值反过来的四分之三)，自动收起按钮
+					if (this.scrollX > (-this.allBtnWidth * 3) / 4) {
+						this.moveX = 0;
+						this.$nextTick(() => {
+							this.moveX = 101;
+						});
+						this.status = false;
+						this.emitCloseEvent();
+					} else {
+						this.moveX = -this.allBtnWidth;
+						this.status = true;
+						this.emitOpenEvent();
+					}
+				}
+			});
+		},
+		emitOpenEvent() {
+			this.$emit('open', this.index);
+		},
+		emitCloseEvent() {
+			this.$emit('close', this.index);
+		},
+		// 开始触摸
+		touchstart() {},
+		getActionRect() {
+			this.$uGetRect('.u-swipe-action').then(res => {
+				this.movableAreaWidth = res.width;
+				// 等视图更新完后，再显示右边的可滑动按钮，防止这些按钮会"闪一下"
+				this.$nextTick(() => {
+					this.showBtn = true;
+				})
+			});
+		},
+		// 点击内容触发事件
+		contentClick() {
+			// 点击内容时，如果当前为打开状态，收起组件
+			if (this.status == true) {
+				this.status = 'close';
+				this.moveX = 0;
+			}
+			this.$emit('content-click', this.index);
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../libs/css/style.components.scss";
+	
+.u-swipe-action {
+	width: auto;
+	height: initial;
+	position: relative;
+	overflow: hidden;
+}
+
+.u-swipe-view {
+	@include vue-flex;
+	height: initial;
+	position: relative;
+	/* 这一句很关键，覆盖默认的绝对定位 */
+}
+
+.u-swipe-content {
+	flex: 1;
+}
+
+.u-swipe-del {
+	position: relative;
+	font-size: 30rpx;
+	color: #ffffff;
+}
+
+.u-btn-text {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-swiper/u-swiper.vue b/uni_modules/vk-uview-ui/components/u-swiper/u-swiper.vue
new file mode 100644
index 0000000..95e00d7
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-swiper/u-swiper.vue
@@ -0,0 +1,341 @@
+<template>
+	<view class="u-swiper-wrap" :style="{
+		borderRadius: `${borderRadius}rpx`
+	}">
+		<swiper :current="elCurrent" @change="change" @animationfinish="animationfinish" :interval="interval" :circular="circular" :duration="duration" :autoplay="autoplay"
+		 :previous-margin="effect3d ? effect3dPreviousMargin + 'rpx' : '0'" :next-margin="effect3d ? effect3dPreviousMargin + 'rpx' : '0'"
+		 :style="{
+				height: height + 'rpx',
+				backgroundColor: bgColor
+			}">
+			<swiper-item class="u-swiper-item" v-for="(item, index) in list" :key="index">
+				<view class="u-list-image-wrap" @tap.stop.prevent="listClick(index)" :class="[uCurrent != index ? 'u-list-scale' : '']" :style="{
+						borderRadius: `${borderRadius}rpx`,
+						transform: effect3d && uCurrent != index ? 'scaleY(0.9)' : 'scaleY(1)',
+						margin: effect3d && uCurrent != index ? '0 20rpx' : 0,
+					}">
+					<image class="u-swiper-image" :src="item[name] || item" :mode="imgMode"></image>
+					<view v-if="title && item.title" class="u-swiper-title u-line-1" :style="[{
+							'padding-bottom': titlePaddingBottom
+						}, titleStyle]">
+						{{ item.title }}
+					</view>
+				</view>
+			</swiper-item>
+		</swiper>
+		<view class="u-swiper-indicator" :style="{
+				top: indicatorPos == 'topLeft' || indicatorPos == 'topCenter' || indicatorPos == 'topRight' ? '12rpx' : 'auto',
+				bottom: indicatorPos == 'bottomLeft' || indicatorPos == 'bottomCenter' || indicatorPos == 'bottomRight' ? '12rpx' : 'auto',
+				justifyContent: justifyContent,
+				padding: `0 ${effect3d ? '74rpx' : '24rpx'}`
+			}">
+			<block v-if="mode == 'rect'">
+				<view class="u-indicator-item-rect" :class="{ 'u-indicator-item-rect-active': index == uCurrent }" v-for="(item, index) in list"
+				 :key="index"></view>
+			</block>
+			<block v-if="mode == 'dot'">
+				<view class="u-indicator-item-dot" :class="{ 'u-indicator-item-dot-active': index == uCurrent }" v-for="(item, index) in list"
+				 :key="index"></view>
+			</block>
+			<block v-if="mode == 'round'">
+				<view class="u-indicator-item-round" :class="{ 'u-indicator-item-round-active': index == uCurrent }" v-for="(item, index) in list"
+				 :key="index"></view>
+			</block>
+			<block v-if="mode == 'number'">
+				<view class="u-indicator-item-number">{{ uCurrent + 1 }}/{{ list.length }}</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * swiper 轮播图
+	 * @description 该组件一般用于导航轮播，广告展示等场景,可开箱即用
+	 * @tutorial https://www.uviewui.com/components/swiper.html
+	 * @property {Array} list 轮播图数据，见官网"基本使用"说明
+	 * @property {Boolean} title 是否显示标题文字，需要配合list参数，见官网说明（默认false）
+	 * @property {String} mode 指示器模式，见官网说明（默认round）
+	 * @property {String Number} height 轮播图组件高度，单位rpx（默认250）
+	 * @property {String} indicator-pos 指示器的位置（默认bottomCenter）
+	 * @property {Boolean} effect3d 是否开启3D效果（默认false）
+	 * @property {Boolean} autoplay 是否自动播放（默认true）
+	 * @property {String Number} interval 自动轮播时间间隔，单位ms（默认2500）
+	 * @property {Boolean} circular 是否衔接播放，见官网说明（默认true）
+	 * @property {String} bg-color 背景颜色（默认#f3f4f6）
+	 * @property {String Number} border-radius 轮播图圆角值，单位rpx（默认8）
+	 * @property {Object} title-style 自定义标题样式
+	 * @property {String Number} effect3d-previous-margin mode = true模式的情况下，激活项与前后项之间的距离，单位rpx（默认50）
+	 * @property {String} img-mode 图片的裁剪模式，详见image组件裁剪模式（默认aspectFill）
+	 * @event {Function} click 点击轮播图时触发
+	 * @example <u-swiper :list="list" mode="dot" indicator-pos="bottomRight"></u-swiper>
+	 */
+	export default {
+		name: "u-swiper",
+    emits: ["click", "change"],
+		props: {
+			// 轮播图的数据,格式如：[{image: 'xxxx', title: 'xxxx'}，{image: 'yyyy', title: 'yyyy'}]，其中title字段可选
+			list: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			// 是否显示title标题
+			title: {
+				type: Boolean,
+				default: false
+			},
+			// 用户自定义的指示器的样式
+			indicator: {
+				type: Object,
+				default () {
+					return {};
+				}
+			},
+			// 圆角值
+			borderRadius: {
+				type: [Number, String],
+				default: 8
+			},
+			// 隔多久自动切换
+			interval: {
+				type: [String, Number],
+				default: 3000
+			},
+			// 指示器的模式，rect|dot|number|round
+			mode: {
+				type: String,
+				default: 'round'
+			},
+			// list的高度，单位rpx
+			height: {
+				type: [Number, String],
+				default: 250
+			},
+			// 指示器的位置，topLeft|topCenter|topRight|bottomLeft|bottomCenter|bottomRight
+			indicatorPos: {
+				type: String,
+				default: 'bottomCenter'
+			},
+			// 是否开启缩放效果
+			effect3d: {
+				type: Boolean,
+				default: false
+			},
+			// 3D模式的情况下，激活item与前后item之间的距离，单位rpx
+			effect3dPreviousMargin: {
+				type: [Number, String],
+				default: 50
+			},
+			// 是否自动播放
+			autoplay: {
+				type: Boolean,
+				default: true
+			},
+			// 自动轮播时间间隔，单位ms
+			duration: {
+				type: [Number, String],
+				default: 500
+			},
+			// 是否衔接滑动，即到最后一张时接着滑动，是否自动切换到第一张
+			circular: {
+				type: Boolean,
+				default: true
+			},
+			// 图片的裁剪模式 
+			imgMode: {
+				type: String,
+				default: 'aspectFill'
+			},
+			// 从list数组中读取的图片的属性名
+			name: {
+				type: String,
+				default: 'image'
+			},
+			// 背景颜色
+			bgColor: {
+				type: String,
+				default: '#f3f4f6'
+			},
+			// 初始化时，默认显示第几项
+			current: {
+				type: [Number, String],
+				default: 0
+			},
+			// 标题的样式，对象形式
+			titleStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			}
+		},
+		watch: {
+			// 如果外部的list发生变化，判断长度是否被修改，如果前后长度不一致，重置uCurrent值，避免溢出
+			list(nVal, oVal) {
+				if(nVal.length !== oVal.length) this.uCurrent = 0;
+			},
+			// 监听外部current的变化，实时修改内部依赖于此测uCurrent值，如果更新了current，而不是更新uCurrent，
+			// 就会错乱，因为指示器是依赖于uCurrent的
+			current(n) {
+				this.uCurrent = n;
+			}
+		},
+		data() {
+			return {
+				uCurrent: this.current // 当前活跃的swiper-item的index
+			};
+		},
+		computed: {
+			justifyContent() {
+				if (this.indicatorPos == 'topLeft' || this.indicatorPos == 'bottomLeft') return 'flex-start';
+				if (this.indicatorPos == 'topCenter' || this.indicatorPos == 'bottomCenter') return 'center';
+				if (this.indicatorPos == 'topRight' || this.indicatorPos == 'bottomRight') return 'flex-end';
+			},
+			titlePaddingBottom() {
+				let tmp = 0;
+				if (this.mode == 'none') return '12rpx';
+				if (['bottomLeft', 'bottomCenter', 'bottomRight'].indexOf(this.indicatorPos) >= 0 && this.mode == 'number') {
+					tmp = '60rpx';
+				} else if (['bottomLeft', 'bottomCenter', 'bottomRight'].indexOf(this.indicatorPos) >= 0 && this.mode != 'number') {
+					tmp = '40rpx';
+				} else {
+					tmp = '12rpx';
+				}
+				return tmp;
+			},
+			// 因为uni的swiper组件的current参数只接受Number类型，这里做一个转换
+			elCurrent() {
+				return Number(this.current);
+			}
+		},
+		methods: {
+			listClick(index) {
+				this.$emit('click', index);
+			},
+			change(e) {
+				let current = e.detail.current;
+				this.uCurrent = current;
+				// 发出change事件，表示当前自动切换的index，从0开始
+				this.$emit('change', current);
+			},
+			// 头条小程序不支持animationfinish事件，改由change事件
+			// 暂不监听此事件，因为不再给swiper绑定uCurrent属性
+			animationfinish(e) {
+				// #ifndef MP-TOUTIAO
+				// this.uCurrent = e.detail.current;
+				// #endif
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-swiper-wrap {
+		position: relative;
+		overflow: hidden;
+		transform: translateY(0);
+	}
+
+	.u-swiper-image {
+		width: 100%;
+		will-change: transform;
+		height: 100%;
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		/* #ifdef H5 */
+		pointer-events: none;
+		/* #endif */
+	}
+
+	.u-swiper-indicator {
+		padding: 0 24rpx;
+		position: absolute;
+		@include vue-flex;
+		width: 100%;
+		z-index: 1;
+	}
+
+	.u-indicator-item-rect {
+		width: 26rpx;
+		height: 8rpx;
+		margin: 0 6rpx;
+		transition: all 0.5s;
+		background-color: rgba(0, 0, 0, 0.3);
+	}
+
+	.u-indicator-item-rect-active {
+		background-color: rgba(255, 255, 255, 0.8);
+	}
+
+	.u-indicator-item-dot {
+		width: 14rpx;
+		height: 14rpx;
+		margin: 0 6rpx;
+		border-radius: 20rpx;
+		transition: all 0.5s;
+		background-color: rgba(0, 0, 0, 0.3);
+	}
+
+	.u-indicator-item-dot-active {
+		background-color: rgba(255, 255, 255, 0.8);
+	}
+
+	.u-indicator-item-round {
+		width: 14rpx;
+		height: 14rpx;
+		margin: 0 6rpx;
+		border-radius: 20rpx;
+		transition: all 0.5s;
+		background-color: rgba(0, 0, 0, 0.3);
+	}
+
+	.u-indicator-item-round-active {
+		width: 34rpx;
+		background-color: rgba(255, 255, 255, 0.8);
+	}
+
+	.u-indicator-item-number {
+		padding: 6rpx 16rpx;
+		line-height: 1;
+		background-color: rgba(0, 0, 0, 0.3);
+		border-radius: 100rpx;
+		font-size: 26rpx;
+		color: rgba(255, 255, 255, 0.8);
+	}
+
+	.u-list-scale {
+		transform-origin: center center;
+	}
+
+	.u-list-image-wrap {
+		width: 100%;
+		height: 100%;
+		flex: 1;
+		transition: all 0.5s;
+		overflow: hidden;
+		box-sizing: content-box;
+		position: relative;
+	}
+
+	.u-swiper-title {
+		position: absolute;
+		background-color: rgba(0, 0, 0, 0.3);
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		font-size: 28rpx;
+		padding: 12rpx 24rpx;
+		color: rgba(255, 255, 255, 0.9);
+	}
+
+	.u-swiper-item {
+		@include vue-flex;
+		overflow: hidden;
+		align-items: center;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-switch/u-switch.vue b/uni_modules/vk-uview-ui/components/u-switch/u-switch.vue
new file mode 100644
index 0000000..4f16f83
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-switch/u-switch.vue
@@ -0,0 +1,191 @@
+<template>
+	<view
+		class="u-switch"
+		:class="[valueCom == true ? 'u-switch--on' : '', disabled ? 'u-switch--disabled' : '']"
+		@tap="onClick"
+		:style="[switchStyle]"
+	>
+		<view
+			class="u-switch__node node-class"
+			:style="{
+				width: $u.addUnit(size),
+				height: $u.addUnit(size)
+			}"
+		>
+			<u-loading
+				:show="loading"
+				class="u-switch__loading"
+				:size="size * 0.6"
+				:color="loadingColor"
+			/>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * switch 开关选择器
+ * @description 选择开关一般用于只有两个选择，且只能选其一的场景。
+ * @tutorial https://www.uviewui.com/components/switch.html
+ * @property {Boolean} loading 是否处于加载中（默认false）
+ * @property {Boolean} disabled 是否禁用（默认false）
+ * @property {String Number} size 开关尺寸，单位rpx（默认50）
+ * @property {String} active-color 打开时的背景色（默认#2979ff）
+ * @property {Boolean} inactive-color 关闭时的背景色（默认#ffffff）
+ * @property {Boolean | Number | String} active-value 打开选择器时通过change事件发出的值（默认true）
+ * @property {Boolean | Number | String} inactive-value 关闭选择器时通过change事件发出的值（默认false）
+ * @event {Function} change 在switch打开或关闭时触发
+ * @example <u-switch v-model="checked" active-color="red" inactive-color="#eee"></u-switch>
+ */
+export default {
+	name: "u-switch",
+	emits: ["update:modelValue", "input", "change"],
+	props: {
+		// 通过v-model双向绑定的值
+		value: {
+			type: Boolean,
+			default: false
+		},
+		modelValue: {
+			type: Boolean,
+			default: false
+		},
+		// 是否为加载中状态
+		loading: {
+			type: Boolean,
+			default: false
+		},
+		// 是否为禁用装填
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 开关尺寸，单位rpx
+		size: {
+			type: [Number, String],
+			default: 50
+		},
+		// 打开时的背景颜色
+		activeColor: {
+			type: String,
+			default: "#2979ff"
+		},
+		// 关闭时的背景颜色
+		inactiveColor: {
+			type: String,
+			default: "#ffffff"
+		},
+		// 是否使手机发生短促震动，目前只在iOS的微信小程序有效(2020-05-06)
+		vibrateShort: {
+			type: Boolean,
+			default: false
+		},
+		// 打开选择器时的值
+		activeValue: {
+			type: [Number, String, Boolean],
+			default: true
+		},
+		// 关闭选择器时的值
+		inactiveValue: {
+			type: [Number, String, Boolean],
+			default: false
+		}
+	},
+	data() {
+		return {};
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		switchStyle() {
+			let style = {};
+			style.fontSize = this.size + "rpx";
+			style.backgroundColor = this.valueCom ? this.activeColor : this.inactiveColor;
+			return style;
+		},
+		loadingColor() {
+			return this.valueCom ? this.activeColor : null;
+		}
+	},
+	methods: {
+		onClick() {
+			if (!this.disabled && !this.loading) {
+				// 使手机产生短促震动，微信小程序有效，APP(HX 2.6.8)和H5无效
+				if (this.vibrateShort) uni.vibrateShort();
+				this.$emit("input", !this.valueCom);
+				this.$emit("update:modelValue", !this.valueCom);
+				// 放到下一个生命周期，因为双向绑定的value修改父组件状态需要时间，且是异步的
+				this.$nextTick(() => {
+					this.$emit("change", this.valueCom ? this.activeValue : this.inactiveValue);
+				});
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-switch {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: inline-block;
+	/* #endif */
+	box-sizing: initial;
+	width: 2em;
+	height: 1em;
+	background-color: #fff;
+	border: 1px solid rgba(0, 0, 0, 0.1);
+	border-radius: 1em;
+	transition: background-color 0.3s;
+	font-size: 50rpx;
+}
+
+.u-switch__node {
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+	position: absolute;
+	top: 0;
+	left: 0;
+	border-radius: 100%;
+	z-index: 1;
+	background-color: #fff;
+	background-color: #fff;
+	box-shadow: 0 3px 1px 0 rgba(0, 0, 0, 0.05), 0 2px 2px 0 rgba(0, 0, 0, 0.1),
+		0 3px 3px 0 rgba(0, 0, 0, 0.05);
+	box-shadow: 0 3px 1px 0 rgba(0, 0, 0, 0.05), 0 2px 2px 0 rgba(0, 0, 0, 0.1),
+		0 3px 3px 0 rgba(0, 0, 0, 0.05);
+	transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05);
+	transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05),
+		-webkit-transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05);
+	transition: transform cubic-bezier(0.3, 1.05, 0.4, 1.05);
+	transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05);
+}
+
+.u-switch__loading {
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.u-switch--on {
+	background-color: #1989fa;
+}
+
+.u-switch--on .u-switch__node {
+	transform: translateX(100%);
+}
+
+.u-switch--disabled {
+	opacity: 0.4;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-tabbar/u-tabbar.vue b/uni_modules/vk-uview-ui/components/u-tabbar/u-tabbar.vue
new file mode 100644
index 0000000..121df51
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-tabbar/u-tabbar.vue
@@ -0,0 +1,373 @@
+<template>
+	<view v-if="show" class="u-tabbar" @touchmove.stop.prevent="() => {}">
+		<view
+			class="u-tabbar__content safe-area-inset-bottom"
+			:style="{
+				height: $u.addUnit(height),
+				backgroundColor: bgColor
+			}"
+			:class="{
+				'u-border-top': borderTop
+			}"
+		>
+			<view
+				class="u-tabbar__content__item"
+				v-for="(item, index) in list"
+				:key="index"
+				:class="{
+					'u-tabbar__content__circle': midButton && item.midButton
+				}"
+				@tap.stop="clickHandler(index)"
+				:style="{
+					backgroundColor: bgColor
+				}"
+			>
+				<view
+					:class="[
+						midButton && item.midButton
+							? 'u-tabbar__content__circle__button'
+							: 'u-tabbar__content__item__button'
+					]"
+				>
+					<u-icon
+						:size="midButton && item.midButton ? midButtonSize : iconSize"
+						:name="elIconPath(index)"
+						img-mode="scaleToFill"
+						:color="elColor(index)"
+						:custom-prefix="item.customIcon ? 'custom-icon' : 'uicon'"
+					></u-icon>
+					<u-badge
+						:count="item.count"
+						:is-dot="item.isDot"
+						v-if="item.count"
+						:offset="[-2, getOffsetRight(item.count, item.isDot)]"
+					></u-badge>
+				</view>
+				<view
+					class="u-tabbar__content__item__text"
+					:style="{
+						color: elColor(index)
+					}"
+				>
+					<text class="u-line-1">{{ item.text }}</text>
+				</view>
+			</view>
+			<view
+				v-if="midButton"
+				class="u-tabbar__content__circle__border"
+				:class="{
+					'u-border': borderTop
+				}"
+				:style="{
+					backgroundColor: bgColor,
+					left: midButtonLeft
+				}"
+			></view>
+		</view>
+		<!-- 这里加上一个48rpx的高度,是为了增高有凸起按钮时的防塌陷高度(也即按钮凸出来部分的高度) -->
+		<view
+			class="u-fixed-placeholder safe-area-inset-bottom"
+			:style="{
+				height: `calc(${$u.addUnit(height)} + ${midButton ? 48 : 0}rpx)`
+			}"
+		></view>
+	</view>
+</template>
+
+<script>
+export default {
+	emits: ["update:modelValue", "input", "change"],
+	props: {
+		// 通过v-model绑定current值
+		value: {
+			type: [String, Number],
+			default: 0
+		},
+		modelValue: {
+			type: [String, Number],
+			default: 0
+		},
+		// 显示与否
+		show: {
+			type: Boolean,
+			default: true
+		},
+		// 整个tabbar的背景颜色
+		bgColor: {
+			type: String,
+			default: "#ffffff"
+		},
+		// tabbar的高度，默认50px，单位任意，如果为数值，则为rpx单位
+		height: {
+			type: [String, Number],
+			default: "50px"
+		},
+		// 非凸起图标的大小，单位任意，数值默认rpx
+		iconSize: {
+			type: [String, Number],
+			default: 40
+		},
+		// 凸起的图标的大小，单位任意，数值默认rpx
+		midButtonSize: {
+			type: [String, Number],
+			default: 90
+		},
+		// 激活时的演示，包括字体图标，提示文字等的演示
+		activeColor: {
+			type: String,
+			default: "#303133"
+		},
+		// 未激活时的颜色
+		inactiveColor: {
+			type: String,
+			default: "#606266"
+		},
+		// 是否显示中部的凸起按钮
+		midButton: {
+			type: Boolean,
+			default: false
+		},
+		// 配置参数
+		list: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 切换前的回调
+		beforeSwitch: {
+			type: Function,
+			default: null
+		},
+		// 是否显示顶部的横线
+		borderTop: {
+			type: Boolean,
+			default: true
+		},
+		// 是否隐藏原生tabbar
+		hideTabBar: {
+			type: Boolean,
+			default: true
+		}
+	},
+	data() {
+		return {
+			// 由于安卓太菜了，通过css居中凸起按钮的外层元素有误差，故通过js计算将其居中
+			midButtonLeft: "50%",
+			pageUrl: "" // 当前页面URL
+		};
+	},
+	created() {
+		// 是否隐藏原生tabbar
+		if (this.hideTabBar) uni.hideTabBar();
+		// 获取引入了u-tabbar页面的路由地址，该地址没有路径前面的"/"
+		let pages = getCurrentPages();
+		// 页面栈中的最后一个即为项为当前页面，route属性为页面路径
+		this.pageUrl = pages[pages.length - 1].route;
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		elIconPath() {
+			return index => {
+				// 历遍u-tabbar的每一项item时，判断是否传入了pagePath参数，如果传入了
+				// 和data中的pageUrl参数对比，如果相等，即可判断当前的item对应当前的tabbar页面，设置高亮图标
+				// 采用这个方法，可以无需使用v-model绑定的value值
+				let pagePath = this.list[index].pagePath;
+				// 如果定义了pagePath属性，意味着使用系统自带tabbar方案，否则使用一个页面用几个组件模拟tabbar页面的方案
+				// 这两个方案对处理tabbar item的激活与否方式不一样
+				if (pagePath) {
+					if (pagePath == this.pageUrl || pagePath == "/" + this.pageUrl) {
+						return this.list[index].selectedIconPath;
+					} else {
+						return this.list[index].iconPath;
+					}
+				} else {
+					// 普通方案中，索引等于v-model值时，即为激活项
+					return index == this.valueCom
+						? this.list[index].selectedIconPath
+						: this.list[index].iconPath;
+				}
+			};
+		},
+		elColor() {
+			return index => {
+				// 判断方法同理于elIconPath
+				let pagePath = this.list[index].pagePath;
+				if (pagePath) {
+					if (pagePath == this.pageUrl || pagePath == "/" + this.pageUrl) return this.activeColor;
+					else return this.inactiveColor;
+				} else {
+					return index == this.valueCom ? this.activeColor : this.inactiveColor;
+				}
+			};
+		}
+	},
+	mounted() {
+		this.midButton && this.getMidButtonLeft();
+	},
+	methods: {
+		async clickHandler(index) {
+			if (this.beforeSwitch && typeof this.beforeSwitch === "function") {
+				// 执行回调，同时传入索引当作参数
+				// 在微信，支付宝等环境(H5正常)，会导致父组件定义的customBack()函数体中的this变成子组件的this
+				// 通过bind()方法，绑定父组件的this，让this.customBack()的this为父组件的上下文
+				let beforeSwitch = this.beforeSwitch.bind(this.$u.$parent.call(this))(index);
+				// 判断是否返回了promise
+				if (!!beforeSwitch && typeof beforeSwitch.then === "function") {
+					await beforeSwitch
+						.then(res => {
+							// promise返回成功，
+							this.switchTab(index);
+						})
+						.catch(err => {});
+				} else if (beforeSwitch === true) {
+					// 如果返回true
+					this.switchTab(index);
+				}
+			} else {
+				this.switchTab(index);
+			}
+		},
+		// 切换tab
+		switchTab(index) {
+			// 发出事件和修改v-model绑定的值
+			this.$emit("change", index);
+			// 如果有配置pagePath属性，使用uni.switchTab进行跳转
+			if (this.list[index].pagePath) {
+				uni.switchTab({
+					url: this.list[index].pagePath
+				});
+			} else {
+				// 如果配置了papgePath属性，将不会双向绑定v-model传入的value值
+				// 因为这个模式下，不再需要v-model绑定的value值了，而是通过getCurrentPages()适配
+				this.$emit("input", index);
+				this.$emit("update:modelValue", index);
+			}
+		},
+		// 计算角标的right值
+		getOffsetRight(count, isDot) {
+			// 点类型，count大于9(两位数)，分别设置不同的right值，避免位置太挤
+			if (isDot) {
+				return -20;
+			} else if (count > 9) {
+				return -40;
+			} else {
+				return -30;
+			}
+		},
+		// 获取凸起按钮外层元素的left值，让其水平居中
+		getMidButtonLeft() {
+			let windowWidth = this.$u.sys().windowWidth;
+			// 由于安卓中css计算left: 50%的结果不准确，故用js计算
+			this.midButtonLeft = windowWidth / 2 + "px";
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../libs/css/style.components.scss";
+.u-fixed-placeholder {
+	/* #ifndef APP-NVUE */
+	box-sizing: content-box;
+	/* #endif */
+}
+
+.u-tabbar {
+	&__content {
+		@include vue-flex;
+		align-items: center;
+		position: relative;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		z-index: 998;
+		/* #ifndef APP-NVUE */
+		box-sizing: content-box;
+		/* #endif */
+
+		&__circle__border {
+			border-radius: 100%;
+			width: 110rpx;
+			height: 110rpx;
+			top: -48rpx;
+			position: absolute;
+			z-index: 4;
+			background-color: #ffffff;
+			// 由于安卓的无能，导致只有3个tabbar item时，此css计算方式有误差
+			// 故使用js计算的形式来定位，此处不注释，是因为js计算有延后，避免出现位置闪动
+			left: 50%;
+			transform: translateX(-50%);
+
+			&:after {
+				border-radius: 100px;
+			}
+		}
+
+		&__item {
+			flex: 1;
+			justify-content: center;
+			height: 100%;
+			padding: 12rpx 0;
+			@include vue-flex;
+			flex-direction: column;
+			align-items: center;
+			position: relative;
+
+			&__button {
+				position: absolute;
+				top: 14rpx;
+				left: 50%;
+				transform: translateX(-50%);
+			}
+
+			&__text {
+				color: $u-content-color;
+				font-size: 26rpx;
+				line-height: 28rpx;
+				position: absolute;
+				bottom: 14rpx;
+				left: 50%;
+				transform: translateX(-50%);
+				width: 100%;
+				text-align: center;
+			}
+		}
+
+		&__circle {
+			position: relative;
+			@include vue-flex;
+			flex-direction: column;
+			justify-content: space-between;
+			z-index: 10;
+			/* #ifndef APP-NVUE */
+			height: calc(100% - 1px);
+			/* #endif */
+
+			&__button {
+				width: 90rpx;
+				height: 90rpx;
+				border-radius: 100%;
+				@include vue-flex;
+				justify-content: center;
+				align-items: center;
+				position: absolute;
+				background-color: #ffffff;
+				top: -40rpx;
+				left: 50%;
+				z-index: 6;
+				transform: translateX(-50%);
+			}
+		}
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-table/u-table.vue b/uni_modules/vk-uview-ui/components/u-table/u-table.vue
new file mode 100644
index 0000000..2bf44f0
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-table/u-table.vue
@@ -0,0 +1,85 @@
+<template>
+	<view class="u-table" :style="[tableStyle]">
+		<slot />
+	</view>
+</template>
+
+<script>
+	/**
+	 * table 表格
+	 * @description 表格组件一般用于展示大量结构化数据的场景
+	 * @tutorial https://www.uviewui.com/components/table.html
+	 * @property {String} border-color 表格边框的颜色（默认#e4e7ed）
+	 * @property {String} bg-color 表格的背景颜色（默认#ffffff）
+	 * @property {String} align 单元格的内容对齐方式，作用类似css的text-align（默认center）
+	 * @property {String} padding 单元格的内边距，同css的padding写法（默认10rpx 0）
+	 * @property {String Number} font-size 单元格字体大小，单位rpx（默认28）
+	 * @property {String} color 单元格字体颜色（默认#606266）
+	 * @property {Object} th-style th单元格的样式，对象形式(将th所需参数放在table组件，是为了避免每一个th组件要写一遍）
+	 * @event {Function} click 点击组件时触发
+	 * @event {Function} close 点击关闭按钮时触发
+	 * @example <u-table></u-table>
+	 */
+	export default {
+		name: "u-table",
+    emits: ["click", "close"],
+		props: {
+			borderColor: {
+				type: String,
+				default: '#e4e7ed'
+			},
+			align: {
+				type: String,
+				default: 'center'
+			},
+			// td的内边距
+			padding: {
+				type: String,
+				default: '10rpx 6rpx'
+			},
+			// 字体大小
+			fontSize: {
+				type: [String, Number],
+				default: 28
+			},
+			// 字体颜色
+			color: {
+				type: String,
+				default: '#606266'
+			},
+			// th的自定义样式
+			thStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// table的背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			}
+		},
+		data() {
+			return {}
+		},
+		computed: {
+			tableStyle() {
+				let style = {};
+				style.borderLeft = `solid 1px ${this.borderColor}`;
+				style.borderTop = `solid 1px ${this.borderColor}`;
+				style.backgroundColor = this.bgColor;;
+				return style;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-table {
+		width: 100%;
+		box-sizing: border-box;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue b/uni_modules/vk-uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue
new file mode 100644
index 0000000..b3a35ff
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue
@@ -0,0 +1,489 @@
+<template>
+	<view class="u-tabs" :style="{
+			zIndex: zIndex,
+			background: bgColor
+		}">
+		<scroll-view scroll-x class="u-scroll-view" :scroll-left="scrollLeft" scroll-with-animation :style="{ zIndex: zIndex + 1 }">
+			<view class="u-tabs-scroll-box" :class="{'u-tabs-scroll-flex': !isScroll}">
+				<view class="u-tabs-item" :style="[tabItemStyle(index)]"
+				 v-for="(item, index) in getTabs" :key="index" :class="[preId + index]" @tap="emit(index)">
+					<u-badge :count="item[count] || item['count'] || 0" :offset="offset" size="mini"></u-badge>
+					{{ item[name] || item['name']}}
+				</view>
+				<view v-if="showBar" class="u-scroll-bar" :style="[tabBarStyle]"></view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import colorGradient from '../../libs/function/colorGradient';
+	let color = colorGradient;
+	const { windowWidth } = uni.getSystemInfoSync();
+	const preId = 'UEl_';
+
+	/**
+	 * tabsSwiper 全屏选项卡
+	 * @description 该组件内部实现主要依托于uniapp的scroll-view和swiper组件，主要特色是切换过程中，tabsSwiper文字的颜色可以渐变，底部滑块可以 跟随式滑动，活动tab滚动居中等。应用场景可以用于需要左右切换页面，比如商城的订单中心(待收货-待付款-待评价-已退货)等应用场景。
+	 * @tutorial https://www.uviewui.com/components/tabsSwiper.html
+	 * @property {Boolean} is-scroll tabs是否可以左右拖动（默认true）
+	 * @property {Array} list 标签数组，元素为对象，如[{name: '推荐'}]
+	 * @property {String Number} current 指定哪个tab为激活状态（默认0）
+	 * @property {String Number} height 导航栏的高度，单位rpx（默认80）
+	 * @property {String Number} font-size tab文字大小，单位rpx（默认30）
+	 * @property {String Number} swiper-width tabs组件外部swiper的宽度，默认为屏幕宽度，单位rpx（默认750）
+	 * @property {String} active-color 滑块和激活tab文字的颜色（默认#2979ff）
+	 * @property {String} inactive-color tabs文字颜色（默认#303133）
+	 * @property {String Number} bar-width 滑块宽度，单位rpx（默认40）
+	 * @property {String Number} bar-height 滑块高度，单位rpx（默认6）
+	 * @property {Object} bar-style 底部滑块的样式，对象形式
+	 * @property {Object} active-item-style 活动tabs item的样式，对象形式
+	 * @property {Boolean} show-bar 是否显示底部的滑块（默认true）
+	 * @property {String Number} gutter 单个tab标签的左右内边距之和，单位rpx（默认40）
+	 * @property {String} bg-color tabs导航栏的背景颜色（默认#ffffff）
+	 * @property {String} name 组件内部读取的list参数中的属性名，见官网说明（默认name）
+	 * @property {String} count 组件内部读取的list参数中的属性名（badge徽标数），同name属性的使用，见官网说明（默认count）
+	 * @property {Array} offset 设置badge徽标数的位置偏移，格式为 [x, y]，也即设置的为top和right的值，单位rpx（默认[5, 20]）
+	 * @property {Boolean} bold 激活选项的字体是否加粗（默认true）
+	 * @event {Function} change 点击标签时触发
+	 * @example <u-tabs-swiper ref="tabs" :list="list" :is-scroll="false"></u-tabs-swiper>
+	 */
+	export default {
+		name: "u-tabs-swiper",
+    emits: ["update:modelValue", "input", "change"],
+		props: {
+			// 导航菜单是否需要滚动，如只有2或者3个的时候，就不需要滚动了，此时使用flex平分tab的宽度
+			isScroll: {
+				type: Boolean,
+				default: true
+			},
+			//需循环的标签列表
+			list: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			// 当前活动tab的索引
+			current: {
+				type: [Number, String],
+				default: 0
+			},
+			// 导航栏的高度和行高，单位rpx
+			height: {
+				type: [Number, String],
+				default: 80
+			},
+			// 字体大小，单位rpx
+			fontSize: {
+				type: [Number, String],
+				default: 30
+			},
+			// 过渡动画时长, 单位s
+			// duration: {
+			// 	type: [Number, String],
+			// 	default: 0.5
+			// },
+			swiperWidth: {
+				//line3生效, 外部swiper的宽度, 单位rpx
+				type: [String, Number],
+				default: 750
+			},
+			// 选中项的主题颜色
+			activeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 未选中项的颜色
+			inactiveColor: {
+				type: String,
+				default: '#303133'
+			},
+			// 菜单底部移动的bar的宽度，单位rpx
+			barWidth: {
+				type: [Number, String],
+				default: 40
+			},
+			// 移动bar的高度
+			barHeight: {
+				type: [Number, String],
+				default: 6
+			},
+			// 单个tab的左或右内边距（各占一半），单位rpx
+			gutter: {
+				type: [Number, String],
+				default: 40
+			},
+			// 如果是绝对定位，添加z-index值
+			zIndex: {
+				type: [Number, String],
+				default: 1
+			},
+			// 导航栏的背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			//滚动至中心目标类型
+			autoCenterMode: {
+				type: String,
+				default: 'window'
+			},
+			// 读取传入的数组对象的属性(tab名称)
+			name: {
+				type: String,
+				default: 'name'
+			},
+			// 读取传入的数组对象的属性(徽标数)
+			count: {
+				type: String,
+				default: 'count'
+			},
+			// 徽标数位置偏移
+			offset: {
+				type: Array,
+				default: () => {
+					return [5, 20]
+				}
+			},
+			// 活动tab字体是否加粗
+			bold: {
+				type: Boolean,
+				default: true
+			},
+			// 当前活动tab item的样式
+			activeItemStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+			// 是否显示底部的滑块
+			showBar: {
+				type: Boolean,
+				default: true
+			},
+			// 底部滑块的自定义样式
+			barStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				scrollLeft: 0, // 滚动scroll-view的左边滚动距离
+				tabQueryInfo: [], // 存放对tab菜单查询后的节点信息
+				windowWidth: 0, // 屏幕宽度，单位为px
+				//scrollBarLeft: 0, // 移动bar需要通过translateX()移动的距离
+				animationFinishCurrent: this.current,
+				componentsWidth: 0,
+				line3AddDx: 0,
+				line3Dx: 0,
+				preId,
+				sW: 0,
+				tabsInfo: [],
+				colorGradientArr: [],
+				colorStep: 100 // 两个颜色之间的渐变等分
+			};
+		},
+		computed: {
+			// 获取当前活跃的current值
+			getCurrent() {
+				const current = Number(this.current);
+				// 判断是否超出边界
+				if (current > this.getTabs.length - 1) {
+					return this.getTabs.length - 1;
+				}
+				if (current < 0) return 0;
+				return current;
+			},
+			getTabs() {
+				return this.list;
+			},
+			// 滑块需要移动的距离
+			scrollBarLeft() {
+				return Number(this.line3Dx) + Number(this.line3AddDx);
+			},
+			// 滑块的宽度转为px单位
+			barWidthPx() {
+				return uni.upx2px(this.barWidth);
+			},
+			// tab的样式
+			tabItemStyle() {
+				return (index) => {
+					let style = {
+						height: this.height + 'rpx',
+						lineHeight: this.height + 'rpx',
+						padding: `0 ${this.gutter / 2}rpx`,
+						color: this.tabsInfo.length > 0 ? (this.tabsInfo[index] ? this.tabsInfo[index].color : this.activeColor) : this.inactiveColor,
+						fontSize: this.fontSize + 'rpx',
+						zIndex: this.zIndex + 2,
+						fontWeight: (index == this.getCurrent && this.bold) ? 'bold' : 'normal'
+					};
+					if(index == this.getCurrent) {
+						// 给选中的tab item添加外部自定义的样式
+						style = Object.assign(style, this.activeItemStyle);
+					}
+					return style;
+				}
+			},
+			// 底部滑块的样式
+			tabBarStyle() {
+				let style = {
+					width: this.barWidthPx + 'px',
+					height: this.barHeight + 'rpx',
+					borderRadius: '100px',
+					backgroundColor: this.activeColor,
+					left: this.scrollBarLeft + 'px'
+				};
+				return Object.assign(style, this.barStyle);
+			}
+		},
+		watch: {
+			current(n, o) {
+				this.change(n);
+				this.setFinishCurrent(n);
+			},
+			list() {
+				this.$nextTick(() => {
+					this.init();
+				})
+			}
+		},
+		mounted() {
+			this.init();
+		},
+		methods: {
+			async init() {
+				this.countPx();
+				await this.getTabsInfo();
+				this.countLine3Dx();
+				this.getQuery(() => {
+					this.setScrollViewToCenter();
+				});
+				// 颜色渐变过程数组
+				this.colorGradientArr = color.colorGradient(this.inactiveColor, this.activeColor, this.colorStep);
+			},
+			// 获取各个tab的节点信息
+			getTabsInfo() {
+				return new Promise((resolve, reject) => {
+					let view = uni.createSelectorQuery().in(this);
+					for (let i = 0; i < this.list.length; i++) {
+						view.select('.' + preId + i).boundingClientRect();
+					}
+					view.exec(res => {
+						const arr = [];
+						for (let i = 0; i < res.length; i++) {
+							// 给每个tab添加其文字颜色属性
+							res[i].color = this.inactiveColor;
+							// 当前tab直接赋予activeColor
+							if (i == this.getCurrent) res[i].color = this.activeColor;
+							arr.push(res[i]);
+						}
+						this.tabsInfo = arr;
+						resolve();
+					});
+				})
+			},
+			// 当swiper滑动结束，计算滑块最终要停留的位置
+			countLine3Dx() {
+				const tab = this.tabsInfo[this.animationFinishCurrent];
+				// 让滑块中心点和当前tab中心重合
+				if (tab) this.line3Dx = tab.left + tab.width / 2 - this.barWidthPx / 2 - this.tabsInfo[0].left;
+			},
+			countPx() {
+				// swiper宽度由rpx转为px单位，因为dx等，都是px单位
+				this.sW = uni.upx2px(Number(this.swiperWidth));
+			},
+			emit(index) {
+				this.$emit('change', index);
+			},
+			change() {
+				this.setScrollViewToCenter();
+			},
+			getQuery(cb) {
+				try {
+					let view = uni.createSelectorQuery().in(this).select('.u-tabs');
+					view.fields({
+							size: true
+						},
+						data => {
+							if (data) {
+								this.componentsWidth = data.width;
+								if (cb && typeof cb === 'function') cb(data);
+							} else {
+								this.getQuery(cb);
+							}
+						}
+					).exec();
+				} catch (e) {
+					this.componentsWidth = windowWidth;
+				}
+			},
+			// 把活动tab移动到屏幕中心点
+			setScrollViewToCenter() {
+				let tab;
+				tab = this.tabsInfo[this.animationFinishCurrent];
+				if (tab) {
+					let tabCenter = tab.left + tab.width / 2;
+					let fatherWidth;
+					// 活动tab移动到中心时，以屏幕还是tab组件为宽度为基准
+					if (this.autoCenterMode === 'window') {
+						fatherWidth = windowWidth;
+					} else {
+						fatherWidth = this.componentsWidth;
+					}
+					this.scrollLeft = tabCenter - fatherWidth / 2;
+				}
+			},
+			setDx(dx) {
+				let nextTabIndex = dx > 0 ? this.animationFinishCurrent + 1 : this.animationFinishCurrent - 1;
+				// 判断索引是否超出边界
+				nextTabIndex = nextTabIndex <= 0 ? 0 : nextTabIndex;
+				nextTabIndex = nextTabIndex >= this.list.length ? this.list.length - 1 : nextTabIndex;
+				const tab = this.tabsInfo[nextTabIndex];
+				// 当前tab中心点x轴坐标
+				let nowTab = this.tabsInfo[this.animationFinishCurrent];
+				let nowTabX = nowTab.left + nowTab.width / 2;
+				// 下一个tab
+				let nextTab = this.tabsInfo[nextTabIndex];
+				let nextTabX = nextTab.left + nextTab.width / 2;
+				// 两个tab之间的距离，因为下一个tab可能在当前tab的左边或者右边，取绝对值即可
+				let distanceX = Math.abs(nextTabX - nowTabX);
+				this.line3AddDx = (dx / this.sW) * distanceX;
+				this.setTabColor(this.animationFinishCurrent, nextTabIndex, dx);
+			},
+			// 设置tab的颜色
+			setTabColor(nowTabIndex, nextTabIndex, dx) {
+				let colorIndex = Math.abs(Math.ceil((dx / this.sW) * 100));
+				let colorLength = this.colorGradientArr.length;
+				// 处理超出索引边界的情况
+				colorIndex = colorIndex >= colorLength ? colorLength - 1 : colorIndex <= 0 ? 0 : colorIndex;
+				// 设置下一个tab的颜色
+				this.tabsInfo[nextTabIndex].color = this.colorGradientArr[colorIndex];
+				// 设置当前tab的颜色
+				this.tabsInfo[nowTabIndex].color = this.colorGradientArr[colorLength - 1 - colorIndex];
+			},
+			// swiper结束滑动
+			setFinishCurrent(current) {
+				// 如果滑动的索引不一致，修改tab颜色变化，因为可能会有直接点击tab的情况
+				this.tabsInfo.map((val, index) => {
+					if (current == index) val.color = this.activeColor;
+					else val.color = this.inactiveColor;
+					return val;
+				});
+				this.line3AddDx = 0;
+				this.animationFinishCurrent = current;
+				this.countLine3Dx();
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	view,
+	scroll-view {
+		box-sizing: border-box;
+	}
+
+	.u-tabs {
+		width: 100%;
+		transition-property: background-color, color;
+	}
+
+	/* #ifndef APP-NVUE */
+	::-webkit-scrollbar,
+	::-webkit-scrollbar,
+	::-webkit-scrollbar {
+		display: none;
+		width: 0 !important;
+		height: 0 !important;
+		-webkit-appearance: none;
+		background: transparent;
+	}
+	/* #endif */
+
+	/* #ifdef H5 */
+	// 通过样式穿透，隐藏H5下，scroll-view下的滚动条
+	scroll-view ::v-deep ::-webkit-scrollbar {
+		display: none;
+		width: 0 !important;
+		height: 0 !important;
+		-webkit-appearance: none;
+		background: transparent;
+	}
+
+	/* #endif */
+
+	.u-scroll-view {
+		width: 100%;
+		white-space: nowrap;
+		position: relative;
+	}
+
+	.u-tabs-scroll-box {
+		position: relative;
+	}
+
+	.u-tabs-scroll-flex {
+		@include vue-flex;
+		justify-content: space-between;
+	}
+
+	.u-tabs-scroll-flex .u-tabs-item {
+		flex: 1;
+	}
+
+	.u-tabs-item {
+		position: relative;
+		display: inline-block;
+		text-align: center;
+		transition-property: background-color, color, font-weight;
+	}
+
+	.content {
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	.boxStyle {
+		pointer-events: none;
+		position: absolute;
+		transition-property: all;
+	}
+
+	.boxStyle2 {
+		pointer-events: none;
+		position: absolute;
+		bottom: 0;
+		transition-property: all;
+		transform: translateY(-100%);
+	}
+
+	.itemBackgroundBox {
+		pointer-events: none;
+		position: absolute;
+		top: 0;
+		transition-property: left, background-color;
+		@include vue-flex;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.itemBackground {
+		height: 100%;
+		width: 100%;
+		transition-property: all;
+	}
+
+	.u-scroll-bar {
+		position: absolute;
+		bottom: 4rpx;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-tabs/u-tabs.vue b/uni_modules/vk-uview-ui/components/u-tabs/u-tabs.vue
new file mode 100644
index 0000000..56a193a
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-tabs/u-tabs.vue
@@ -0,0 +1,399 @@
+<template>
+	<view class="u-tabs" :style="{
+		background: bgColor
+	}">
+		<!-- $u.getRect()对组件根节点无效，因为写了.in(this)，故这里获取内层接点尺寸 -->
+		<view :id="id">
+			<scroll-view scroll-x class="u-scroll-view" :scroll-left="scrollLeft" scroll-with-animation>
+				<view class="u-scroll-box" :id="id" :class="{'u-tabs-scroll-flex': !isScroll}">
+					<view class="u-tab-item u-line-1" :id="'u-tab-item-' + index" v-for="(item, index) in list" :key="index" @tap="clickTab(index)"
+					 :style="[tabItemStyle(index)]">
+						<u-badge :count="item[count] || item['count'] || 0" :offset="offset" size="mini"></u-badge>
+						{{ item[name] || item['name']}}
+					</view>
+					<view v-if="showBar" class="u-tab-bar" :style="[tabBarStyle]"></view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * tabs 标签
+	 * @description 该组件，是一个tabs标签组件，在标签多的时候，可以配置为左右滑动，标签少的时候，可以禁止滑动。 该组件的一个特点是配置为滚动模式时，激活的tab会自动移动到组件的中间位置。
+	 * @tutorial https://www.uviewui.com/components/tabs.html
+	 * @property {Boolean} is-scroll tabs是否可以左右拖动（默认true）
+	 * @property {Array} list 标签数组，元素为对象，如[{name: '推荐'}]
+	 * @property {String Number} current 指定哪个tab为激活状态（默认0）
+	 * @property {String Number} height 导航栏的高度，单位rpx（默认80）
+	 * @property {String Number} font-size tab文字大小，单位rpx（默认30）
+	 * @property {String Number} duration 滑块移动一次所需的时间，单位秒（默认0.5）
+	 * @property {String} active-color 滑块和激活tab文字的颜色（默认#2979ff）
+	 * @property {String} inactive-color tabs文字颜色（默认#303133）
+	 * @property {String Number} bar-width 滑块宽度，单位rpx（默认40）
+	 * @property {Object} active-item-style 活动tabs item的样式，对象形式
+	 * @property {Object} bar-style 底部滑块的样式，对象形式
+	 * @property {Boolean} show-bar 是否显示底部的滑块（默认true）
+	 * @property {String Number} bar-height 滑块高度，单位rpx（默认6）
+	 * @property {String Number} item-width 标签的宽度（默认auto）
+	 * @property {String Number} gutter 单个tab标签的左右内边距之和，单位rpx（默认40）
+	 * @property {String} bg-color tabs导航栏的背景颜色（默认#ffffff）
+	 * @property {String} name 组件内部读取的list参数中的属性名（tab名称），见官网说明（默认name）
+	 * @property {String} count 组件内部读取的list参数中的属性名（badge徽标数），同name属性的使用，见官网说明（默认count）
+	 * @property {Array} offset 设置badge徽标数的位置偏移，格式为 [x, y]，也即设置的为top和right的值，单位rpx（默认[5, 20]）
+	 * @property {Boolean} bold 激活选项的字体是否加粗（默认true）
+	 * @event {Function} change 点击标签时触发
+	 * @example <u-tabs ref="tabs" :list="list" :is-scroll="false"></u-tabs>
+	 */
+	export default {
+		name: "u-tabs",
+    emits: ["update:modelValue", "input", "change"],
+		props: {
+      // 通过双向绑定控制组件的弹出与收起
+      value: {
+      	type: [Number, String],
+      	default: 0
+      },
+      modelValue: {
+        type: [Number, String],
+        default: 0
+      },
+      // 当前活动tab的索引（请使用 v-model="current" 代替 :current="current" @change="change" 其他不变）
+      current: {
+      	type: [Number, String],
+      	default: 0
+      },
+			// 导航菜单是否需要滚动，如只有2或者3个的时候，就不需要滚动了，此时使用flex平分tab的宽度
+			isScroll: {
+				type: Boolean,
+				default: true
+			},
+			//需循环的标签列表
+			list: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			// 导航栏的高度和行高
+			height: {
+				type: [String, Number],
+				default: 80
+			},
+			// 字体大小
+			fontSize: {
+				type: [String, Number],
+				default: 30
+			},
+			// 过渡动画时长, 单位ms
+			duration: {
+				type: [String, Number],
+				default: 0.5
+			},
+			// 选中项的主题颜色
+			activeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 未选中项的颜色
+			inactiveColor: {
+				type: String,
+				default: '#303133'
+			},
+			// 菜单底部移动的bar的宽度，单位rpx
+			barWidth: {
+				type: [String, Number],
+				default: 40
+			},
+			// 移动bar的高度
+			barHeight: {
+				type: [String, Number],
+				default: 6
+			},
+			// 单个tab的左或有内边距（左右相同）
+			gutter: {
+				type: [String, Number],
+				default: 30
+			},
+			// 导航栏的背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 读取传入的数组对象的属性(tab名称)
+			name: {
+				type: String,
+				default: 'name'
+			},
+			// 读取传入的数组对象的属性(徽标数)
+			count: {
+				type: String,
+				default: 'count'
+			},
+			// 徽标数位置偏移
+			offset: {
+				type: Array,
+				default: () => {
+					return [5, 20]
+				}
+			},
+			// 活动tab字体是否加粗
+			bold: {
+				type: Boolean,
+				default: true
+			},
+			// 当前活动tab item的样式
+			activeItemStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+			// 是否显示底部的滑块
+			showBar: {
+				type: Boolean,
+				default: true
+			},
+			// 底部滑块的自定义样式
+			barStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+			// 标签的宽度
+			itemWidth: {
+				type: [Number, String],
+				default: 'auto'
+			}
+		},
+		data() {
+			return {
+				scrollLeft: 0, // 滚动scroll-view的左边滚动距离
+				tabQueryInfo: [], // 存放对tab菜单查询后的节点信息
+				componentWidth: 0, // 屏幕宽度，单位为px
+				scrollBarLeft: 0, // 移动bar需要通过translateX()移动的距离
+				parentLeft: 0, // 父元素(tabs组件)到屏幕左边的距离
+				id: this.$u.guid(), // id值
+				currentIndex: this.current,
+				barFirstTimeMove: true, // 滑块第一次移动时(页面刚生成时)，无需动画，否则给人怪异的感觉
+			};
+		},
+		watch: {
+			// 监听tab的变化，重新计算tab菜单的布局信息，因为实际使用中菜单可能是通过
+			// 后台获取的（如新闻app顶部的菜单），获取返回需要一定时间，所以list变化时，重新获取布局信息
+			list(n, o) {
+				// list变动时，重制内部索引，否则可能导致超出数组边界的情况
+				if(n.length !== o.length) this.currentIndex = 0;
+				// 用$nextTick等待视图更新完毕后再计算tab的局部信息，否则可能因为tab还没生成就获取，就会有问题
+				this.$nextTick(() => {
+					this.init();
+				});
+			},
+			current: {
+				immediate: true,
+				handler(nVal, oVal) {
+					// 视图更新后再执行移动操作
+					this.$nextTick(() => {
+						this.currentIndex = nVal;
+						this.scrollByIndex();
+					});
+				}
+			},
+      valueCom: {
+        immediate: true,
+        handler(nVal, oVal) {
+        	// 视图更新后再执行移动操作
+        	this.$nextTick(() => {
+        		this.currentIndex = nVal;
+        		this.scrollByIndex();
+        	});
+        }
+      }
+		},
+		computed: {
+			valueCom() {
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+			},
+			// 移动bar的样式
+			tabBarStyle() {
+				let style = {
+					width: this.barWidth + 'rpx',
+					transform: `translate(${this.scrollBarLeft}px, -100%)`,
+					// 滑块在页面渲染后第一次滑动时，无需动画效果
+					'transition-duration': `${this.barFirstTimeMove ? 0 : this.duration }s`,
+					'background-color': this.activeColor,
+					height: this.barHeight + 'rpx',
+					// 设置一个很大的值，它会自动取能用的最大值，不用高度的一半，是因为高度可能是单数，会有小数出现
+					'border-radius': `${this.barHeight / 2}px`
+				};
+				Object.assign(style, this.barStyle);
+				return style;
+			},
+			// tab的样式
+			tabItemStyle() {
+				return (index) => {
+					let style = {
+						height: this.height + 'rpx',
+						'line-height': this.height + 'rpx',
+						'font-size': this.fontSize + 'rpx',
+						'transition-duration': `${this.duration}s`,
+						padding: this.isScroll ? `0 ${this.gutter}rpx` : '',
+						flex: this.isScroll ? 'auto' : '1',
+						width: this.$u.addUnit(this.itemWidth)
+					};
+					// 字体加粗
+					if (index == this.currentIndex && this.bold) style.fontWeight = 'bold';
+					if (index == this.currentIndex) {
+						style.color = this.activeColor;
+						// 给选中的tab item添加外部自定义的样式
+						style = Object.assign(style, this.activeItemStyle);
+					} else {
+						style.color = this.inactiveColor;
+					}
+					return style;
+				}
+			}
+		},
+		methods: {
+			// 设置一个init方法，方便多处调用
+			async init() {
+				// 获取tabs组件的尺寸信息
+				let tabRect = await this.$uGetRect('#' + this.id);
+				// tabs组件距离屏幕左边的宽度
+				this.parentLeft = tabRect.left;
+				// tabs组件的宽度
+				this.componentWidth = tabRect.width;
+				this.getTabRect();
+			},
+			// 点击某一个tab菜单
+			clickTab(index) {
+				// 点击当前活动tab，不触发事件
+				if(index == this.currentIndex) return ;
+				// 发送事件给父组件
+				this.$emit('change', index);
+        this.$emit('input', index);
+        this.$emit("update:modelValue", index);
+			},
+			// 查询tab的布局信息
+			getTabRect() {
+				// 创建节点查询
+				let query = uni.createSelectorQuery().in(this);
+				// 历遍所有tab，这里是执行了查询，最终使用exec()会一次性返回查询的数组结果
+				for (let i = 0; i < this.list.length; i++) {
+					// 只要size和rect两个参数
+					query.select(`#u-tab-item-${i}`).fields({
+						size: true,
+						rect: true
+					});
+				}
+				// 执行查询，一次性获取多个结果
+				query.exec(
+					function(res) {
+						this.tabQueryInfo = res;
+						// 初始化滚动条和移动bar的位置
+						this.scrollByIndex();
+					}.bind(this)
+				);
+			},
+			// 滚动scroll-view，让活动的tab处于屏幕的中间位置
+			scrollByIndex() {
+				// 当前活动tab的布局信息，有tab菜单的width和left(为元素左边界到父元素左边界的距离)等信息
+				let tabInfo = this.tabQueryInfo[this.currentIndex];
+				if (!tabInfo) return;
+				// 活动tab的宽度
+				let tabWidth = tabInfo.width;
+				// 活动item的左边到tabs组件左边的距离，用item的left减去tabs的left
+				let offsetLeft = tabInfo.left - this.parentLeft;
+				// 将活动的tabs-item移动到屏幕正中间，实际上是对scroll-view的移动
+				let scrollLeft = offsetLeft - (this.componentWidth - tabWidth) / 2;
+				this.scrollLeft = scrollLeft < 0 ? 0 : scrollLeft;
+				// 当前活动item的中点点到左边的距离减去滑块宽度的一半，即可得到滑块所需的移动距离
+				let left = tabInfo.left + tabInfo.width / 2 - this.parentLeft;
+				// 计算当前活跃item到组件左边的距离
+				this.scrollBarLeft = left - uni.upx2px(this.barWidth) / 2;
+				// 第一次移动滑块的时候，barFirstTimeMove为true，放到延时中将其设置false
+				// 延时是因为scrollBarLeft作用于computed计算时，需要一个过程需，否则导致出错
+				if(this.barFirstTimeMove == true) {
+					setTimeout(() => {
+						this.barFirstTimeMove = false;
+					}, 100)
+				}
+			}
+		},
+		mounted() {
+			this.init();
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	view,
+	scroll-view {
+		box-sizing: border-box;
+	}
+
+	/* #ifndef APP-NVUE */
+	::-webkit-scrollbar,
+	::-webkit-scrollbar,
+	::-webkit-scrollbar {
+		display: none;
+		width: 0 !important;
+		height: 0 !important;
+		-webkit-appearance: none;
+		background: transparent;
+	}
+	/* #endif */
+
+	.u-scroll-box {
+		position: relative;
+		/* #ifdef MP-TOUTIAO */
+		white-space: nowrap;
+		/* #endif */
+	}
+
+	/* #ifdef H5 */
+	// 通过样式穿透，隐藏H5下，scroll-view下的滚动条
+	scroll-view ::v-deep ::-webkit-scrollbar {
+		display: none;
+		width: 0 !important;
+		height: 0 !important;
+		-webkit-appearance: none;
+		background: transparent;
+	}
+	/* #endif */
+
+	.u-scroll-view {
+		width: 100%;
+		white-space: nowrap;
+		position: relative;
+	}
+
+	.u-tab-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: inline-block;
+		/* #endif */
+		text-align: center;
+		transition-property: background-color, color;
+	}
+
+	.u-tab-bar {
+		position: absolute;
+		bottom: 0;
+	}
+
+	.u-tabs-scroll-flex {
+		@include vue-flex;
+		justify-content: space-between;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-tag/u-tag.vue b/uni_modules/vk-uview-ui/components/u-tag/u-tag.vue
new file mode 100644
index 0000000..18ef59f
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-tag/u-tag.vue
@@ -0,0 +1,295 @@
+<template>
+	<view v-if="show" :class="[
+		disabled ? 'u-disabled' : '',
+		'u-size-' + size,
+		'u-shape-' + shape,
+		'u-mode-' + mode + '-' + type
+	]"
+	 class="u-tag" :style="[customStyle]" @tap="clickTag">
+		{{text}}
+		<view class="u-icon-wrap" @tap.stop>
+			<u-icon @click="close" size="22" v-if="closeable" :color="closeIconColor" 
+			name="close" class="u-close-icon" :style="[iconStyle]"></u-icon>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * tag 提示
+	 * @description 该组件一般用于标记和选择
+	 * @tutorial https://www.uviewui.com/components/tag.html
+	 * @property {String} type 主题类型（默认primary）
+	 * @property {String} size 标签大小（默认default）
+	 * @property {String} shape 标签形状（默认square）
+	 * @property {String} text 标签的文字内容
+	 * @property {String} bg-color 自定义标签的背景颜色
+	 * @property {String} border-color 标签的边框颜色
+	 * @property {String} close-color 关闭按钮的颜色
+	 * @property {String Number} index 点击标签时，会通过click事件返回该值
+	 * @property {String} mode 模式选择，见官网说明（默认light）
+	 * @property {Boolean} closeable 是否可关闭，设置为true，文字右边会出现一个关闭图标（默认false）
+	 * @property {Boolean} show 标签显示与否（默认true）
+	 * @event {Function} click 点击标签触发
+	 * @event {Function} close closeable为true时，点击标签关闭按钮触发
+	 * @example <u-tag text="雪月夜" type="success" />
+	 */
+	export default {
+		name: 'u-tag',
+    emits: ["click", "close"],
+		// 是否禁用这个标签，禁用的话，会屏蔽点击事件
+		props: {
+			// 标签类型info、primary、success、warning、error
+			type: {
+				type: String,
+				default: 'primary'
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			// 标签的大小，分为default（默认），mini（较小）
+			size: {
+				type: String,
+				default: 'default'
+			},
+			// tag的形状，circle（两边半圆形）, square（方形，带圆角），circleLeft（左边是半圆），circleRight（右边是半圆）
+			shape: {
+				type: String,
+				default: 'square'
+			},
+			// 标签文字
+			text: {
+				type: [String, Number],
+				default: ''
+			},
+			// 背景颜色，默认为空字符串，即不处理
+			bgColor: {
+				type: String,
+				default: ''
+			},
+			// 标签字体颜色，默认为空字符串，即不处理
+			color: {
+				type: String,
+				default: ''
+			},
+			// 镂空形式标签的边框颜色
+			borderColor: {
+				type: String,
+				default: ''
+			},
+			// 关闭按钮图标的颜色
+			closeColor: {
+				type: String,
+				default: ''
+			},
+			// 点击时返回的索引值，用于区分例遍的数组哪个元素被点击了
+			index: {
+				type: [Number, String],
+				default: ''
+			},
+			// 模式选择，dark|light|plain
+			mode: {
+				type: String,
+				default: 'light'
+			},
+			// 是否可关闭
+			closeable: {
+				type: Boolean,
+				default: false
+			},
+			// 是否显示
+			show: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			customStyle() {
+				let style = {};
+				// 文字颜色（如果有此值，会覆盖type值的颜色）
+				if(this.color) style.color = this.color;
+				// tag的背景颜色（如果有此值，会覆盖type值的颜色）
+				if(this.bgColor) style.backgroundColor = this.bgColor;
+				// 如果是镂空型tag，没有传递边框颜色（borderColor）的话，使用文字的颜色（color属性）
+				if(this.mode == 'plain' && this.color && !this.borderColor) style.borderColor = this.color;
+				else style.borderColor = this.borderColor;
+				return style;
+			},
+			iconStyle() {
+				if(!this.closeable) return ;
+				let style = {};
+				if(this.size == 'mini') style.fontSize = '20rpx';
+				else style.fontSize = '22rpx';
+				if(this.mode == 'plain' || this.mode == 'light') style.color = this.type;
+				else if(this.mode == 'dark')  style.color = "#ffffff";
+				if(this.closeColor) style.color = this.closeColor;
+				return style;
+			},
+			// 关闭图标的颜色
+			closeIconColor() {
+				// 如果定义了关闭图标的颜色，就用此值，否则用字体颜色的值
+				// 如果上面的二者都没有，如果是dark深色模式，图标就为白色
+				// 最后如果上面的三者都不合适，就返回type值给图标获取颜色
+				let color = '';
+				if(this.closeColor) return this.closeColor;
+				else if(this.color) return this.color;
+				else if(this.mode == 'dark') return '#ffffff';
+				else return this.type;
+			}
+		},
+		methods: {
+			// 标签被点击
+			clickTag() {
+				// 如果是disabled状态，不发送点击事件
+				if(this.disabled) return ;
+				this.$emit('click', this.index);
+			},
+			// 点击标签关闭按钮
+			close() {
+				this.$emit('close', this.index);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-tag {
+		box-sizing: border-box;
+		align-items: center;
+		border-radius: 6rpx;
+		/* #ifndef APP-NVUE */
+		display: inline-block;
+		/* #endif */
+		line-height: 1;
+	}
+	
+	.u-size-default {
+		font-size: 22rpx;
+		padding: 12rpx 22rpx;
+	}
+	
+	.u-size-mini {
+		font-size: 20rpx;
+		padding: 6rpx 12rpx;
+	}
+
+	.u-mode-light-primary {
+		background-color: $u-type-primary-light;
+		color: $u-type-primary;
+		border: 1px solid $u-type-primary-disabled;
+	}
+	
+	.u-mode-light-success {
+		background-color: $u-type-success-light;
+		color: $u-type-success;
+		border: 1px solid $u-type-success-disabled;
+	}
+	
+	.u-mode-light-error {
+		background-color: $u-type-error-light;
+		color: $u-type-error;
+		border: 1px solid $u-type-error-disabled;
+	}
+	
+	.u-mode-light-warning {
+		background-color: $u-type-warning-light;
+		color: $u-type-warning;
+		border: 1px solid $u-type-warning-disabled;
+	}
+	
+	.u-mode-light-info {
+		background-color: $u-type-info-light;
+		color: $u-type-info;
+		border: 1px solid $u-type-info-disabled;
+	}
+	
+	.u-mode-dark-primary {
+		background-color: $u-type-primary;
+		color: #FFFFFF;
+	}
+	
+	.u-mode-dark-success {
+		background-color: $u-type-success;
+		color: #FFFFFF;
+	}
+	
+	.u-mode-dark-error {
+		background-color: $u-type-error;
+		color: #FFFFFF;
+	}
+	
+	.u-mode-dark-warning {
+		background-color: $u-type-warning;
+		color: #FFFFFF;
+	}
+	
+	.u-mode-dark-info {
+		background-color: $u-type-info;
+		color: #FFFFFF;
+	}
+	
+	.u-mode-plain-primary {
+		background-color: #FFFFFF;
+		color: $u-type-primary;
+		border: 1px solid $u-type-primary;
+	}
+	
+	.u-mode-plain-success {
+		background-color: #FFFFFF;
+		color: $u-type-success;
+		border: 1px solid $u-type-success;
+	}
+	
+	.u-mode-plain-error {
+		background-color: #FFFFFF;
+		color: $u-type-error;
+		border: 1px solid $u-type-error;
+	}
+	
+	.u-mode-plain-warning {
+		background-color: #FFFFFF;
+		color: $u-type-warning;
+		border: 1px solid $u-type-warning;
+	}
+	
+	.u-mode-plain-info {
+		background-color: #FFFFFF;
+		color: $u-type-info;
+		border: 1px solid $u-type-info;
+	}
+	
+	.u-disabled {
+		opacity: 0.55;
+	}
+
+	.u-shape-circle {
+		border-radius: 100rpx;
+	}
+	
+	.u-shape-circleRight {
+		border-radius:  0 100rpx 100rpx 0;
+	}
+
+	.u-shape-circleLeft {
+		border-radius: 100rpx 0 0 100rpx;
+	}
+	
+	.u-close-icon {
+		margin-left: 14rpx;
+		font-size: 22rpx;
+		color: $u-type-success;
+	}
+	
+	.u-icon-wrap {
+		display: inline-flex;
+		transform: scale(0.86);
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-td/u-td.vue b/uni_modules/vk-uview-ui/components/u-td/u-td.vue
new file mode 100644
index 0000000..b00ad8b
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-td/u-td.vue
@@ -0,0 +1,66 @@
+<template>
+	<view class="u-td" :style="[tdStyle]">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	/**
+	 * td td单元格
+	 * @description 表格组件一般用于展示大量结构化数据的场景（搭配u-table使用）
+	 * @tutorial https://www.uviewui.com/components/table.html#td-props
+	 * @property {String Number} width 单元格宽度百分比或者具体带单位的值，如30%， 200rpx等，一般使用百分比，单元格宽度默认为均分tr的长度（默认auto）
+	 * @example <u-td>二年级</u-td>
+	 */
+	export default {
+		name: "u-td",
+		props: {
+			// 宽度，百分比或者具体带单位的值，如30%， 200rpx等，一般使用百分比
+			width: {
+				type: [Number, String],
+				default: 'auto'
+			}
+		},
+		data() {
+			return {
+				tdStyle: {
+					
+				}
+			}
+		},
+		created() {
+			this.parent = false;
+		},
+		mounted() {
+			this.parent = this.$u.$parent.call(this, 'u-table');
+			if (this.parent) {
+				// 将父组件的相关参数，合并到本组件
+				let style = {};
+				if (this.width != "auto") style.flex = `0 0 ${this.width}`;
+				style.textAlign = this.parent.align;
+				style.fontSize = this.parent.fontSize + 'rpx';
+				style.padding = this.parent.padding;
+				style.borderBottom = `solid 1px ${this.parent.borderColor}`;
+				style.borderRight = `solid 1px ${this.parent.borderColor}`;
+				style.color = this.parent.color;
+				this.tdStyle = style;
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-td {
+		@include vue-flex;
+		flex-direction: column;
+		flex: 1;
+		justify-content: center;
+		font-size: 28rpx;
+		color: $u-content-color;
+		align-self: stretch;
+		box-sizing: border-box;
+		height: 100%;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-th/u-th.vue b/uni_modules/vk-uview-ui/components/u-th/u-th.vue
new file mode 100644
index 0000000..c736b9b
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-th/u-th.vue
@@ -0,0 +1,62 @@
+<template>
+	<view class="u-th" :style="[thStyle]">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	/**
+	 * th th单元格
+	 * @description 表格组件一般用于展示大量结构化数据的场景（搭配u-table使用）
+	 * @tutorial https://www.uviewui.com/components/table.html#td-props
+	 * @property {String Number} width 标题单元格宽度百分比或者具体带单位的值，如30%，200rpx等，一般使用百分比，单元格宽度默认为均分tr的长度
+	 * @example 暂无示例
+	 */
+	export default {
+		name: "u-th",
+		props: {
+			// 宽度，百分比或者具体带单位的值，如30%， 200rpx等，一般使用百分比
+			width: {
+				type: [Number, String],
+				default: ''
+			}
+		},
+		data() {
+			return {
+				thStyle: {}
+			}
+		},
+		created() {
+			this.parent = false;
+		},
+		mounted() {
+			this.parent = this.$u.$parent.call(this, 'u-table');
+			if (this.parent) {
+				// 将父组件的相关参数，合并到本组件
+				let style = {};
+				if (this.width) style.flex = `0 0 ${this.width}`;
+				style.textAlign = this.parent.align;
+				style.padding = this.parent.padding;
+				style.borderBottom = `solid 1px ${this.parent.borderColor}`;
+				style.borderRight = `solid 1px ${this.parent.borderColor}`;
+				Object.assign(style, this.parent.thStyle);
+				this.thStyle = style;
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-th {
+		@include vue-flex;
+		flex-direction: column;
+		flex: 1;
+		justify-content: center;
+		font-size: 28rpx;
+		color: $u-main-color;
+		font-weight: bold;
+		background-color: rgb(245, 246, 248);
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-time-line-item/u-time-line-item.vue b/uni_modules/vk-uview-ui/components/u-time-line-item/u-time-line-item.vue
new file mode 100644
index 0000000..be86fdc
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-time-line-item/u-time-line-item.vue
@@ -0,0 +1,83 @@
+<template>
+	<view class="u-time-axis-item">
+		<slot name="content" />
+		<view class="u-time-axis-node" :style="[nodeStyle]">
+			<slot name="node">
+				<view class="u-dot">
+				</view>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * timeLineItem 时间轴Item
+	 * @description 时间轴组件一般用于物流信息展示，各种跟时间相关的记录等场景。(搭配u-time-line使用)
+	 * @tutorial https://www.uviewui.com/components/timeLine.html
+	 * @property {String} bg-color 左边节点的背景颜色，一般通过slot内容自定义背景颜色即可（默认#ffffff）
+	 * @property {String Number} node-top 节点左边图标绝对定位的top值，单位rpx
+	 * @example <u-time-line-item node-top="2">...</u-time-line-item>
+	 */
+	export default {
+		name: "u-time-line-item",
+		props: {
+			// 节点的背景颜色
+			bgColor: {
+				type: String,
+				default: "#ffffff"
+			},
+			// 节点左边图标绝对定位的top值
+			nodeTop: {
+				type: [String, Number],
+				default: ""
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		computed: {
+			nodeStyle() {
+				let style = {
+					backgroundColor: this.bgColor,
+				};
+				if (this.nodeTop != "") style.top = this.nodeTop + 'rpx';
+				return style;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-time-axis-item {
+		@include vue-flex;
+		flex-direction: column;
+		width: 100%;
+		position: relative;
+		margin-bottom: 32rpx;
+	}
+
+	.u-time-axis-node {
+		position: absolute;
+		top: 12rpx;
+		left: -40rpx;
+		transform-origin: 0;
+		transform: translateX(-50%);
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		z-index: 1;
+		font-size: 24rpx;
+	}
+
+	.u-dot {
+		height: 16rpx;
+		width: 16rpx;
+		border-radius: 100rpx;
+		background: #ddd;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-time-line/u-time-line.vue b/uni_modules/vk-uview-ui/components/u-time-line/u-time-line.vue
new file mode 100644
index 0000000..f3c7587
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-time-line/u-time-line.vue
@@ -0,0 +1,43 @@
+<template>
+	<view class="u-time-axis">
+		<slot />
+	</view>
+</template>
+
+<script>
+	/**
+	 * timeLine 时间轴
+	 * @description 时间轴组件一般用于物流信息展示，各种跟时间相关的记录等场景。
+	 * @tutorial https://www.uviewui.com/components/timeLine.html
+	 * @example <u-time-line></u-time-line>
+	 */
+	export default {
+		name: "u-time-line",
+		data() {
+			return {
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-time-axis {
+		padding-left: 40rpx;
+		position: relative;
+	}
+
+	.u-time-axis::before {
+		content: " ";
+		position: absolute;
+		left: 0;
+		top: 12rpx;
+		width: 1px;
+		bottom: 0;
+		border-left: 1px solid #ddd;
+		transform-origin: 0 0;
+		transform: scaleX(0.5);
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-toast/u-toast.vue b/uni_modules/vk-uview-ui/components/u-toast/u-toast.vue
new file mode 100644
index 0000000..d219f67
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-toast/u-toast.vue
@@ -0,0 +1,220 @@
+<template>
+	<view class="u-toast" :class="[isShow ? 'u-show' : '', 'u-type-' + tmpConfig.type, 'u-position-' + tmpConfig.position]" :style="{
+		zIndex: uZIndex
+	}">
+		<view class="u-icon-wrap">
+			<u-icon v-if="tmpConfig.icon" class="u-icon" :name="iconName" :size="30" :color="tmpConfig.type"></u-icon>
+		</view>
+		<text class="u-text">{{tmpConfig.title}}</text>
+	</view>
+</template>
+
+<script>
+	/**
+	 * toast 消息提示
+	 * @description 此组件表现形式类似uni的uni.showToastAPI，但也有不同的地方。
+	 * @tutorial https://www.uviewui.com/components/toast.html
+	 * @property {String} z-index toast展示时的z-index值
+	 * @event {Function} show 显示toast，如需一进入页面就显示toast，请在onReady生命周期调用
+	 * @example <u-toast ref="uToast" />
+	 */
+	export default {
+		name: "u-toast",
+		props: {
+			// z-index值
+			zIndex: {
+				type: [Number, String],
+				default: ''
+			},
+		},
+		data() {
+			return {
+				isShow: false,
+				timer: null, // 定时器
+				config: {
+					params: {}, // URL跳转的参数，对象
+					title: '', // 显示文本
+					type: '', // 主题类型，primary，success，error，warning，black
+					duration: 2000, // 显示的时间，毫秒
+					isTab: false, // 是否跳转tab页面
+					url: '', // toast消失后是否跳转页面，有则跳转，优先级高于back参数
+					icon: true, // 显示的图标
+					position: 'center', // toast出现的位置
+					callback: null, // 执行完后的回调函数
+					back: false, // 结束toast是否自动返回上一页
+				},
+				tmpConfig: {}, // 将用户配置和内置配置合并后的临时配置变量
+			};
+		},
+		computed: {
+			iconName() {
+				// 只有不为none，并且type为error|warning|success|info时候，才显示图标
+				if (['error', 'warning', 'success', 'info'].indexOf(this.tmpConfig.type) >= 0 && this.tmpConfig.icon) {
+					let icon = this.$u.type2icon(this.tmpConfig.type);
+					return icon;
+				}
+			},
+			uZIndex() {
+				// 显示toast时候，如果用户有传递z-index值，有限使用
+				return this.isShow ? (this.zIndex ? this.zIndex : this.$u.zIndex.toast) : '999999';
+			}
+		},
+		methods: {
+			// 显示toast组件，由父组件通过this.$refs.xxx.show(options)形式调用
+			show(options) {
+				// 不降结果合并到this.config变量，避免多次条用u-toast，前后的配置造成混论
+				this.tmpConfig = this.$u.deepMerge(this.config, options);
+				if (this.timer) {
+					// 清除定时器
+					clearTimeout(this.timer);
+					this.timer = null;
+				}
+				this.isShow = true;
+				this.timer = setTimeout(() => {
+					// 倒计时结束，清除定时器，隐藏toast组件
+					this.isShow = false;
+					clearTimeout(this.timer);
+					this.timer = null;
+					// 判断是否存在callback方法，如果存在就执行
+					typeof(this.tmpConfig.callback) === 'function' && this.tmpConfig.callback();
+					this.timeEnd();
+				}, this.tmpConfig.duration);
+			},
+			// 隐藏toast组件，由父组件通过this.$refs.xxx.hide()形式调用
+			hide() {
+				this.isShow = false;
+				if (this.timer) {
+					// 清除定时器
+					clearTimeout(this.timer);
+					this.timer = null;
+				}
+			},
+			// 倒计时结束之后，进行的一些操作
+			timeEnd() {
+				// 如果带有url值，根据isTab为true或者false进行跳转
+				if (this.tmpConfig.url) {
+					// 如果url没有"/"开头，添加上，因为uni的路由跳转需要"/"开头
+					if (this.tmpConfig.url[0] != '/') this.tmpConfig.url = '/' + this.tmpConfig.url;
+					// 判断是否有传递显式的参数
+					if (Object.keys(this.tmpConfig.params).length) {
+						// 判断用户传递的url中，是否带有参数
+						// 使用正则匹配，主要依据是判断是否有"/","?","="等，如“/page/index/index?name=mary"
+						// 如果有params参数，转换后无需带上"?"
+						let query = '';
+						if (/.*\/.*\?.*=.*/.test(this.tmpConfig.url)) {
+							// object对象转为get类型的参数
+							query = this.$u.queryParams(this.tmpConfig.params, false);
+							this.tmpConfig.url = this.tmpConfig.url + "&" + query;
+						} else {
+							query = this.$u.queryParams(this.tmpConfig.params);
+							this.tmpConfig.url += query;
+						}
+					}
+					// 如果是跳转tab页面，就使用uni.switchTab
+					if (this.tmpConfig.isTab) {
+						uni.switchTab({
+							url: this.tmpConfig.url
+						});
+					} else {
+						uni.navigateTo({
+							url: this.tmpConfig.url
+						});
+					}
+				} else if(this.tmpConfig.back) {
+					// 回退到上一页
+					this.$u.route({
+						type: 'back'
+					})
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-toast {
+		position: fixed;
+		z-index: -1;
+		transition: opacity 0.3s;
+		text-align: center;
+		color: #fff;
+		border-radius: 8rpx;
+		background: #585858;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 28rpx;
+		opacity: 0;
+		pointer-events: none;
+		padding: 18rpx 40rpx;
+	}
+
+	.u-toast.u-show {
+		opacity: 1;
+	}
+
+	.u-icon {
+		margin-right: 10rpx;
+		@include vue-flex;
+		align-items: center;
+		line-height: normal;
+	}
+
+	.u-position-center {
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%,-50%);
+		/* #ifndef APP-NVUE */
+		max-width: 70%;
+		/* #endif */
+	}
+
+	.u-position-top {
+		left: 50%;
+		top: 20%;
+		transform: translate(-50%,-50%);
+	}
+
+	.u-position-bottom {
+		left: 50%;
+		bottom: 20%;
+		transform: translate(-50%,-50%);
+	}
+
+	.u-type-primary {
+		color: $u-type-primary;
+		background-color: $u-type-primary-light;
+		border: 1px solid rgb(215, 234, 254);
+	}
+
+	.u-type-success {
+		color: $u-type-success;
+		background-color: $u-type-success-light;
+		border: 1px solid #BEF5C8;
+	}
+
+	.u-type-error {
+		color: $u-type-error;
+		background-color: $u-type-error-light;
+		border: 1px solid #fde2e2;
+	}
+
+	.u-type-warning {
+		color: $u-type-warning;
+		background-color: $u-type-warning-light;
+		border: 1px solid #faecd8;
+	}
+
+	.u-type-info {
+		color: $u-type-info;
+		background-color: $u-type-info-light;
+		border: 1px solid #ebeef5;
+	}
+
+	.u-type-default {
+		color: #fff;
+		background-color: #585858;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-top-tips/u-top-tips.vue b/uni_modules/vk-uview-ui/components/u-top-tips/u-top-tips.vue
new file mode 100644
index 0000000..98d58df
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-top-tips/u-top-tips.vue
@@ -0,0 +1,121 @@
+<template>
+	<view class="u-tips" :class="['u-' + type, isShow ? 'u-tip-show' : '']" :style="{
+		top: navbarHeight + 'px',
+		zIndex: uZIndex
+	}">{{ title }}</view>
+</template>
+
+<script>
+	/**
+	 * topTips 顶部提示
+	 * @description 该组件一般用于页面顶部向下滑出一个提示，尔后自动收起的场景。
+	 * @tutorial https://www.uviewui.com/components/topTips.html
+	 * @property {String Number} navbar-height 导航栏高度(包含状态栏高度在内)，单位PX
+	 * @property {String Number} z-index z-index值（默认975）
+	 * @example <u-top-tips ref="uTips"></u-top-tips>
+	 */
+	export default {
+		name: "u-top-tips",
+		props: {
+			// 导航栏高度，用于提示的初始化
+			navbarHeight: {
+				type: [Number, String],
+				// #ifndef H5
+				default: 0,
+				// #endif
+				// #ifdef H5
+				default: 44,
+				// #endif
+			},
+			// z-index值
+			zIndex: {
+				type: [Number, String],
+				default: ''
+			}
+		},
+		data() {
+			return {
+				timer: null, // 定时器
+				isShow: false, // 是否显示消息组件
+				title: '', // 组件中显示的消息内容
+				type: 'primary', // 消息的类型（颜色不同），primary，success，error，warning，info
+				duration: 2000, // 组件显示的时间，单位为毫秒
+			};
+		},
+		computed: {
+			uZIndex() {
+				return this.zIndex ? this.zIndex : this.$u.zIndex.topTips;
+			}
+		},
+		methods: {
+			show(config = {}) {
+				// 先清除定时器（可能是上一次定义的，需要清除了再开始新的）
+				clearTimeout(this.timer);
+				// 时间，内容，类型主题(type)等参数
+				if (config.duration) this.duration = config.duration;
+				if (config.type) this.type = config.type;
+				this.title = config.title;
+				this.isShow = true;
+				// 倒计时
+				this.timer = setTimeout(() => {
+					this.isShow = false;
+					clearTimeout(this.timer);
+					this.timer = null;
+				}, this.duration);
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	view {
+		box-sizing: border-box;
+	}
+
+	// 顶部弹出类型样式
+	.u-tips {
+		width: 100%;
+		position: fixed;
+		z-index: 1;
+		padding: 20rpx 30rpx;
+		color: #FFFFFF;
+		font-size: 28rpx;
+		left: 0;
+		right: 0;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		opacity: 0;
+		// 此处为最核心点，translateY(-100%)意味着将其从Y轴隐藏（隐藏到顶部(h5)或者说导航栏(app)下面）
+		transform: translateY(-100%);
+		transition: all 0.35s linear;
+	}
+
+	.u-tip-show {
+		transform: translateY(0);
+		opacity: 1;
+		z-index: 99;
+	}
+
+	.u-primary {
+		background: $u-type-primary;
+	}
+
+	.u-success {
+		background: $u-type-success;
+	}
+
+	.u-warning {
+		background: $u-type-warning;
+	}
+
+	.u-error {
+		background: $u-type-error;
+	}
+
+	.u-info {
+		background: $u-type-info;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-tr/u-tr.vue b/uni_modules/vk-uview-ui/components/u-tr/u-tr.vue
new file mode 100644
index 0000000..06aed4a
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-tr/u-tr.vue
@@ -0,0 +1,25 @@
+<template>
+	<view class="u-tr">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	/**
+	 * tr 表格行标签
+	 * @description 表格组件一般用于展示大量结构化数据的场景（搭配<u-table>使用）
+	 * @tutorial https://www.uviewui.com/components/table.html
+	 * @example <u-tr></u-tr>
+	 */
+	export default {
+		name: "u-tr",
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-tr {
+		@include vue-flex;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-upload/u-upload.vue b/uni_modules/vk-uview-ui/components/u-upload/u-upload.vue
new file mode 100644
index 0000000..da6c842
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-upload/u-upload.vue
@@ -0,0 +1,728 @@
+<template>
+	<view class="u-upload" v-if="!disabled">
+		<view
+			v-if="showUploadList"
+			class="u-list-item u-preview-wrap"
+			v-for="(item, index) in lists"
+			:key="index"
+			:style="{
+				width: $u.addUnit(width),
+				height: $u.addUnit(height)
+			}"
+		>
+			<view
+				v-if="deletable"
+				class="u-delete-icon"
+				@tap.stop="deleteItem(index)"
+				:style="{
+					background: delBgColor
+				}"
+			>
+				<u-icon class="u-icon" :name="delIcon" size="20" :color="delColor"></u-icon>
+			</view>
+			<!-- <view
+				v-if="item.progress >= 100"
+				class="u-success-icon"
+			>
+				<u-icon class="u-icon" :name="successIcon" size="20" :color="successColor"></u-icon>
+			</view> -->
+			<u-line-progress
+				v-if="showProgress && item.progress > 0 && item.progress != 100 && !item.error"
+				:show-percent="false"
+				height="16"
+				class="u-progress"
+				:percent="item.progress"
+			></u-line-progress>
+			<view @tap.stop="retry(index)" v-if="item.error" class="u-error-btn">点击重试</view>
+			<image @tap.stop="doPreviewImage(item.url || item.path, index)" class="u-preview-image" v-if="!item.isImage" :src="item.url || item.path" :mode="imageMode"></image>
+		</view>
+		<slot name="file" :file="lists"></slot>
+		<view style="display: inline-block;" @tap="selectFile" v-if="maxCount > lists.length">
+			<slot name="addBtn"></slot>
+			<view
+				v-if="!customBtn"
+				class="u-list-item u-add-wrap"
+				hover-class="u-add-wrap__hover"
+				hover-stay-time="150"
+				:style="{
+					width: $u.addUnit(width),
+					height: $u.addUnit(height)
+				}"
+			>
+				<u-icon name="plus" class="u-add-btn" size="40"></u-icon>
+				<view class="u-add-tips">{{ uploadText }}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * upload 图片上传
+ * @description 该组件用于上传图片场景
+ * @tutorial https://www.uviewui.com/components/upload.html
+ * @property {String} action 服务器上传地址
+ * @property {String Number} max-count 最大选择图片的数量（默认99）
+ * @property {Boolean} custom-btn 如果需要自定义选择图片的按钮，设置为true（默认false）
+ * @property {Boolean} show-progress 是否显示进度条（默认true）
+ * @property {Boolean} disabled 是否启用(显示/移仓)组件（默认false）
+ * @property {String} image-mode 预览图片等显示模式，可选值为uni的image的mode属性值（默认aspectFill）
+ * @property {String} del-icon 右上角删除图标名称，只能为uView内置图标
+ * @property {String} del-bg-color 右上角关闭按钮的背景颜色
+ * @property {String | Number} index 在各个回调事件中的最后一个参数返回，用于区别是哪一个组件的事件
+ * @property {String} del-color 右上角关闭按钮图标的颜色
+ * @property {Object} header 上传携带的头信息，对象形式
+ * @property {Object} form-data 上传额外携带的参数
+ * @property {String} name 上传文件的字段名，供后端获取使用（默认file）
+ * @property {Array<String>} size-type original 原图，compressed 压缩图，默认二者都有（默认['original', 'compressed']）
+ * @property {Array<String>} source-type 选择图片的来源，album-从相册选图，camera-使用相机，默认二者都有（默认['album', 'camera']）
+ * @property {Boolean} preview-full-image	是否可以通过uni.previewImage预览已选择的图片（默认true）
+ * @property {Boolean} multiple	是否开启图片多选，部分安卓机型不支持（默认true）
+ * @property {Boolean} deletable 是否显示删除图片的按钮（默认true）
+ * @property {String Number} max-size 选择单个文件的最大大小，单位B(byte)，默认不限制（默认Number.MAX_VALUE）
+ * @property {Array<Object>} file-list 默认显示的图片列表，数组元素为对象，必须提供url属性
+ * @property {Boolean} upload-text 选择图片按钮的提示文字（默认“选择图片”）
+ * @property {Boolean} auto-upload 选择完图片是否自动上传，见上方说明（默认true）
+ * @property {Boolean} show-tips 特殊情况下是否自动提示toast，见上方说明（默认true）
+ * @property {Boolean} show-upload-list 是否显示组件内部的图片预览（默认true）
+ * @event {Function} on-oversize 图片大小超出最大允许大小
+ * @event {Function} on-preview 全屏预览图片时触发
+ * @event {Function} on-remove 移除图片时触发
+ * @event {Function} on-success 图片上传成功时触发
+ * @event {Function} on-change 图片上传后，无论成功或者失败都会触发
+ * @event {Function} on-error 图片上传失败时触发
+ * @event {Function} on-progress 图片上传过程中的进度变化过程触发
+ * @event {Function} on-uploaded 所有图片上传完毕触发
+ * @event {Function} on-choose-complete 每次选择图片后触发，只是让外部可以得知每次选择后，内部的文件列表
+ * @event {Function} on-list-change 当内部文件列表被加入文件、移除文件，或手动调用clear方法时触发
+ * @event {Function} on-choose-fail 选择文件出错时触发，比如选择文件时取消了操作，只在微信和APP有效
+ * @example <u-upload :action="action" :file-list="fileList" ></u-upload>
+ */
+export default {
+	name: "u-upload",
+	emits: ["update:file-list", "on-oversize", "on-list-change", "on-preview", "on-remove", "on-success", "on-change", "on-error", "on-progress", "on-uploaded", "on-choose-complete", "on-choose-fail"],
+	props: {
+		//是否显示组件自带的图片预览功能
+		showUploadList: {
+			type: Boolean,
+			default: true
+		},
+		// 后端地址
+		action: {
+			type: String,
+			default: ""
+		},
+		// 最大上传数量
+		maxCount: {
+			type: [String, Number],
+			default: 52
+		},
+		//  是否显示进度条
+		showProgress: {
+			type: Boolean,
+			default: true
+		},
+		// 是否启用
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 预览上传的图片时的裁剪模式，和image组件mode属性一致
+		imageMode: {
+			type: String,
+			default: "aspectFill"
+		},
+		// 头部信息
+		header: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 额外携带的参数
+		formData: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 上传的文件字段名
+		name: {
+			type: String,
+			default: "file"
+		},
+		// 所选的图片的尺寸, 可选值为original compressed
+		sizeType: {
+			type: Array,
+			default() {
+				return ["original", "compressed"];
+			}
+		},
+		sourceType: {
+			type: Array,
+			default() {
+				return ["album", "camera"];
+			}
+		},
+		// 是否在点击预览图后展示全屏图片预览
+		previewFullImage: {
+			type: Boolean,
+			default: true
+		},
+		// 是否开启图片多选，部分安卓机型不支持
+		multiple: {
+			type: Boolean,
+			default: true
+		},
+		// 是否展示删除按钮
+		deletable: {
+			type: Boolean,
+			default: true
+		},
+		// 文件大小限制，单位为byte
+		maxSize: {
+			type: [String, Number],
+			default: Number.MAX_VALUE
+		},
+		// 显示已上传的文件列表
+		fileList: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 上传区域的提示文字
+		uploadText: {
+			type: String,
+			default: "选择图片"
+		},
+		// 是否自动上传
+		autoUpload: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示toast消息提示
+		showTips: {
+			type: Boolean,
+			default: true
+		},
+		// 是否通过slot自定义传入选择图标的按钮
+		customBtn: {
+			type: Boolean,
+			default: false
+		},
+		// 内部预览图片区域和选择图片按钮的区域宽度
+		width: {
+			type: [String, Number],
+			default: 200
+		},
+		// 内部预览图片区域和选择图片按钮的区域高度
+		height: {
+			type: [String, Number],
+			default: 200
+		},
+		// 右上角关闭按钮的背景颜色
+		delBgColor: {
+			type: String,
+			default: "#fa3534"
+		},
+		// 右上角关闭按钮的叉号图标的颜色
+		delColor: {
+			type: String,
+			default: "#ffffff"
+		},
+		// 右上角删除图标名称，只能为uView内置图标
+		delIcon: {
+			type: String,
+			default: "close"
+		},
+		// 右下角成功图标名称，只能为uView内置图标
+		successIcon: {
+			type: String,
+			default: "checkbox-mark"
+		},
+		// 右下角成功的叉号图标的颜色
+		successColor: {
+			type: String,
+			default: "#ffffff"
+		},
+		// 如果上传后的返回值为json字符串，是否自动转json
+		toJson: {
+			type: Boolean,
+			default: true
+		},
+		// 上传前的钩子，每个文件上传前都会执行
+		beforeUpload: {
+			type: Function,
+			default: null
+		},
+		// 移除文件前的钩子
+		beforeRemove: {
+			type: Function,
+			default: null
+		},
+		// 允许上传的图片后缀
+		limitType: {
+			type: Array,
+			default() {
+				// 支付宝小程序真机选择图片的后缀为"image"
+				// https://opendocs.alipay.com/mini/api/media-image
+				return ["png", "jpg", "jpeg", "webp", "gif", "image"];
+			}
+		},
+		// 在各个回调事件中的最后一个参数返回，用于区别是哪一个组件的事件
+		index: {
+			type: [Number, String],
+			default: ""
+		}
+	},
+	mounted() {},
+	data() {
+		return {
+			lists: [],
+			isInCount: true,
+			uploading: false
+		};
+	},
+	watch: {
+		fileList: {
+			immediate: true,
+			handler(val) {
+				let that = this;
+				let lists = JSON.parse(JSON.stringify(that.lists));
+				val.map(value => {
+					// 首先检查内部是否已经添加过这张图片，因为外部绑定了一个对象给fileList的话(对象引用)，进行修改外部fileList
+					// 时，会触发watch，导致重新把原来的图片再次添加到this.lists
+					// 数组的some方法意思是，只要数组元素有任意一个元素条件符合，就返回true，而另一个数组的every方法的意思是数组所有元素都符合条件才返回true
+					let tmp = lists.some(val => {
+						return val.url == value.url;
+					});
+					// 如果内部没有这个图片(tmp为false)，则添加到内部
+					if (!tmp) {
+						lists.push({ url: value.url, error: false, progress: 100 });
+					}
+				});
+				that.lists = JSON.parse(JSON.stringify(lists));
+			}
+		},
+		// 监听lists的变化，发出事件
+		lists: {
+			deep: true,
+			handler(n) {
+				this.$emit("update:file-list", n);
+				this.$emit("on-list-change", n, this.index);
+			}
+		}
+	},
+	methods: {
+		// 清除列表
+		clear() {
+			this.lists = [];
+		},
+		// 重新上传队列中上传失败的所有文件
+		reUpload() {
+			this.uploadFile();
+		},
+		// 选择图片
+		selectFile() {
+			let that = this;
+			if (that.disabled) return;
+			const { name = "", maxCount, multiple, maxSize, sizeType, camera, compressed, maxDuration, sourceType } = that;
+			let chooseFile = null;
+			let lists = JSON.parse(JSON.stringify(that.lists));
+			const newMaxCount = maxCount - lists.length;
+			// 设置为只选择图片的时候使用 chooseImage 来实现
+			chooseFile = new Promise((resolve, reject) => {
+				uni.chooseImage({
+					count: multiple ? (newMaxCount > 9 ? 9 : newMaxCount) : 1,
+					sourceType: sourceType,
+					sizeType,
+					success: resolve,
+					fail: reject
+				});
+			});
+			chooseFile
+				.then(res => {
+					let file = null;
+					let listOldLength = that.lists.length;
+					res.tempFiles.map((val, index) => {
+						// 检查文件后缀是否允许，如果不在that.limitType内，就会返回false
+						if (!that.checkFileExt(val)) return;
+
+						// 如果是非多选，index大于等于1或者超出最大限制数量时，不处理
+						if (!multiple && index >= 1) return;
+						if (val.size > maxSize) {
+							that.$emit("on-oversize", val, that.lists, that.index);
+							that.showToast("超出允许的文件大小");
+						} else {
+							if (maxCount <= lists.length) {
+								that.$emit("on-exceed", val, that.lists, that.index);
+								that.showToast("超出最大允许的文件个数");
+								return;
+							}
+							lists.push({
+								url: val.path,
+								progress: 0,
+								error: false,
+								file: val
+							});
+						}
+					});
+
+					// 这样实现深拷贝会导致在H5中file为空对象
+					// that.lists = JSON.parse(JSON.stringify(lists));
+					this.deepClone(lists, that.lists);
+					// 每次图片选择完，抛出一个事件，并将当前内部选择的图片数组抛出去
+					that.$emit("on-choose-complete", that.lists, that.index);
+					if (that.autoUpload) that.uploadFile(listOldLength);
+				})
+				.catch(error => {
+					that.$emit("on-choose-fail", error);
+				});
+		},
+		// 提示用户消息
+		showToast(message, force = false) {
+			if (this.showTips || force) {
+				uni.showToast({
+					title: message,
+					icon: "none"
+				});
+			}
+		},
+		// 该方法供用户通过ref调用，手动上传
+		upload() {
+			this.uploadFile();
+		},
+		// 对失败的图片重新上传
+		retry(index) {
+			this.lists[index].progress = 0;
+			this.lists[index].error = false;
+			this.lists[index].response = null;
+			uni.showLoading({
+				title: "重新上传"
+			});
+			this.uploadFile(index);
+		},
+		// 上传图片
+		async uploadFile(index = 0) {
+			if (this.disabled) return;
+			if (this.uploading) return;
+			// 全部上传完成
+			if (index >= this.lists.length) {
+				this.$emit("on-uploaded", this.lists, this.index);
+				return;
+			}
+			// 检查是否是已上传或者正在上传中
+			if (this.lists[index].progress == 100) {
+				if (this.autoUpload == false) this.uploadFile(index + 1);
+				return;
+			}
+			// 执行before-upload钩子
+			if (this.beforeUpload && typeof this.beforeUpload === "function") {
+				// 执行回调，同时传入索引和文件列表当作参数
+				// 在微信，支付宝等环境(H5正常)，会导致父组件定义的customBack()函数体中的this变成子组件的this
+				// 通过bind()方法，绑定父组件的this，让this.customBack()的this为父组件的上下文
+				// 因为upload组件可能会被嵌套在其他组件内，比如u-form，这时this.$parent其实为u-form的this，
+				// 非页面的this，所以这里需要往上历遍，一直寻找到最顶端的$parent，这里用了this.$u.$parent.call(this)
+				// 明白意思即可，无需纠结this.$u.$parent.call(this)的细节
+				let beforeResponse = this.beforeUpload.bind(this.$u.$parent.call(this))(index, this.lists);
+				// 判断是否返回了promise
+				if (!!beforeResponse && typeof beforeResponse.then === "function") {
+					await beforeResponse
+						.then(res => {
+							// promise返回成功，不进行动作，继续上传
+						})
+						.catch(err => {
+							// 进入catch回调的话，继续下一张
+							return this.uploadFile(index + 1);
+						});
+				} else if (beforeResponse === false) {
+					// 如果返回false，继续下一张图片的上传
+					return this.uploadFile(index + 1);
+				} else {
+					// 此处为返回"true"的情形，这里不写代码，就跳过此处，继续执行当前的上传逻辑
+				}
+			}
+			// 检查上传地址
+			if (!this.action) {
+				this.showToast("请配置上传地址", true);
+				return;
+			}
+			this.lists[index].error = false;
+			this.uploading = true;
+			// 创建上传对象
+			const task = uni.uploadFile({
+				url: this.action,
+				filePath: this.lists[index].url,
+				name: this.name,
+				formData: this.formData,
+				header: this.header,
+				// #ifdef MP-ALIPAY
+				fileType:'image',
+				// #endif
+				success: res => {
+					// 判断是否json字符串，将其转为json格式
+					let data = this.toJson && this.$u.test.jsonString(res.data) ? JSON.parse(res.data) : res.data;
+					if (![200, 201, 204].includes(res.statusCode)) {
+						this.uploadError(index, data);
+					} else {
+						// 上传成功
+						this.lists[index].response = data;
+						this.lists[index].progress = 100;
+						this.lists[index].error = false;
+						this.$emit("on-success", data, index, this.lists, this.index);
+					}
+				},
+				fail: e => {
+					this.uploadError(index, e);
+				},
+				complete: res => {
+					uni.hideLoading();
+					this.uploading = false;
+					this.uploadFile(index + 1);
+					this.$emit("on-change", res, index, this.lists, this.index);
+				}
+			});
+			task.onProgressUpdate(res => {
+				if (res.progress > 0) {
+					this.lists[index].progress = res.progress;
+					this.$emit("on-progress", res, index, this.lists, this.index);
+				}
+			});
+		},
+		// 上传失败
+		uploadError(index, err) {
+			this.lists[index].progress = 0;
+			this.lists[index].error = true;
+			this.lists[index].response = null;
+			this.$emit("on-error", err, index, this.lists, this.index);
+			this.showToast("上传失败，请重试");
+		},
+		// 删除一个图片
+		deleteItem(index) {
+			uni.showModal({
+				title: "提示",
+				content: "您确定要删除此项吗？",
+				success: async res => {
+					if (res.confirm) {
+						// 先检查是否有定义before-remove移除前钩子
+						// 执行before-remove钩子
+						if (this.beforeRemove && typeof this.beforeRemove === "function") {
+							// 此处钩子执行 原理同before-remove参数，见上方注释
+							let beforeResponse = this.beforeRemove.bind(this.$u.$parent.call(this))(index, this.lists);
+							// 判断是否返回了promise
+							if (!!beforeResponse && typeof beforeResponse.then === "function") {
+								await beforeResponse
+									.then(res => {
+										// promise返回成功，不进行动作，继续上传
+										this.handlerDeleteItem(index);
+									})
+									.catch(err => {
+										// 如果进入promise的reject，终止删除操作
+										this.showToast("已终止移除");
+									});
+							} else if (beforeResponse === false) {
+								// 返回false，终止删除
+								this.showToast("已终止移除");
+							} else {
+								// 如果返回true，执行删除操作
+								this.handlerDeleteItem(index);
+							}
+						} else {
+							// 如果不存在before-remove钩子，
+							this.handlerDeleteItem(index);
+						}
+					}
+				}
+			});
+		},
+		// 执行移除图片的动作，上方代码只是判断是否可以移除
+		handlerDeleteItem(index) {
+			// 如果文件正在上传中，终止上传任务，进度在0 < progress < 100则意味着正在上传
+			if (this.lists[index].progress < 100 && this.lists[index].progress > 0) {
+				typeof this.lists[index].uploadTask != 'undefined' && this.lists[index].uploadTask.abort();
+			}
+			this.lists.splice(index, 1);
+			this.$forceUpdate();
+			this.$emit("on-remove", index, this.lists, this.index);
+			//this.showToast('移除成功');
+		},
+		// 用户通过ref手动的形式，移除一张图片
+		remove(index) {
+			// 判断索引的合法范围
+			if (index >= 0 && index < this.lists.length) {
+				this.lists.splice(index, 1);
+				this.$emit('on-list-change', this.lists, this.index);
+			}
+		},
+		// 预览图片
+		doPreviewImage(url, index) {
+			if (!this.previewFullImage) {
+				this.$emit("on-preview", url, this.lists, this.index);
+				return;
+			}
+			const images = this.lists.map(item => item.url || item.path);
+			uni.previewImage({
+				urls: images,
+				current: url,
+				success: () => {
+					this.$emit("on-preview", url, this.lists, this.index);
+				},
+				fail: () => {
+					uni.showToast({
+						title: "预览图片失败",
+						icon: "none"
+					});
+				}
+			});
+		},
+		// 判断文件后缀是否允许
+		checkFileExt(file) {
+			// 检查是否在允许的后缀中
+			let noArrowExt = false;
+			// 获取后缀名
+			let fileExt = "";
+			const reg = /.+\./;
+			// 如果是H5，需要从name中判断
+			// #ifdef H5
+			fileExt = file.name.replace(reg, "").toLowerCase();
+			// #endif
+			// 非H5，需要从path中读取后缀
+			// #ifndef H5
+			fileExt = file.path.replace(reg, "").toLowerCase();
+			// #endif
+			// 使用数组的some方法，只要符合limitType中的一个，就返回true
+			noArrowExt = this.limitType.some(ext => {
+				// 转为小写
+				return ext.toLowerCase() === fileExt;
+			});
+			if (!noArrowExt) this.showToast(`不允许选择${fileExt}格式的文件`);
+			return noArrowExt;
+		},
+		// 深拷贝
+		deepClone(obj, newObj) {
+			for (let k in obj) {
+				const value = obj[k];
+
+				if (Array.isArray(value)) {
+					newObj[k] = [];
+					this.deepClone(value, newObj[k]);
+				} else if (value !== null && typeof value === "object") {
+					newObj[k] = {};
+					this.deepClone(value, newObj[k]);
+				} else {
+					newObj[k] = value;
+				}
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-upload {
+	@include vue-flex;
+	flex-wrap: wrap;
+	align-items: center;
+}
+
+.u-list-item {
+	width: 200rpx;
+	height: 200rpx;
+	overflow: hidden;
+	margin: 10rpx;
+	background: rgb(244, 245, 246);
+	position: relative;
+	border-radius: 10rpx;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	align-items: center;
+	justify-content: center;
+}
+
+.u-preview-wrap {
+	border: 1px solid rgb(235, 236, 238);
+}
+
+.u-add-wrap {
+	flex-direction: column;
+	color: $u-content-color;
+	font-size: 26rpx;
+}
+
+.u-add-tips {
+	margin-top: 20rpx;
+	line-height: 40rpx;
+}
+
+.u-add-wrap__hover {
+	background-color: rgb(235, 236, 238);
+}
+
+.u-preview-image {
+	display: block;
+	width: 100%;
+	height: 100%;
+	border-radius: 10rpx;
+}
+
+.u-delete-icon {
+	position: absolute;
+	top: 6rpx;
+	right: 6rpx;
+	z-index: 10;
+	background-color: $u-type-error;
+	border-radius: 100rpx;
+	width: 36rpx;
+	height: 36rpx;
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.u-icon {
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.u-success-icon {
+	position: absolute;
+	bottom: 6rpx;
+	right: 6rpx;
+	z-index: 10;
+	background-color: #5ac725;
+	border-radius: 100rpx;
+	width: 36rpx;
+	height: 36rpx;
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.u-progress {
+	position: absolute;
+	bottom: 10rpx;
+	left: 8rpx;
+	right: 8rpx;
+	z-index: 9;
+	width: auto;
+}
+
+.u-error-btn {
+	color: #ffffff;
+	background-color: $u-type-error;
+	font-size: 20rpx;
+	padding: 4px 0;
+	text-align: center;
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	z-index: 9;
+	line-height: 1;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-verification-code/u-verification-code.vue b/uni_modules/vk-uview-ui/components/u-verification-code/u-verification-code.vue
new file mode 100644
index 0000000..66cb774
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-verification-code/u-verification-code.vue
@@ -0,0 +1,175 @@
+<template>
+	<view class="u-code-wrap">
+		<!-- 此组件功能由js完成，无需写html逻辑 -->
+	</view>
+</template>
+
+<script>
+	/**
+	 * verificationCode 验证码输入框
+	 * @description 考虑到用户实际发送验证码的场景，可能是一个按钮，也可能是一段文字，提示语各有不同，所以本组件 不提供界面显示，只提供提示语，由用户将提示语嵌入到具体的场景
+	 * @tutorial https://www.uviewui.com/components/verificationCode.html
+	 * @property {Number String} seconds 倒计时所需的秒数（默认60）
+	 * @property {String} start-text 开始前的提示语，见官网说明（默认获取验证码）
+	 * @property {String} change-text 倒计时期间的提示语，必须带有字母"x"，见官网说明（默认X秒重新获取）
+	 * @property {String} end-text 倒计结束的提示语，见官网说明（默认重新获取）
+	 * @property {Boolean} keep-running 是否在H5刷新或各端返回再进入时继续倒计时（默认false）
+	 * @event {Function} change 倒计时期间，每秒触发一次
+	 * @event {Function} start 开始倒计时触发
+	 * @event {Function} end 结束倒计时触发
+	 * @example <u-verification-code :seconds="seconds" @end="end" @start="start" ref="uCode" 
+	 */
+	export default {
+		name: "u-verification-code",
+    emits: ["start", "end", "change"],
+		props: {
+			// 倒计时总秒数
+			seconds: {
+				type: [String, Number],
+				default: 60
+			},
+			// 尚未开始时提示
+			startText: {
+				type: String,
+				default: '获取验证码'
+			},
+			// 正在倒计时中的提示
+			changeText: {
+				type: String,
+				default: 'X秒重新获取'
+			},
+			// 倒计时结束时的提示
+			endText: {
+				type: String,
+				default: '重新获取'
+			},
+			// 是否在H5刷新或各端返回再进入时继续倒计时
+			keepRunning: {
+				type: Boolean,
+				default: false
+			},
+			// 为了区分多个页面，或者一个页面多个倒计时组件本地存储的继续倒计时变了
+			uniqueKey: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				secNum: this.seconds,
+				timer: null,
+				canGetCode: true, // 是否可以执行验证码操作
+			}
+		},
+		mounted() {
+			this.checkKeepRunning();
+		},
+		watch: {
+			seconds: {
+				immediate: true,
+				handler(n) {
+					this.secNum = n;
+				}
+			}
+		},
+		methods: {
+			checkKeepRunning() {
+				// 获取上一次退出页面(H5还包括刷新)时的时间戳，如果没有上次的保存，此值可能为空
+				let lastTimestamp = Number(uni.getStorageSync(this.uniqueKey + '_$uCountDownTimestamp'));
+				if(!lastTimestamp) return this.changeEvent(this.startText);
+				// 当前秒的时间戳
+				let nowTimestamp = Math.floor((+ new Date()) / 1000);
+				// 判断当前的时间戳，是否小于上一次的本该按设定结束，却提前结束的时间戳
+				if(this.keepRunning && lastTimestamp && lastTimestamp > nowTimestamp) {
+					// 剩余尚未执行完的倒计秒数
+					this.secNum = lastTimestamp - nowTimestamp;
+					// 清除本地保存的变量
+					uni.removeStorageSync(this.uniqueKey + '_$uCountDownTimestamp');
+					// 开始倒计时
+					this.start();
+				} else {
+					// 如果不存在需要继续上一次的倒计时，执行正常的逻辑
+					this.changeEvent(this.startText);
+				}
+			},
+			// 开始倒计时
+			start() {
+				// 防止快速点击获取验证码的按钮而导致内部产生多个定时器导致混乱
+				if(this.timer) {
+					clearInterval(this.timer);
+					this.timer = null;
+				}
+				this.$emit('start');
+				this.canGetCode = false;
+				// 这里放这句，是为了一开始时就提示，否则要等setInterval的1秒后才会有提示
+				this.changeEvent(this.changeText.replace(/x|X/, this.secNum));
+				this.setTimeToStorage();
+				this.timer = setInterval(() => {
+					if (--this.secNum) {
+						// 用当前倒计时的秒数替换提示字符串中的"x"字母
+						this.changeEvent(this.changeText.replace(/x|X/, this.secNum));
+					} else {
+						clearInterval(this.timer);
+						this.timer = null;
+						this.changeEvent(this.endText);
+						this.secNum = this.seconds;
+						this.$emit('end');
+						this.canGetCode = true;
+					}
+				}, 1000);
+			},
+			// 重置，可以让用户再次获取验证码
+			reset() {
+				this.canGetCode = true;
+				clearInterval(this.timer);
+				this.secNum = this.seconds;
+				this.changeEvent(this.endText);
+			},
+			changeEvent(text) {
+				this.$emit('change', text);
+			},
+			// 保存时间戳，为了防止倒计时尚未结束，H5刷新或者各端的右上角返回上一页再进来
+			setTimeToStorage() {
+				if(!this.keepRunning || !this.timer) return;
+				// 记录当前的时间戳，为了下次进入页面，如果还在倒计时内的话，继续倒计时
+				// 倒计时尚未结束，结果大于0；倒计时已经开始，就会小于初始值，如果等于初始值，说明没有开始倒计时，无需处理
+				if(this.secNum > 0 && this.secNum <= this.seconds) {
+					// 获取当前时间戳(+ new Date()为特殊写法)，除以1000变成秒，再去除小数部分
+					let nowTimestamp = Math.floor((+ new Date()) / 1000);
+					// 将本该结束时候的时间戳保存起来 => 当前时间戳 + 剩余的秒数
+					uni.setStorage({
+						key: this.uniqueKey + '_$uCountDownTimestamp',
+						data: nowTimestamp + Number(this.secNum)
+					})
+				}
+			}
+		},
+		// 组件销毁的时候，清除定时器，否则定时器会继续存在，系统不会自动清除
+    // #ifndef VUE3
+    beforeDestroy() {
+      this.setTimeToStorage();
+      clearTimeout(this.timer);
+      this.timer = null;
+    },
+    // #endif
+    
+    // #ifdef VUE3
+    beforeUnmount() {
+      this.setTimeToStorage();
+      clearTimeout(this.timer);
+      this.timer = null;
+    },
+    // #endif
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-code-wrap {
+		width: 0;
+		height: 0;
+		position: fixed;
+		z-index: -1;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-waterfall/u-waterfall.vue b/uni_modules/vk-uview-ui/components/u-waterfall/u-waterfall.vue
new file mode 100644
index 0000000..e56bdaf
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-waterfall/u-waterfall.vue
@@ -0,0 +1,199 @@
+<template>
+	<view class="u-waterfall">
+		<view id="u-left-column" class="u-column"><slot name="left" :leftList="leftList"></slot></view>
+		<view id="u-right-column" class="u-column">
+			<slot name="right" :rightList="rightList"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * waterfall 瀑布流
+ * @description 这是一个瀑布流形式的组件，内容分为左右两列，结合uView的懒加载组件效果更佳。相较于某些只是奇偶数左右分别，或者没有利用vue作用域插槽的做法，uView的瀑布流实现了真正的 组件化，搭配LazyLoad 懒加载和loadMore 加载更多组件，让您开箱即用，眼前一亮。
+ * @tutorial https://www.uviewui.com/components/waterfall.html
+ * @property {Array} flow-list 用于渲染的数据
+ * @property {String Number} add-time 单条数据添加到队列的时间间隔，单位ms，见上方注意事项说明（默认200）
+ * @example <u-waterfall :flowList="flowList"></u-waterfall>
+ */
+export default {
+	name: "u-waterfall",
+	emits: ["update:modelValue", "input"],
+	props: {
+		value: {
+			// 瀑布流数据
+			type: Array,
+			default: function() {
+				return [];
+			}
+		},
+		modelValue: {
+			// 瀑布流数据
+			type: Array,
+			default: function() {
+				return [];
+			}
+		},
+		// 每次向结构插入数据的时间间隔，间隔越长，越能保证两列高度相近，但是对用户体验越不好
+		// 单位ms
+		addTime: {
+			type: [Number, String],
+			default: 200
+		},
+		// id值，用于清除某一条数据时，根据此idKey名称找到并移除，如数据为{idx: 22, name: 'lisa'}
+		// 那么该把idKey设置为idx
+		idKey: {
+			type: String,
+			default: "id"
+		}
+	},
+	data() {
+		return {
+			leftList: [],
+			rightList: [],
+			tempList: [],
+			children: []
+		};
+	},
+	watch: {
+		copyFlowList(nVal, oVal) {
+			// 取差值，即这一次数组变化新增的部分
+			let startIndex = Array.isArray(oVal) && oVal.length > 0 ? oVal.length : 0;
+			// 拼接上原有数据
+			this.tempList = this.tempList.concat(this.cloneData(nVal.slice(startIndex)));
+			this.splitData();
+		}
+	},
+	mounted() {
+		this.tempList = this.cloneData(this.copyFlowList);
+		this.splitData();
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		// 破坏flowList变量的引用，否则watch的结果新旧值是一样的
+		copyFlowList() {
+			return this.cloneData(this.valueCom);
+		}
+	},
+	methods: {
+		async splitData() {
+			if (!this.tempList.length) return;
+			let leftRect = await this.$uGetRect("#u-left-column");
+			let rightRect = await this.$uGetRect("#u-right-column");
+			// 如果左边小于或等于右边，就添加到左边，否则添加到右边
+			let item = this.tempList[0];
+			// 解决多次快速上拉后，可能数据会乱的问题，因为经过上面的两个await节点查询阻塞一定时间，加上后面的定时器干扰
+			// 数组可能变成[]，导致此item值可能为undefined
+			if (!item) return;
+			if (leftRect.height < rightRect.height) {
+				this.leftList.push(item);
+			} else if (leftRect.height > rightRect.height) {
+				this.rightList.push(item);
+			} else {
+				// 这里是为了保证第一和第二张添加时，左右都能有内容
+				// 因为添加第一张，实际队列的高度可能还是0，这时需要根据队列元素长度判断下一个该放哪边
+				if (this.leftList.length <= this.rightList.length) {
+					this.leftList.push(item);
+				} else {
+					this.rightList.push(item);
+				}
+			}
+			// 移除临时列表的第一项
+			this.tempList.splice(0, 1);
+			// 如果临时数组还有数据，继续循环
+			if (this.tempList.length) {
+				setTimeout(() => {
+					this.splitData();
+				}, this.addTime);
+			}
+		},
+		// 复制而不是引用对象和数组
+		cloneData(data) {
+			return JSON.parse(JSON.stringify(data));
+		},
+		// 清空数据列表
+		clear() {
+			this.leftList = [];
+			this.rightList = [];
+			// 同时清除父组件列表中的数据
+			this.$emit("input", []);
+			this.$emit("update:modelValue", []);
+			this.tempList = [];
+		},
+		// 清除某一条指定的数据，根据id实现
+		remove(id) {
+			// 如果findIndex找不到合适的条件，就会返回-1
+			let index = -1;
+			index = this.leftList.findIndex(val => val[this.idKey] == id);
+			if (index != -1) {
+				// 如果index不等于-1，说明已经找到了要找的id，根据index索引删除这一条数据
+				this.leftList.splice(index, 1);
+			} else {
+				// 同理于上方面的方法
+				index = this.rightList.findIndex(val => val[this.idKey] == id);
+				if (index != -1) this.rightList.splice(index, 1);
+			}
+			// 同时清除父组件的数据中的对应id的条目
+			index = this.value.findIndex(val => val[this.idKey] == id);
+			if (index != -1) {
+				this.$emit("input", this.valueCom.splice(index, 1));
+				this.$emit("update:modelValue", this.valueCom.splice(index, 1));
+			}
+		},
+		// 修改某条数据的某个属性
+		modify(id, key, value) {
+			// 如果findIndex找不到合适的条件，就会返回-1
+			let index = -1;
+			index = this.leftList.findIndex(val => val[this.idKey] == id);
+			if (index != -1) {
+				// 如果index不等于-1，说明已经找到了要找的id，修改对应key的值
+				this.leftList[index][key] = value;
+			} else {
+				// 同理于上方面的方法
+				index = this.rightList.findIndex(val => val[this.idKey] == id);
+				if (index != -1) this.rightList[index][key] = value;
+			}
+			// 修改父组件的数据中的对应id的条目
+			index = this.valueCom.findIndex(val => val[this.idKey] == id);
+			if (index != -1) {
+				// 首先复制一份value的数据
+				let data = this.cloneData(this.valueCom);
+				// 修改对应索引的key属性的值为value
+				data[index][key] = value;
+				// 修改父组件通过v-model绑定的变量的值
+				this.$emit("input", data);
+				this.$emit("update:modelValue", data);
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-waterfall {
+	@include vue-flex;
+	flex-direction: row;
+	align-items: flex-start;
+}
+
+.u-column {
+	@include vue-flex;
+	flex: 1;
+	flex-direction: column;
+	height: auto;
+}
+
+.u-image {
+	width: 100%;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/vk-uview-ui/vk-uview-ui.vue b/uni_modules/vk-uview-ui/components/vk-uview-ui/vk-uview-ui.vue
new file mode 100644
index 0000000..bcd3662
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/vk-uview-ui/vk-uview-ui.vue
@@ -0,0 +1,15 @@
+<template>
+</template>
+
+<template>
+	<view></view>
+</template>
+
+<script>
+	export default {
+		
+	}
+</script>
+
+<style>
+</style>
diff --git a/uni_modules/vk-uview-ui/iconfont.css b/uni_modules/vk-uview-ui/iconfont.css
new file mode 100644
index 0000000..836c718
--- /dev/null
+++ b/uni_modules/vk-uview-ui/iconfont.css
@@ -0,0 +1,910 @@
+/* #ifdef APP-PLUS */
+@font-face {
+	font-family: "uicon-iconfont";
+	font-weight: normal;
+	font-style: normal;
+	font-display: auto;
+	src: url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
+}
+
+/* #endif */
+
+/* 支付宝，百度，头条小程序目前读取大的本地字体文件，导致无法显示图标，故用在线加载的方式-2020-05-12 */
+/* #ifndef APP-PLUS */
+@font-face {
+	font-family: "uicon-iconfont";
+	src: url('//at.alicdn.com/t/font_1529455_k4s6di1d1.eot?t=1596960292384');
+	/* IE9 */
+	src: url('//at.alicdn.com/t/font_1529455_k4s6di1d1.eot?t=1596960292384#iefix') format('embedded-opentype'),
+		/* IE6-IE8 */
+		url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAGQYAAsAAAAAw2gAAGPEAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCdAAqCv3SB/XABNgIkA4ZoC4M2AAQgBYRtB5cNG+OfdYacxwEA9eYzEqHbAaXC+ZFZWS8oKTr7/09LKmNsu7DdEEVL04JkStgZyOKZ/ILQ2JzQooY+O2mlDm88cwprtIUJRYoVp8q1MEe1Ow/WIUjUNfnNH9HJV5m92kW8dnj/3pEhB8aSgR+4kj24yOevPzf/ix2t5Ij79FHJAsd5EFJ2EoByUZPNHtWZ1VUw8TCKNsPzc+v9/WVQI8dGjhpsRMkSRg/YRimMGiDhCBkIyggFLMAzAAsVA/BOjAJUrBMVFTk9PQUPK0D0ro1REM/4bck0GjGLMBKwOzEqMDrm/+DNvwEAhTsoAAkoYGpB7e4LMInq4Z7d2/lSHmrkiVCowgFOGC/4BjLdjqZBMK9fkWmEJpgKgx8EK9nAPEPOk30pNCLq0BlSKNLexDrvFnL/EBcKlB/2YPqlzm92rMBKbxWxIXacD0TdMTTllTdfbtWnkEtVgBUaVkW6e6oqLSvgq84luVauJUGaMQg240CPmETe+8e/tZabTzHZvWtZycoqHH//BQBFFJvYg6cSCAPK0P/lViVvbmTWIzDi0N0rLjdoVkyOXJIrXJMg1hJIpYJpuwL9q2rensSOdFq7rfav29kR3LEgWD1R08h27tjxMauRWqk1yAqQxIEnxwk/k9Xvp4mNJ5uJLShAeP9ebatUY0naCgW0UITh59azOqqoboMT35k+wU5MV6BC/qWqJ5UnA9vtHQlfnOYXH0EGqAuWT9o/uCI/R6qH5JFb21r+/3mKC2j3fzlyPaQSlCkmTghdBueFPOIgIuD/pjV7uSVUtRJH3r1Qi793yiERbvfPn1kmfye50j+ht+xRakKdXWpRyFaEW2p3vgqDx5kmUV5C/ceN8zDBBaE/Jw+cu0rV+oKmNmRq88X0i/W3q7b+l373+kzPkBYGICUCkGiCVIIo+wTKgQBlF0E6BXIjpfPl9IoRIB0I0nsFUA6kfAHcKG6W9/JrN1/Mz5Ce9/jc+327ryVoKss14vz/aVtEFGJxKA6zw9isAcvQsULlmCICMkSMr7y8H5v/3H7HKsRIsIE7JNR0v68Ola+NidPXgYK7d4y5/kTrx1YiH3ACHY721PpPEwB52aopNP+2724kpHhSAITxv1FDjHzpgDzZMsCCoCevzA4ZdNuGwWaub2JsOr5/+GfTAhbIQEXxzM4jWww363cwcBfD37CDtobhdX241wMioCayVW4+bY0NiYeueRB+9rkNjZPR3SzDmPy+DZuAipEDJ95srvX1+/VHZ73km/Ct/p2utNSVpqu82hqCBAuZNq+8ATmVfJVWWHeYbwS/04tPTM/uwnx5/WrZyVW5K5oTo3NVqPm14m2BMjTemmu9rddzuzLfe3tb7nMPuIeaD4waumN34v8dT1ljigt5jIEn4Cl4Bp6D5ra9AG3NcPfedF1NNsxLUJuXzqNjHXsFxnkN7h/femLnVG/A/n11YXjrmqOdt2C8CXIrtGdHJTfBu2Cm98D7IK87oI0PwYGTB7d/BKbooLKD+cRp72PwCfgUPJjtMzDN5ocTVRGvs6Za+Bx8Ab4ErbS26yswyKFJmhmlgAJ7RxhpsHpyne6mux7O9NRLF7310VdL/fQ3QBlk9lgsrTBPIVaoHNDQMdRZoDhTZtCYLJhDgOkttEgOhiVZjcuWr1i5qiSi1jWlrF23fsPGoarqPdJQmPaAzQefgK8sZ8+dH+jCxUuXr1y9dv3GzVu37zTWRAX+AgQKEixEKFdcbtx5AINyGjgWYHT9vvZfIDCqgylAED4WAqOAYHwChMSnQCh8BoTG50AYfAGExVaEw53C40sgAnYgIs4mEt4TGe+LgrOIij2IhtOIjiOJga+ATLA2kCnWATLD7TLH47LACcTEE7LE10BWOJGs8Q2QDT6QLZ6UHe4QC0/JHveIjTOIg2+BHPCgHPGAnLAukDNGALlgPSBX3Ccuzic37Eju+A7IAyeRJ04mL4wE4uF48sZc+eBu8bESkADfA/niByA/nEP++BEoAD8BBWI0UBB+BgrG9hSCX4BC8ZAW4WmF4WEJcZdE+BVIjNNJgp1JipWBZHhG4RgDFIFdSI6dKBK/AUXhd6Bo/AEUgw8Vi/MoDn8CxeNMUuA2JeAjJeIUSsIqQErsSirsRmrMoWRsTSn4CygVfwOl4R+gdGxLi7EdLcG9ysC/QJmPNw0eURZOpWxsSTk4lnIxDigPx5EW9yv/nFXgqND5XUthfaAiHEXFeFYl2JNKsRctw96kw3Mqwz5Ujn2pArtTJfaj5difqnAA6bENVeNAqsFBtAIHUy2WBarDeKCVWA5oFaYC1WNJIAMuoAZcSI2YANSEpYCaMRFoNVYEWoNJQC2YDNSKhYDacBGtxcW0DgsDrcciQBuwKNBGDAdqxxJAHVgcqBOLAW3CYKAfMARoM86lLbiEtuJS2oZhQD24TNtxuXZgKFAvrtAeXKk+XKX9uFoHcI0O4lodwtJA/RgLNIDrNIjrNYRlgI7iBh3DjTqDm3QWN2sYt2gUR9AvWBXoBR7VOzxmPozNgflIbAHMx82tPbwZJFOzvJzMNDmb6fIyM8Q3M5VgDlereV4PzAv63byo53AICxLwkgUqvGyBel5RqXlVOvOays3rWmHeUK15Uw3mLa0289Ri3labeUdrzbv6yczSFTNb/8MKwIAcGwADKmwIDOTORsozG0trNlG+2VQVZjNVmtVUY1bXCrOG1pk1tcEfawH4D2DQdYP/N20SmD0zvuG/kuhhSdB/fz0IEhYaHmrTyNGHgpHDaUQyEvylEiPhpvAsgAdcUqDhBAzjoxDBamWWHEXLRUk3zQIxJnRqcWaNC1AmhIpAAVyaA7hpHlAPTAEsEAikPkuF4ArAbE4NKENRV7oFAztaGpkyLioJfbF3cbQNo6FblBgH+xgUe1gRDVZjE0h+jmFKOA1ZH2aGqUo1CNuTLdrewl6g5gToj+dRS0ckZ5JyNwz5Vguh2Wa0tKjj/kJ0Pi8Q8yPlTocrnq4hEa3FCDocKYsubQ9jkix6OMlKQVSKzZhMfyUP+hh8LpsQPaxNgRhujI5YpMtinZ4414eSNeBbw1Ls6Gp2amgIjjunapxZgSPKLKeXY1BBiz3kxFjZLCmGrd20fav4lvWoCFiF0i7H/rBPPxcbTXmpffcEi0en9a4TrZ3b29250myHaYrEbXJ2IQIbKp61FYJT8MxSGdedJsFuVe2162qscnZbu93dHb9dtt/tHxOSmhwU4liXKB6sThZdbqZB68SUGFIUHO9hC4V931S2mW42m7B+S/EEgYKUJasluMCKgWG0syNq01mLLImeKX+CQedh0gE8PQ1oajBrg1UqguHfLBI4fLvEHTNqQ01rZq/1J39onmem5XFG2PmFXDN/f7C8Zl/Cq6X+CZJlshonJDsrE/AIu0EMC9sGlTQsLrgq4vVMLdh5NKgO4rC/QGaKWGIacOw8l5RuOgcchkMH1+90IOa/2N+azrACjLEvwNZsit0UF7BcoRWCbK67FLt24V0TPbgcxG39QNk1uUNKGPRZcS7Y7J5ktZljwx4ATLywmxph7hHqvPNfk+GdpPwQNMgQwXQYO54MZiiwuRQE2xAwOQgOAqGgE/RQl5+FfF7eDYfm2jFIhuuoz9XThdADbICBfGs1rTkfbCtCEhxC5FEhFdA8I68xxB3fDFU9JZjRqUMNKcPlXD7pCm4sIH8q20pngJRErVfT2Iahf+8X8Lvg3AOBsOtwuevJxeXm2SYvAbmlbDkExXPQNDIWTadUAEa98rqioP2RNAsLylBYAMEHqJgBVgaLpgzMHbjbBA2L39wEpEXjzCY7s00W1LgT1EwRxSjjxoJ/oFoKjHPON5aDfedhXl8dmckO1uIN10j1HFmyxd2SFOnC0Vh9kVKwrAGJr0OuGlYpYquJrxYtQ2mlzzGVcVCL8swKGkTQ64kagF8j100W718Q8VopCopjK6C4i689URK20A+IJnQuzXMmR52pWYXM9Hpi04bbbujXXkyI4rNVaAWkKSDXORDJu/7z0pirFs1kEmQzXpT6cfjEUGba5thBeu5/cVtb3kINXO93sNeGlXdWDqW8Hfe6osCwCoqrx2W+Y7uOkVA5lLKlGFBqiITEw/FVPIzO4oLVG5FIN0RNBuV1nGh7JMPZTXV5Ho4HjtjKUErsFtxU6QAwTFvFtdCrDy/vjtdR1yFyq7L59XcVnfG+Rx8fNugzG5n4hSR8dfVxQtOPLXnV3U7typyHRy8KvUrEizAGooABJbOhIKbfJpjGMVh3UtTP7zGK1rIRZfTb3Lsw1r2mC4I6QtKc6cFxOj0gJi8doJz3ht3QfkJJ1wL/kAGhczPEyF41Y2VGn1I5pc51d/6ovdWl/R++PzjbHq1PH8agTYWXvDKFjYlQtx/giou9Kijc3D51Ry9CZgqZoq2SRhVnwZlZRRRgBmkvlgBUl9aIk4EYz0Ld31USbuBrAuX2cHRLqLkvaB/EQt/dhAhuSvI+lWsRSEvUWC1eFNI9VBWo8ByVBbcPhCMpx9csfloGoIYWdabz1qC15pKm5GcSYKDyBZPDbdrU6okbWL/G04cmkqLK7na4JW3mTtSQ1lp4KzldOg7Q+7J3YEJwv/wuuru5bNkSevbx0X4pjyaLxzTIFpb2bTClTaYAK5VDU4gwIQ0oaMJgscXpMtSQPWSJnFlqSYHUQjHGOGRKUH8O36cNr9+SoNKjs5XxSJ5Ky+n2FS3j8cepyIBkSzCnH/K07s6pmXizamV/7UUOgEJDBqRBqHOygXBIIVHwVooRWC7qBIzPMuxeDuU5bMWvt3V8Ap51RNVMI+ghOGnGhok7t75QDbfX+hlVr7KXA93sSUUvdVq8g4hMktX8uiXrkdWyjmawkwnROjZ/yWSORHT1kZOeOU918lDEm08fmk5fQovOZw48n6lB0JwiejPCVQHNy+Yi3nStRNdRYsk3/KCdyzDOBPdT3RcSEWTnMhc1KtuAJeNCExCwxbvSEd+EWSLpqAokpBRDybILw0GWJ5WICLUxnrU3v70ZJFQ6snWeJKejBykXDXRK7poBRMxK96reuvm9SPI/uFVG+LeyL1wIiFdJFAobVU4sITsEjSkVvZSt9hFPFAmCMGfPWo+WrkRm1j/ICLuKrhjPMQCAxQTKRWMjcRloQoArUYtA9LrztibHkNO7kgft3xgnNF1DGixWcOCk/e6DuVeL37stucRVKA/8tjsTiaXlZu7soX8nyS/8SmuVRmdrVllccLKGEN7vqCrtcczv14jfmVyQykAf3ig1GTo1M8FzhXwRSOzZwpns4LloG9+SyHQgpVxK5LcGVeV6pUQuJDV6UqZP5MkoIO0/JAKD/mzgNHlCvngeFWPrYIiGTcW9SEAwPFJGZ6TF+fgrVBZjsLkB8oTbAUODXA/7t+eKQiDtdeVpWOCq06nj9NZEmQio7UC7ockeAm2JYyQQaaNj8MbMoZqyT4S40BUhJ5uwQyw3OepOW1Q2rITt1Hg3eCuYEDuDTlIiEoYSMSjSVHju3rK8Uj2/kPfI72reEEn5D77TsyRz46rb4Fwc49qev2NsROWSHfmmHx37briuXDtZPWbFaIaLrcdcUJnH1U2G8dkk24tVhjReHe3rCwhsStxxo6p1qZ5LW+u1kvD+DTsrFg4DdfyQCrTDuzdHOz6DNoWyqXOoncD8KLT+C8pNiqE0DdeyTpqd6z2CJn5jBu8mzsXQA4U0spwOkrV6VaYE3+8guIKg0kAD1yJoh6/vRtCpKHpfFxKlhjI5PlM5Nk6lDuQUPIkNdEWaXk/i9tdWDppsyTsM9t29y+sA7BtYHER5q2gbOYvRtmZjbLgnghKmHeSXKhrKGznO7v1Eg7jmvq4svo1Wl0/E20tH9qGyx5eeVJtr275eqrjRPVcplxx1P7Cq5W7s0FP/lsU8hM3qRNNylTBTwnbYbc0a5+ldB5M8UxzyV0VQ2r2Wg4zfxR3GBMGon5T36dCTMsX4GiqF/2wXk3OhUJR6gtdB19zBwOF5L7zh/8rK8dSB8rJGolYqjTme+17uQDY7tl/rLMiR+mJwqEUbS09a55yo2r4QRFC27tgamxxwCXrHW2OjKwwyZhwJVkQHojOMhCbV+OtExBzqWz144bIAwPXJWSDl9V/AT3gt/FvV9DLpa4kkcYPK75GNRA1aDiHjMMPATTRifViXHA909in81q1XvX+wfHiN61JXFECEqzYQEfv/HDFYFFItyUjz4zKqm7ovloZwWPTQH71LMd61qsNBMTe7JemSwyHp4larXRNCn7NMfu4U+NORlgAJjug7eX/XAHRQQxoCfDGwzf5gri3/qvYmu7pPq5YEDVaz+2trZMgC7pVtVTd2HRgFfPM2kY25Ll6SOc3Q2RIFUZaVzcL54q+Ozo4NM1XwLvi2osPGiWJUn9QSdlnqyZgbcO9yM4yiNIMijGdQ2zBUHF4UV6om7EWCKS5wS/J3xb8d+SONy9jOLvu2JoP60VwkMQN07ZQ5qqpMcd+CE4QRPn+dX0mvvNZkpVdfQfhPev1V0Z36wWachYYQ3eRmvw0y5MasO0b1iibPof8wcWiEbOXhB4XAP4S+B49q+gJmXzNGTQqCDxbw5WD66y/fHrPfyuT7YW7l8KdnE4Ps4t73zz+61KxOMOujxFj2aTTFe7gnp7kgABgVsD10CvwGqmAErcCqtHZWG+BT5s+IIwhUDu4iJAp4v4qLHTwU5tngUJrx4C5XWBI23qzM6zIhlfuU7P1CPqfrZ+QDVmmC4NoKNzL1OD2aSWC06s0Wn0fqZSMduphiyNC+okatppSEAPWk8qD+oix8EYiCJd+LNRAbStUos1rq14goRTgeVh4i0l4+RWmMVWQEJEhBtL4II0We6UBxmCHgYSS+LBCQU8pQbV3TwVaX+wVBsQ+CD091vUEfaANTl4fgzGu/c4rlFhh5y2Q07snSbzpu5QJgNLSolAGsz6U/0ZOhppppp0fLAwFMVBlmnVJFptBgpmVKGECEzg3aOPJmH1hIpGl91Lks8E+gcjD64gSTrluWWAARj6UXHhQnDNuB7keTt0mgXKCeVVsHBa0uFyMaKifSUUCyd020gBEpAb6cmV5IqOJ6xtw4G2jPFbVgdh94xis61hMVglUA7TV5Les9yNoiyN47XnFo5mqwv2Lglp5uzMELnNQ8kG3j/b3t+IjFV9cFIGsHsutjg6YbFMqPW13VdIxED5cwOv8Em0DAIUcRoon26OQP923iA49DobDctXYKxcR3AKUJsEnfYIiAn4NKPVZ25AZ2olE50nWtLWP/kn+rSQF84pbKtRCV+d0BLBrgJWuQ4Rh168LgfjctiRyqQ1nj+noGt/yUwhg5HkeEy4dwIc7Cvlm6ytQZ8L0D7/xRjz0whoJnHH5CH3tndWVoqNwmaLzQysMQvA+24yGzYD4ZwCbfT+thJ8klKI0fJlDw1RwxKDKWLUZCNoPssMf0o2Ws2PfiDG3cvgcILQ38kCGuiVAMWNZtfhAopddem+UJQj4OntsYGkIChGZlSC/o/UnkTV3yEDKDJBvAqAyZDcg7JPlmB3z/NuQx0bF3Ifcg98jZltCjGDAGpPw4QEwRwfgSJYvjatCyzG8y1NlMxL4o5HikxKOlh1VYlTzj9mnkl9RBc4ahQtI0wyMFXYJMc0Pge/jcwBPdRCLc+aJU3CWaqstAufCIeomrsJ1AFGY6/mwHPahHVh/xmfX2SZhV6gYEJhinHPjs/DwX2d77BhWFhvFvVr4jSuh3oin6ljQRfvjP+b/SlEj5odhpCCi4ehNhzBhLdLnKEP7BjR+Zhd/Y2SFIcV1rgKJwye1srRKZ5bHOxzNG2hgGxC+/0+P80WKyfY+qQZdbpRXue1R2KxSl2i00ZKA6kHU43MWiqyeAPwoAVbMwHnjk+CI3aPO5jrmHJGp++vAeWjEqU/aSkkip4n42UurvLMWqP+J+riFu6uxlpQlxxlpQGH9ZjptOKfaG0P9VeAyeGC+iqds18Q30QM2KhCXhHrokaLjPkmX8OKlSFU1D81hxS/d3AKcw3Ap0SgT6j9kX6AoW0VZCUSnE4w+jhJSm5m5EMFCP4V/I8RHzC0F+INjYCIVklYlSuUqNclnUOgtEmcoeWhwgldjKqhRP+plqNmICWyZufBov1/ZAsZQGuZP+nhwDvPJMeX8cwuo6oJfX6hV2FD9941s1rBQ6n7DAdI15y6+X74vQHtP5ytb3r8nJtZmaC5EcaBSLaANCXkwDKznaqFDKRwdl7b/Pu6So1X090akA1oTr0bEENqZmibeYBhvSUtw2gilHjQyl2Q/cuv6S4630xlYF8z9rkB+ZTDEvphEaVKZmMiwayg4SIHlhApIxEVX4q1ESoY0xg7pnKHauYTLwYkOFumLLuB/Iu8D5SIa+wZToNxJPGONdZEoLIv1xLjIJNo4K0wOHhjVjcmxHSsnOjO44yPwj5lpLOwJpINT8kWjT4WNwePOXADWeUepOyYP9ByhwoN7FZsU2vYcAGo3sJjEbT06dnVOKBwADocztZ50ekLFu25iQ5Ey6luygQRVUSxkZPZCg0hgd0l7xc+zFjiS+I5iWDIKxL7EIhwrcS5BLGgwiGJcPxj4e5h42pMjDLM8WQ5Te9YVf2TORuKL1oBck8gYY9kPWfPh55ynVii+ZI6T8vOnXgUQWJAINiPj1rkcDLdj7xI8xVSJI/NNdT6bR+QZO/q6sRMc7x+CifRr9ksSc57WoDOisla8Sm+VicLG9W/Wjn2SSQInxS52bIq7igDSTqCiS6g6VHv9GSh+Lb9KFgt3EbcE5lf6pSRWuDNsnzVFrsLoectCnXeOq4X3Wtd37AxxkO2o6QBGAhR09CkBMpESSRyN0OsDQBsIWCXWU5qDWewgqIxXQDp7q5uc6oYaeCF6zpjBCUZKGSLikTk1DZNb3f2khif0PTQCePvgV5Ap88EtMcUnEsBjxRbl4VX78/181nbbsAnR9pO7l1ns+4dY09vyk6xNJ8uOKcyT8X3j38KQ3OMgMhBqudT8NtadUCaoOwAiFAmttJC2uOHkMFtcGzl2JFqHtf7iaR6Ee1CBYFfz4TmjoWh1NwhNxWnKAdyozJ3DJvXD0O5jvA/UbJ7O2zR7j/Ma8zXWelB8Hxu9VnIEZ8K3Qp7FU0K03UoNmpzm2V9ewkctSvh8tvztZHP1WcN9gTxJMBBXiiieN5HX0qAX3WdJmM+Cg+LXLLHUMM9J4NZU0EKDQ5y3ZSXaKnUwHeVGVcW+O6GuWtgWa68FueXHPdCv1btld9de9DVs237UXFSFPu7C2uY2a5BZpyXzPt+HE/PDojq2sfzO5V6+zitZovjspcwG10LYGLRyDsUXeFKi3MbWuv1jnV1mTymNokNXj5kyegqNFKpKiAH2bwMAB+jQLxqlREBxqBU4rQuZO7Nw3IsBTeyICjSb2xEpzCKXOuH9doTUNshIBYRghJGAQprcbSgwtnlWe1jEiDCSUW7pbG/4lNn6P9a9b2B+ROjE61602C3dJuEmRBMAmafG96cuBzIpBn8bcs5OHfJulnFHMDqImCr8FPE019EJolMQNWebj+MZgdaooJdzqmaYUAxj8EVvi4gte1c/Pv0BmhKSZeipETqYs0wgMutcyaWGzQcNoCoU0I4zxFoTcm/dmQXdCSIOJGWzxZSV8PjSjyUnaC8qWLmSJG4Rrg5K/v3gz4kHcDkl5eHvGMDncEPfowxkgQqQT5mJ/PE27QqW1cQlV2Fg5L7h8VwqMyUIgZJS9nxfNewC06r/osk+IKyHWbu2QEc0ix2rrUW/m2ClM92zwr67lWnsuOEjI2RPNKgLrK9gIobDYqVy/rKxMn98GQTE/vv6tTo88CuGgHf0dlTVnXmwN+tijuS1roWz7DLDkRm3HOZxzM52Vc2nizruHB4UWrp0ZOwDgEu0h/skNdMNDwAx12D+iIWCajOMqiQYOwJNJhmAnBcO9wKkZQBWKPr+1bM5cOYHENjJ22vnLstPaVCU0g7lPud7tFppO5waQFjnIpfszDqTOuSTivW5XkerIsnjSvaGjIitzG892JwZ3cgO6i8c81IBKRWncjRQluGbU024NcCuNUqXf5gWbskkW28kBD971BIf2baAQbAJ5SjmXJqvLg48Ojg4gw8UbbsDOnfTgMw8rt8JmrjRpbeXyCoBWbe/7gBdPk243O1n1bNRaYwQ8y5GcMNYtBBL8FO/9T4Y7nXJebV/NIp4I+52EjYDu0B6l4gMPvKaq+LhSuMUdxE35PjcwYumtF0mKqNyHpjR4uglKPRtvex4WWLGMvJkqC6j48dwwjyWAxsGtiBLMEW3OOiWbKpZuVqTy27tLYK02PZluf9ZmJmDR3F2c4EjQVKwm75MPbusDCmQm3+JIN8OZqN238yGmXxqt2zvX+uMfHWQCSXNvSIMg2qnlU2htZUhlD6DuC4Q2cSGl6eOaT7Xj0cD2XdgHt5/7PGH4j8HFE73l/JZ9miWbCWm8//5Hnrd03uczmEBhI5O9/f27WdLYMMXGlvUbOToh11ztPEsX7zDLTQz7XO0H7+ygAm2xwzomNvZQQ5EgPXfbmD7+yZOfjR+UV8kWINsavhmQ1qMvbClbh57CRndTbytt/t+IlUM2cxsPPBrw83rbYUIveu0shyQDbG37gEOgv/NUZB7SrdcNOiIz/vTx4zP/i8+OqiKV01kK39MSzxiz/74i4ByvAwlB4LQM96HxCa2tJ2Z7P9y742U3IKkc3JyHDolnzESo9pSEqfOAbgMYPEq+sVD8goApBR5iZ0Th/0rQ+Qo1KhI9XzWQmhG6YnYJwBt4gtvZX35E/AbsTJHWAssmANx4d5Xlm8xN1Oxx+sLOq8sxlBgoPgvxUzDKB5+jKJV4nr8LCxaX6N7DpJ7h1MnITu+rLh5sas1ZDVppROoChQ5qt/Hm5sW1XXAypIkk2TCykwqBn9wWYXIGXau7W9ZVwu2scKr0o7Hg1a09J8+jVJBwFNn2OyucEj9xMXjT6WZezTSwCafUbTTd3eFgiFmVp+5FAU04C5BqkjAj2hYfuSG2C4WsQCHdQbNzcONmiGDe2twRmcbcVzlPOz2dvavXsFmBBFeBiDhmt7K2qiAKw8RoEJkh5f+V7NpApcnTYxo7Crs00VRPIx8i6V0gS52b1mne6MdttBzpvGZt72dkoMM6jByHgkDoBMIjj4Z5Zm6bsfOJfWOAbH5h/oqz8M54SQVoec3oIrBY+4qRfAJtZWIuFKTquOcAZby3OmKSTaKXOVvq9/ydsQP0nXBwpuSuAFupbqX/WLHUB0qjAyLZ+3pnbFJTSvtAMypOJ6nEElyeYDwlxg+CjU7fDVP6UuoPjczP6D1oOkVQVV5Z+nkepPSpr6Dn2/XtCE1msNbJSw3XyNsdqapYfZ4vy9VKgcB6xBXZTqQAivsJ54wxQJM7AF37VIPoUG9eU2rYQKui0A9zMaHShvtQ3m1TZUmfDPRoi3E988P9DmqjwV99YIg1NAMpHVJSLTe/Wp3dx6bajzhJ73ogv5IbLRDB9BhWRhYcRZGv3JYJDZyVSQNltW43IxhA11edZyGx7mm3fFdYxlR28lkgdRfM+5krv+JkWTUZ5bPzT+fMzUpr5pTK5PwapRXTeY/Q/8SPV/ZVrr4srVAreTIBbZdOrtKNiyEvvB+nDtkOfGm6zp+Exdfqoc5PI3k82P8i9VXhqm6V0XHMDRXVD1Ah/Mb+J/Q+qr2sjbqFvTq9ubph3Lt7qgpxw8wKPRi634f1obUcLKtmojKN87Bf50JkTFTaHJJ2EH8KDP4QlYHWc3o/YUPU2tlbLPjynfqo2tXMxdak1elHslskjmEkcQpRKbRlpdsnq9nTv7/MhttLe9VNOo/3b3u7XhvFYosW7f5zq/POMv8lTeLGL1RhroJoCYuw8DYXZ9a8hWwlH4OGW6WHB1+0PVKrgoZ/zAMjL0kFL2Y5n4izhSr5Iymmt8Hoqc7rZ5Tbob25k02c7b52ekb4PuEGv6xLK5bpQCqLkleLY+jqARs5k4LZN+LSBXssJ1usPp6RIEhIORUb9MdwA9xX2xpoOygT85EpSjkIBlFTl/s2P+cXPo33ihjerxjDfHR4Jy9fu9WQZ3ycya1spDKvpZ9wRLveYw1tFTzFMyzKYOogdg/v7Dwn2p84aI+Cb8g99hCqeTvo3k5PvDI8r3aTIiVXp5f2GUZS2+NBY9PU6nxTU9eotMgEhxlZ5PjA63QmoxikRzf41DSVFk9fSmmehDlHVWbTb2LGP5gRBTT2v0aEAWgSe9eh+SMaZ+eIsDF7NWdV6kqKoqajB7l4Lh0n2tqJx2RhXJktGpwVe7nNFq7aWJG1TAgEAoCjnrjAbas5Be8myuMRoPeFUhvpjc8pT9ux1lvqMb091AUsR3QeZNElBVzA+c2Zoe0ErjJlQqTQ+UDVo7aNIdIH54RtD+SgpjY4xpcJFo57Jnw+WDrUUAoNT7X8Djp9Jm+wCCHoDou0AJ5sjTncGxpshtfeEQhbL7SZeZUYT3ZfUkwSxHG5NAEGZQJNSIu7X9edFp8MoypP63hmS+WK7hMjD2JnK+QpKop9K+vNnWVoGNJrZuTNBOljPj9qj1Y84j0jAwuZYRjsGlpskyg+4DFbQrV0YIW0n9h7EQKucYF1FqjI1EKVDaBc7W2+mxopdX6QggduaFp11N2ek0uLImtCzfN/oyKGo//jLb4yZ3L4GDxsIkaklZNawo7uPizPiQqZunpon9N9BQ8QQPvVyQUXKYvSF1tNddo0b+2sz36gII1HakljwleeKESuApdIZvh7Si+vTlIynk9hJ7s91KqNTFaaaJ0VKsNAR+xkFJLMQ5bT6Og4rrNp19Rtrc4Z5ZnuWLbayzdZwJ3RqpXG7OEP0XJdTUCwHMrMr9TZuj87Xu3FjPJgeqT/nmijEZM/VnHS7W7Mi0rGvQZkNJmai+k8ExO7VnFuwyDpLqtamIdtiXxlmdIi00knRnaUtD9jbVKdV9qVOuKO0vItsodgR5wE7tz8lERgZXAWw4ov9LwsYee8h9Qmw8agNWL/K+9dQaXICLvqeQlUJTKKXFOE26e35d2oAKcDhynz4ZGb8v42CzZ/uEExKjPtyOsDfitDG/RLKcaN02KoyG44hg/K6hPthImDmpZAAZzA7XNE5hDKpFiuTK3pz1cD522bnaC0Kn6NytNzO+ZnpQ+teWCYWwNHq2dJiqlWqRrYJS1XXrIqt5FqlE6x+Bt+zVAU3EVz3x0CKA6XgN60oz/NTuA6QguEU3Y55pOune6iiINsj1Gz4QzZnMX3i8638sCvlpyAJ0+5HXPn3Fa2gqim7z1p9a+ZW4+0Ifgem+94lP5jLC7N40cdLHBONWWKfa6bZ3HekdhIQuHeHRT6JQIemMa06RoNKb5NFaTG+QGlulwI0bpIdEBKm51cFBvApVFkL+t/nzuqgUlo+RYkGoSHTUsr78N+AqJyqpmNXxsVe3se2z6nxjUclUGLz7N08URhKOXiPiNZvdCIsN6IwN3t6HJRJ+ZddcZcpfw/Z7+e39h4Hrk8m2TP4sU/mFaadJpUmf6wCjfLnsSv2m5a5Says0rHQ2uXrR1f1rhMkMiK1etjWQr7IUOFbi0rlq04yo5PWa6aqTazjz8akgzvmpraCRNlFN7VV/IcYHQ8hpybQwZ7TAG2Ixl+3fDNmzDYbgXoIz8g/7djLuZwfRqiLO0oBeS11RatK0gZqOYj3pSGODUmgrSi1aJ6LWkfcYWegD1dUihYG1U/9M1Eu2aoXt0+RDYlDx1cOLuD8pxQbt67d2ir1kS7bQgEl78wMcEeoq18l7AVIbWVnnVca3vErGhEMylma3fn9DTk5GmxtvIrL0xNwPGbLRlZtLpOKA9Rvm1beWMRHSEK5X3djyxaRguj26mb0dLLXJEPReflRTcW6mVQNG8JBH5+SvZ9+huFmm3nt7AG19t7utRN2IY4fRpeS9TQ5NeSVgS2Sw5u24qtofgtwBQxhfI7AGSGu0ya5pRvqOJO6Vr0SYyjA08AQnweopDQTgiFIreGtZIbvPciUZTrBT6Tg1QVlU+SzprOSknZzDMDVclSUo+BAVYtawBcowws1C4MULQUWar65YKUJaO+pKpYSspQi8gEK1WZeWzcgJ3KbiDum/RjsXExCAnc/oB3Vz2+dGyQSLTmhSimzavNZ8w+U/NpJvnUz0MjxGriyFCoJXESmpr6Bn6cXTi3czvP2gY9Y7aU7HSMMG82T6CJ+p2hntwb2gu6O6FQVE7uxEOIQlG6krcdJiMax/rGjPkBYYHUR1ogWI0ELQfeRMrbI7ZH3tq9cdp7I+NxXzF38d8yua+lHxImOFyKSdXGHDduBuJKZ9I33JkzFTUS+zrRkvUI4CcYEx2PINpqHmbcITGzy5LydrcNh7vf0A6Fqnw7TDriOnAwI0zl08HoiLo1iIPrQtW+3ubxHXgAMxapvNNMkVcaU1fGYlpJrZjyzMRAKE56nXz8UJFbNEWaVjzwb0A3ogW6zFf9lDFK/6tMnQAdj+HrRrp9Y4A2H4px48gHHwGalhZPywPR/23ljHG2/hcN8mi5N+xjIa0WisV9wLl92/uniwcz6wQLHSnPop5/PfL9h0dCl3o/4hOzJ0S/cSfgOwW/eRPm87yDgEy3ok2CSZoVvQbeFOcJ9Ez8BokYI3sUQ5wftgOTY+yLdwEQrbkXghK6Z/v0NLxz2N0oJTdgET2+2xBd8ERggt0bTmk4InjUOaz18UAKfwlZE0ted4017LEMrPAsHdak/Gvs8IiCFa/aI9fsVpC/xq9KDGm32aTlHzUyulU10Ya+FiluOS/W3SGWHi8JTqOksPhinGVyjPix7ZfMPZurc/7FQw3AqFb4Hi4cknrFrQUJyE1PLh+EFSWa0J26dHDVJkTYwCtBdFyd2AWUV8iq3WPMAUT0n8ZHLRzmjsDbGH4EwiUgBMOur7HP1RwWbissVHdfhbQalHLsyROWd335Ku3tieMbeP9JPjXBXSjpkWfLGYbg8Z863zQvz0t42OaF5h8fsJ3Xa5eX/x1p4VyAaFuL0CLy167NjwCirc2tq0VkyWXnWKggH8SB2IKCWCgOyi+Aeq7z80F6U23VGibHqqu2vM2q7UBnN7Zrz1aCVq+7rDjMNSVLEIN4mjWNhDpEopOPCt8OIBCDsnpWY2DxZgKV+A0Pg8gF2PIbgSaelQc2deICBqUw/B5BY73jAfgVfNahIrC5I5wACO+IRuJ17IdI30y793zAgcDJWdwx+DurjzcPH8Mt9Iv6F3C74Xme08Xao5PYBuT0EespGu+ILes7vBvHGqH0k481ZXiIktxFpTriArGPCIi6Uve33iaCEbkj1EuljZIELAFJ6UoCTEByVRFLgYgqG8/cEhD5EfJqC4ipX5xBQ4sFzaI1Qs7PXBqfMmqawFQAC4V/79qf4ANJfy7vUwEfiZNhUQD2MglqWGSFutx2g0Oiujy/qOAYFrlgbmCfN+oipCXQpk2IEkTpps4Sgg7HUClUsmlTySLfFB9Ber4gLYXvmwiVlEDBJuDFKkLH7EkgK9va2p7USHXxrCXRxqSTk1UmN5LiyliDgSxIk42ZkrQB/LLaALWUFxmWLQmKc91K+G7+nZAe+MXgc8MXscC4wg9X872rodycVD2bzmWlrGIWRh6kYMmnu+OVzH2XZ6nVdH+2rWoSCspWRf27hMuF3IL9924hMBuatFXb+0MF1IpPDE4ERuxbnn+w1aOkxDt2UF/mixVHFJnuAksLwhLzF6WwN8B+gE8P8VqPkeru6wSYDoxAl81qHcDwz0AdcDfvPq8bvoBU4TxDkL2QXl02supoUTG+CeF/YivwHb346D83uAqUtjO616w3jB2GKSrChNmHkalolBpV4c434vytEq0TnXRQgwWlHLe3g4sTm0udKH5RGyt2JWzCUcotCtv0+BmTGXxnbkWx+l552nS6Qz/28zVilb5jOtEb0rWfgZvuP+5/wJLtyrYE/3PxwMqey8bzu4ZtdyQOjDxb7XUY/2cGP/1IrpFiEeJ4fQztH+j00f5R9qNd+xAKOR0pED7Jp/pvBLW+3pU+agU0TFFPDoPYiGxXb9/lFkLo7tLVEidvt3CH/WB4Uk3+u0AUbUjpDRUGggFKOKsLWFX7iJAPHKPDLcug4bvJNgNAI7YBPn84pYmY222rBtQkm3kRzKim86G0mhXpEPcBDpyW/KPox2bTdERNDZTeQUBZA0qD0mtq0kNdpc4uEfGGKtP1k0ppBwlj/DbyY0rrLnj/l83lWUb0eecL+Ci4g9o7HbZ93uVvl6fB9dp/XO4Ghx5/yoi643QHFw1bUTumPXcA/6x9mKi7V0Ji7r7XOanZWNIHkw4EI/q289a0Z1cWx0zNu/zjfDeE/IVnSLkB7wD4T5iVHXZ0kqDB5umEBhVWQ5zdkx4WWSMJDA6UkWgkIcme7ATbJVv9Tra3opFnSfZjwrl9fJZMs4KjWYzqTegYzYpGEkRHdlmyDd0x8svYxfTBtkVG8snvk5NClpCBC8sDAlGtJWQBb6qYzZJI6ClF+hCLptDvrrMWPFKoM6Z/z6aY8o3G/Z9qDAenv/LCI1qv+eq1CUmY9N4Hpo9704Aws+MjPDWUaUe2sYbwrIzeu+bfqclgPwZ2icXmAN/nU8CQPzNkyM4wg03HzhgcO35kHWB67NnB3NYb3ukrh2oEFwypgcNBNT4B8mvxl2i1LrXUiyxqq7lMkS78IJRKhD9QpWCALCQXpHYwG5x+M/fPqtj14GGPlcCqn0YrpYdG639ne95011bQSAenMEQfy27Ft0m3pQ+zKz+/zbItFq0LbO2cOkB4iqhorwz7l2NAhqneL7KfXt4iBR77DjNMb/KShSPciUN/TPnc7f8bAiGfK3+wqA2vFWdWPIOLgQdanhHdt4ZXL3wcYeXbHa7xwVna4DF12E5vN4KWqsPXhLzE9dv6+2FCooAkCLfISW7bXyaXoxMw2mGR93EHvC86GNL1K26aJSBHzfqZn4GwmI7tpvRT+ynd3BujyP+/IM8hR798GQX2vwcA4Zh3kohgzGSISrpJog6ZjAFinxvmkCa8LMVQFlNGoo4xxsK/Qj6GVkx0a/Rozq0Rf0k5VywN+yomsx/7iqXu0qZAyUQJwsqq8sqS5wN82e66j5jfMR95RovfLYwjQMd4XryhCGxltNJ96jBGLyOmLrkuzUmdD7UFsbV5ykPsd1rmJYP9dM/STHbaz0NcI0uL/BwZU2bxQ98tyMyL10FIzf0s8JfQWhrgLKFvqxC++bFxLRSu6SMzVPZRs3xZ5pwsnCUxJfrKqv/nAClIT4ekmBmvGYyfS3ZMTJaLpqPArUbGzgRmjCAU5wniDuIJC8WaZ+XzdrIbzh3OPFhUr1B8cgfulIQEociuLyyIvtkFvKgHRShKSKC0vgD+px7+Y0vY4ffa99Vmm92IjPM80S7UBZsjdWSUX7GNjZuihllpDPKZp9L1UDxRWv27OigIcXScpqXRHXXceOkAkd1YBvO46In1W0k/XvqRtPXmOvD49xGWnjVSXz/I1rKHt012e4qgHi9hOfWuwZltLoCTxmi57VUFRIiRp4VNuHrfXIfwno3x8WnWc/Kpkvh40HshGqUT9gYpto4YuoFx74Je+KO1y1rQU15SQkwXC7gHpqnSfYryoqhd2DTCSnt/LkvN4/qziKtQysa2LepgZ0dut96aHevKAd60x9fSoRitNkbxgWdmTDqioru7AixCEYzpGja62EnqxPZfshjNng5ldDMW56WbdLEWs7pMTHdb+UrmcN9GMXWR8SdtKGYXU38mvMbuHK4FFgzUkx6LPTzTPWgdj3RPEFK+2VGqeKiQOg5AH/q2AX+M5QVpg9RY/cQR3ARO8fSNULCypgPJwgJRXLJZQeOhAvOCMcgXA/wuLTwsKsQMjhG4W6aF14m5njUcLDDNF8flm+WvO5ZiOoH/8NB+l2nWsvwZ/d+mpjZqwIJtk6HKSijY5A6wHTeBj0BvK+Hk/JB8oGEG6t0175Q4pXpADYT4iQHVVcOolINMDRQByTMz5RBRQvDWIjI1eut/HzCoDL+7p29ilNd5lZJKDlQeUDRyaheWIOpqoSUU6uocFuqEN1+7RG2ArycsCd0bumQ8oeFP8z0LTHMgEgHfhTlzYQ8IhOyqZ6tBHq2Dpn2xFXApnU1ivuv19jgJ7OftldQlte5RHqSjeWsnqWAbISE/o9Yt2p20h6Y16ChtnenQbwLZL0lyzsK58qS/FOfLGErAoJTkeDtsQEdn7xzFv8yzVggVYNmdUoLQB8yekhOIvqMfvTs0kP8FzAOPpfGfuM64fLfnz7kOz+c57I8ucy7z3pzvhicuH+1Wh2SGeZSa6ZRKnWmpe1hmCJRYXLz8tXAACbdfuNCOIEo0W0cOCMGyAFoTobXGuoFkXecuMhcyQ5aTJZ70aZlsmu4paHu8EjJF5nXu1iTrhprWJgLN+Pw5W2Qlw03gSTitBSY/I/zS9QckIQYI1/R4zx/juBkRvI/H+FZGzHYtjoSfwMmsROyBQY0GPF+L2pd6NIOwxj0JM+kqCveuR7QpQQS/MSe/wT8CWO/b0xiw3Pmagc3Yh6/5BSG7FNzkHLjcOSNX7BjdEBuNm8GZG27i4iBNZu8CbGZ1qcmZ4gDnpqCcDBffIClu5m5rJMsr/HNOVLMg+XVcyC9NmIDlLvVFLtgbOHPcCJZy5/LHLNLSYw6YO6NntgUh/ZPgJGWxLgkZBy3NQ8fipjU6fhPnECkWisWRyPRYdbWcqTtjpoJhEghOqKoxucm7xBsxIeBm8J/xMziC6TDv0tg0q7FRSqOi5hhBjLmylSoB5l5oyG2EfBPHZMTEwZ/ibJIjbr+HHDSZgk3NOKefjfTm+N6BXry5NMK7aYKhAd703FbzlTrisXJjlmneyupq2lzFt9nUxcp48oGKzdW/9NIOtha3prmSzT2KPVDf+lYjKUX1dpgutiH0/efLTWRz8eOZk4HxwaBqNc1UIYrbO4ohorRCFKt4RljNoXGAD+ww7AGgBkoVV839zQEdL6lUlb0qvKXJ7GVOSZL9kclIxGylmcSseRJGJgdK93e3oaqvF7KAfWr1DZMa4D+FqLhMMz7VRLLf5JRQwjs1fpJ9jl4OUf6S/Wdp1hIbWr9+uYhuPwnq/z1M5AGVjAOHjvh8Qg0aGV8/RiNupYlE1KXUsKFtJdLGWD1h3QskGmlLikhbCnSLdLQL3WE9SyOhIPn7GtS8YqliHlXzPkie273YbKnZBwj4id9s9LPKe7MTA6Aeb0YaADU0BX57HsbxK43KZsF6iyqNt/M4twFnOSQSU6liMSTHPk6Pd02Rtha6VaFbrXxuijD9MVbuWDAX1vK4q9LQ0eSsWDTZGtI6uYh6a4dhCF9xJmyJbfR7V7nzQG8/3O3cDcsR9M0RzRGCFUA00vXUA1S9QxWkqrx/uPJ3cx6yMGL66XqHfOgq5fvsEroe6rcwWvSDKgc9uPrpO+UqlG+zrV9nNO+HFOwXrtL0DvpHeLqe3o826g7Rv5L0KwtqmUAA+ZhehbQLQuYrao9O8Yj6iiQ8wO4zJVeTTfdDlD7hm+Evy37gWe64hLr6eVfu+qwa+0tzL4VXOFey2wBndhIoxFW+uUNGAxO+E3NriRQmhVSbS5SR64Zy+fVD8+GfndiWnVuNBpqWmJjomBYLqkWrRtM2ZMRw8zF4bg55/AIuc9wWGBuEYQP8Y5y1yzhJ/huLHzC5T+3+hOJF67n5rr/EqZTKjsHG7szkbRrNiAEzHBkdE9OiAejqrKzWcnHZ9et984gfCUgChZBXSwRMQKifAY8kGIm5glUhQAPg86lSM8smJ5LZFA2ZaTOz5jBtGLKvzAlt0bRDvDlMN8bb6+Dx8i9ohZ9IgcZX1AY3gCDDuhzLeLS/CK0gZB8/aBhtITVhH4UhtPixHoIQICKPWD7k/12ZAC3nfvX57j9UTlzuDwTlmwqytv1KxtRKMV0acpayIDuKlqJpxQCfzmLlpD05GsteSaaTokk0szRMF8Ye04rhalB7faeuzBerPm3+go7zFcah8TlrA1cFrVqRg3+s/YTouC99n0qfT7JJzfWgW43TzST6uw3Qnv/yr+W9ft+k2aCc+54LEpXf/IayiXn+gK9bcqJD7S3TnBKofUkLBtP8saKfSeNe559NPTvvNU66Wmy5n74d0XMACBAtRYV7ny5Hi5duA3lsLe2nhXnKT7Q8dh5tjKaVf1CmyPOfhJ/myULK/MIUTc1WgSkyjSwk0SaFkzQSIEgo0w7DDk+MqZ2cGx2dR/7HmCacBhxn1qHHtDZweDh69ybk2f1vuJIDYmGMXLA41SIt8dmrcRIhGgq3jghPbf9X+e7dTUwnbRURkapRdPfaTXpKGhYr901PwwBjo5DA9+P7+7fFDbuC1otjtnkDeXYka6VSLIyQeqtSzVPD7j0YJRLCIZGlo3mV/hLpqTKJTLLeslUu9clShY8fX8C4XjGx0qry8gl2N3s0MytK7u93bfwmp5UDWLD7CeTCR+RJ5ImFhRMwu7KwgDwBVGE91dU9QpWxABzSuWics5yvRkZHyX92znLKdNUdBIWIjrEL1C/0aghAegc9nVVNFwAz7IHzMZEnFz6eQOLrv3TAY2OIDmOhA+bMhbZlPrUaTZ2PwIy8RacxszPN8v+VMpS4faM0RHKh94m+1BL1HBgDhiIkH8I5loZpudEoTIF3VH0p98ck2Kjmg+3tYmvqfecsU5Zplm7r99WxJASYV1ifcpSiTqH4ilMavtMpZ59pyqnL+hr1lMbH+ZQTX3NKwc9JSB9RU1785CmFD/oUUiqcS+qod6azj14oRZ5C+zwGMxAULiTxuEJMIyZMw/al4GOahVnNIc3ZVU9Bs/w/vcwVDEVa0RTNIofNwvroFPy+MF3H5K3jpbx0YLzn5kbXO7TQ3YAbvcVBT18zFPIINEBFIAEkBFAAPbdvkgJMFQ8G1ANQNU0J6HoIqAGkH+3nEvYFmQftM98bbB68t952EKBHBweqXQ0CPx3D/Nb088S6G9Zr/rpRMcxqR6xOWI7UpjKdft7drbG6ubbQwulXzG9fYVfEP1D3f7f3XQ9mgoC9RyZ+Ls9EGm58Zb/W5AMni0Ic5ZoTMzWsdMLq5uuP/93+7/rOLtou4HN4Y122tIEid24irpySjkxDLqbMsQWGIvd+mu0O52RIN8ktvpf9km2Az3G7rCQct8i9h07Sh+pJE9AsvafI3SBgz3nVotJQtXmHU2xSzMEZd+PpBF2ALgFVKrPLybWbA+Gu7DnbuiWNrLMtT0QChTPLFDeXAZg9972k02Mu4fIMlzpUuEtY9Qi41KHGXsKpOi4Z8nCXMHrSi35El4hziVqkw8wxCPg8NidEb0Y97CDODM793cd8QzR1NyWW6b8ulisGZ4gdqIdvXKft9jniFHEOBF9sY77ZLETPyZCKnUrrnlhPWT9Zt8LS9Q2COLcdgm+tgyA63sJ8wHb41CmRaZjeJeAGdfTWrT//FKCCsD3Y4xjpx8tbt4cp9HNfnTdi5adPD9h+PTDol/p699eOzvT8jz5UKOf48d9+A189CJtf13DxTjZktli7G4dPtiZXe12EHcvepi+2XJxe8QbheJGXn9w2fNLd6L5NQ3zSu2UwjXXBn9Ky+ryVcrOqX6J9OYq2wwA/u9GBtH3gqycas2Y58Ow36UsslzAOFxYktzIerQMWLG6Fb/U6NppxwrFALE8RAjKf/Jk0dcxpyZ7SPISi/H5xXnJpivSZzKf07ktmR+0KutikRsHC24lQ2ZEI1K4xKHFGNnTgRPff61yds33/tpeaYznhZpzm23uB/544JpTs0875JGYuUy+anU1elClhfuJ4twM1a+JNkXLUz92CWbSrvhxUAPlfb4si2C7x9x9KLAsW2QRGV0XGYMesGZ2WnQz6qiDU0Tcf9clWqrZsDYBWIrbtgBoo1rLEQj42NmK84EbutXjbXwAE+Asmq1hdzt2MVYxu566OdNQo9Y+87u61kKy7rm6bGJzs7laH0UdN56df1tXWpqXU1AQHGr+drfj+vZVgqAVGoSei20nT3qnL/Y6HgvV9xmHQYXrz0s3TzKOZ7wqW+/MksC1sxwzyhvDWk+XeTVXet6dZYyXdgd2HtwlzvS4eW7AXO8fuoT0+0DXwHhOOg0h7t4swRaVaVtrdNeMw4jDz5ODBcNnAwC2nAadpD2Sq+ln6yoIsVmRkmz0+Qps14bgd5g9FRFIszd8r1ezlBGtySX9k2+AWYRLALF0qZ9ZFfUmuRKrF3ORAJSsqMlDby8sdZ0D9PbDGEelg7ZOkqQzCMsN8Hn96bXyX6ma2bA5tZjBDzy0zm3RbGqMaeyrrVZMOpE2cScM01oCdNrxZ4yOUstdvOX4MINgbNXrvFkOlWDaPNh2kyjvavWEDVe+gp9Jy2vdCT9Cm/y5MWbN7ABiLs7DaRG1SXmLecVeyXEQVEHhRFmCg+lANzvsBWLDbzmX1if87EFs5OhYQnpD61DnJ4HpQB0Jhv/xHOeXnj5pwn0D5+5lNu8+YSe+KGfdpdEml2gGiIoXsKO2mtVmCyTrtrspuW/5R+Z8/rLIyUYmsxq1EKhMrPh6YZveAQob9HJ7JGFV8OWN7JuRRRre2783laqH1tbPUjDMZatNr1kK1iWWa8839FvvRVfCSa4YpK8OYQUmlpUkQ9a8XBeGBRtkCw1ViJysslLEc93pTlMbAvOVx8VRE4rJi22+z82TUJ7H4E6r/hyz5qvup6dvdRc67dzkWH/x2a6n7VWt7fyo8RVtvMKQHIT118MUbEJywb/JQhcMvYgx/Ch63vtWDN1XLA1KgaF+m8j37nYUy0i/F0FPnfzyrm3EKlepW0Tp7Lb81Bf6xf15ZPP7X+MkW0qvuzfzI/gzypNuH1maz6XbMhJ3a0CvLLYDF8iujxat267qYt5ld6+wiOIg1utu6NQ4EP22o7w8wgH/wlRw/woqbFD5lt/O2NItc6G06zL2t3D4Q9opLnHPRaMFPt2xvs1i3rY/cFmDQlcPJJLY1m/yWDBqSfY5wxO3HAXcCBOls+/rKXavFcN/jR32wCI8eBYG+R4+diatdnfv6ZlwmXHidexAr+vpWIGoRjSI8BFoLCIsA1NMubBpG6ZkB3c+KKTNr5dKKzzvmOkrKxIPmm+2Bv8LcxvlwL8cLcRz++BF5Anlc6HFAuBw+Dp9w0zMd0JudN5+b+eleaFK57qvsK8+/x28bhYPQ1i5sD5ykdovtMehiMU4J/CNJAsDOfZ473HxQ7CFSU6rfSoOz/rFa5pFpgROJfM6T7YhCsFAoZFCXhocGicbSWEvMavxyDhx1DHDvcaQKCgSo+vCCLH5EiUkaDXmcgXCcRTEEpU9UapIsNjmDFflQIirV+IhEqRssUEZpcMuDrMV4FTNhiWsiiMXUmCcRoW1DFK94W7UgJbS/MfEqmnPIh1/Lio0V3LZqkOBouwWN3Fgg2CG4M4p2j963lx3PdGZHyUEExiQfeCZ5tCrcXzhmbWVsa1y9c3VTV5NOs7QgJQaw4EXn4C9XVphzEAwguUdwxblIYh5Rsljib/FECKKWeDKPQSQlLh2EHn33g5WVSaIOefSon0KJJpZW+1b9OvpeHGRWZ/tPOw7/d+ezMvYwLYrVSEiHkiSICATtpstrQQRKgxD+0YpVQbGIKiqLfklgUhYFNQKeG97qw/2RjaAijwVpYK+0ulq2Lw3UVV3LCSGW244tAbuk0wlJYc9tq107Xx3bgWDUMHkVhYJkACBX5IEIX6sjK3giqgq9m9i0Ad3EQIL/ikqiMdX0NtMtOYxlKBQGi+SbVVY0xm1JPimkmZjBVjvK8+39vmIQEkLvJlqY4Q7G3tfXwZUORE17Gc1VUCXnkF+/TgLp/NfJwXxlzt+RX78qLn07daanjbSqabVpWfOmpxQW9s/zv8fFpaR+W5+5dqBt7HXzGmEpWDXJOmhLgXXC0e+x8clpk0s2GtRbY1Zm+NZn/5TCwf554WNs90XXZawbaJ18cAcvWwkmLaXmzqPfYuNT0sb4tlQHsNl9kSs9A1XPippcSTkeL1Bn2ER/CHRdlEGvR0XZrbx7nCKIz1BH2wR+0Hk1dlF3L2WtnMT7X8p55LdvI8KeTwj6+A3tEZGrOboFj+ITYFcFFakgKJBUhStM4KPwW4Y0OSd97w7vPY4x3YUgyOBwZfpZO8+S0mGZExbeZYo+sXf4ki9Yv6gGlcL9Od3te8lZOxO7RO6sIZ69jr69eaCbTeJSTCjXS74HR//MRaXUuF33xyP+RVKLkRVt26oRekQ/VVAVxVTkvwi8/3XwdENna7A2YdVSILOm5njt8QUVB4TJaqPMEIzSza7cBM6iHu2GUumi4MSActweJS4KGb2xvIxYjt2TRJbkhvLUiEm9wwSYerW4dOqMkhkWTlXfAKFnzqwPBW7mK9bYJe+5f+xyivslMDUesTgUBPfpo4I2jOh/Kc5zb9c4pWR3FHs0STySSzYNFXs1JCxe1BDVLl0Iqfsf21ZBrym4evbflJ7x//KvAeFeh6gton2prl60Ufj//5GjRAlBP5L/oPxxBSrqS0cm4n0ynggX1XheH/Gv5kKQIA6FxbrkZT34YgqJdleWqoGr70I45433roakHZ/X5bq8Nl1lsAOuFrIG7q4Lz56/2oMX9HZeT7YUymmpjzeiQSKuIMlPWxWahE7C5if5h08gCEeAabz9YIm1kB0RZVe9zg50mWz6uzGP3g8iofjA7M2OsdPBK+QJYHR+XWBUn8aFudhf0JtZ4+sJDNiEgL+n6i+JkIl0koiUFf4jL/WvGL77Qgqh1iSaOWOR+NSUvzNvpy/Lb42ag31rbGalZogm6/ufelcvP7YY4+uEWLmfaig44Xsib9HcucigNxO6IwlHSq6sfTn2uzHz848W6W89IxHO75bZuARsikpPMmugZUEyWt3Kv4BXIvrbjTs/Lt73nfZb4hmbs4m/2fuX8LrNeOJZKgDz6uPOhinde7f3vC9uX8Ld1/m7pKgESSnJ3udnkUIXR9drarbfpQzzolPQ6cOFi4hCwXTYUupSR4nFQOeQl4ansdBoGP+favRy1f52iJfGigLRKKxO7hxNp6alOOMAQBRXW1TzGD635ol0qM/c2Uyfcci9ABVnGhnV8cyvPGsdldgCQtjbTKvGNu/O/LBdaqNr7dQxKA7Fr0BfypUq2/g8t/jUu0oEJEnI/pbHpCOc02UXX1a6iMwSft24gX4oGHEEMRizUAOjbNTuoUFeIts0Ak0AaU6ILGO9UdsGdzeDnpE84EAyuEV4iGvjVFg1MtcBRqj4dlSW0EIILkEL9iJns/s6iGGfkcjrhMAdkOxJDrMMs/po+bEzkGS0JEj7YSov7p5mzTNVS+KdzaQ/ecV6QUpDiQZSgVWp1PBeQiJUrIVimdoOmQL3lElNgoqXQBFQeHFGEhQHLctAhKPdJOqTuFv0WzjSN/q3tbgZ+sxcnDn6HBh0oX4yzz25shZqhc5sh6uAWFLyiJVdFni/0IY628FBlPR0+KdTlU4qp6tO9+4qGClccSLaASScs3u1bqPQoZ7ViBxEbk+zHqHDrknhmStMFmWWZJI4TPYYNZGZtIfIZ/oMscgpAsR/+Yh8Yj4pKiYhBJ595/cOltWtJ/VlQfNyHcFsPbLahGbbEH7C9kQg+iSDyIs8a3s2/AcIit61li094fOjpMrUUQmyN/BkY9+34X8CUwEu5Iemjrb7Xw7zi7eetU+MKa0kMc23yO1WR8LpYL2nV7rzavi3JAQHUVtV+47zLukaZwuSwSez4jiP449a32nSlV7O2mF3XyNVr2kQsTtle2OGyq6H/U8vb5qEj+aQG/8stRvxCHfqAIWKk3YIaKe7NSJtC6w+joEZSd/5MdbmUSZxJfst9oWn3E+AyiE59qDtXcSFFEby+8CgtHgRC1++J9rx5Acr2ckdJ2k3Wisb6/Ci37QVYsuo8qiOColn9OLQEvO3v4KccbYrs5JJTJYeQb79Cz5LlLOOIPm3nWISQO4NikVREVlAmZ/7Wvd99UUk9eSfB3R7nAoQtV1pJBwQeZT+fOIu8uPZw4/a7RuOIDZmeSES4RoV1ISY6ol79I5TcB5EDXmSPb2QXkD/8IY9UZ5Q8lKwBLXl3qSfi5nFP1tehfhVnvHMulrCLLlqCQRwGm+Zv9lFM88YT0+0J+H/8KgHCB5oi8QJRr9PQSl3oTFF9B8+JmtPSoWZaJ0pppQjO8MuFW+0F8dUfVG+X2DgcfmdJZqbMy9MifT5x+J3jqb3HLPZG8T2Sw/ay0obnUa2SHf1ZhFi/lOJvqbkoY6E91IVsz/t7EXysSPDMRF96F9x8dlSojRN6tPJ2KmRchR2D9FFcBrYyWKJpe+RTEK0WUxNSXlClCOr0PQH7xfp0cR/GL+yRGgSWo8qRuej8S72kgdKCwWxjpXIYJeaRSZGH5hVKslk52ZZoa1qQGVzr5fv9+MN8Bv7JybmAljWuqeU/qCSk5HgvYw0HhPzpPofJ9N2ClKqSZYCQfkvLKSU0m7q9E+1Q1XYPxD0TxhloFBJb0WMu3NiRUEJzJOxJE05iB9DVLPxfqhAs0dHvlv1cm4WosQxJzkuYTDcSuMaZTcxiNhRokgAnd6/QHxIY+oX8PCPfK+dfv415j6ThHxFwkVY+T0RYRUfv9ZCjIi0ER4alNlo2ONV8YnTjgMOt+MTpEucQDA998QaXQRTG19GS2e1LL/xAuum4huoPaSY9M3czdZPuWlRVE9rvJSoDtIG5QWpcNZShu1nh8+2js52xk8Na6AufoWVU2GzlzvoSnjauw+xDFHbaMvRcziDds6HTGcSDjl/Gl7kanHNjZkMbx2VGib0j5PNunZNBpWW6yP8xwr20fba2gJ8MjAJ/pZpjulJblmMYDlE0fZuKwbbCosLeznaXgozJqazU8/E4Y4UOD6Z0R/J7+t5SUa0BRcJZ3e/upw2WdpNN6eaMroBC44YQwKAHKMAQLAdl6YY523STj2W73wv4UQR6fk7U2f6t35Gn5mFbXXuMiHHJz94kRl+68eQPIxcIsOzB56YgHuIGgSENxnp16zVNvvJ61jbJmpYJl3OrdisTH3rDl5XBBR0GN/OUE3tdnVUyB9nkKCA0yJ9F1mYAKdf7EVM3GK7k8Clt+Bu+aQnbEidEbLcVzO6ES+wge6D+v6x4U0ZfBaZeZv/QHK+ZMOk+9071AuSV4LbSFmvbjndGhi4IIYqMe00IJFLYhjAnq10HZjd6mcQNAiwWbm5Wdi+xuC3ZRZaN/JXx2g10KTNL5PbX8orLR3hOVPr758I8dz0vH9S8alpk2mBxvqJLdUh1b85wFivhioqoDalrihXI4iScLMKdX4FU0vMyxfkqxlTC5T1UESGJhxSLzIyIXkWVUl2XEL1g9KAjOKYSVZSNz8BH2dnPwJ8OCfAx1btDlB9DTVQxDyNpPBV9pmdnpv8m4N8aj2dSkOQh8DsrE/OIg/xlEJn5P3IN4Eh9Hlf8jvQ1QRHNQX2we8KrAJ3w5Mn4DVAObgb5ieRERhr7jIkqrJzb3VrDCgP8qogcLRY5K6Fu1euEneRu6DwUVT/gVP8oqVSUrvP0o/yYKf1hgcU9IzHzBMz33N6g/XOB7bxXGBE74enp+H9RArBdvxqSBaNwjfdA9ceSFfWqUhqyDrAosLIE0bzwHsukrvf2t4xIQNjlEHYOLf3GcM8kBprtVgY8tTCBHPBHVmYtehnAO7J33feME/ObjwTcI1VSTtOXc649mxAh6KhaSgd/8NMeN/58H1PqlWh7QfkhdUKhdZNW9VAq59nJ2ayE+YZ5UPG5ieGLwgvWfqMeA4hnaXAS0D64/VP4Az46fXzlgeU7TqKhdqCottOebCVPOqpW+VZNtKiAeatAsf0AjUVtJpB5g3LJFL5T1cEVW6LOTDXT4T1HIYwoeeegoCpI7VBkf2qPHAMfv8BeRQ+9uHDMWQbdHer5wp0YlOWU8bOjIzf/l////XMOX5k/ZGdSq9LLf32cW7svA9T+BOXp0SCE6gm4F/e2WmvCSQQ5NZyoL2mU2hEvoKNwnmhEX6FNFoFYbDzWMwrjO6aaxVRPuyaDlMf1LiLNB5Z2eirRXJvN57Q1dvbRcB3g+DsSlFstJYbGA+kLv89evRfthYPArXc2Gi3vEC/ZDsgiEtNjJEtT0rcvdxk+e7E0VqMLDVREAfskv0CJxDV0Wbm/VBSWakS6l0SuHu3x3uV0PZZCCWZ90ebIavAH2bMXkdOzZJpZJJJop07gMHoTMNDa3QadN4ANT1IXujcQbSmqyvO06ALoZQn6UAQHWthcWvo7NPiQOANuxe6/ecfAnTgq9Id18inBm0n9xXdUL795Rgthsa0i0NafFtKW3JrSiswfnqYUE8k+7eh+vHlIP+gy3kiF4gZgYO0cGO05V42OR470YmIIkWS4IYJC3I8fVOMZSNDTcNbhEMu3svvRflF3lO3sQhnQmqTxhjLTWxSvMVTZnh0OKJzwmKxYO+Ntmw0UUM45muuqI0rgxYvBjKiHJNB4dwpCBLd2d7/vtpd7HwwGahBQ45V3M/J1+IxtSFbDWmATFi3snlTcEoDmGj0K/JIve+R4lc80dAApXT6Zz0U7wM5niBwyuuzmdoJ5I17HYvfil4Ydd6xZ3nhzUhRXa9X8n1eBxCiGq4Q6kR9S7ALa8C9tZ4rp5XL4TDiOvV6s2bvu6YW4Usq/mqQtad6bkJGF2VEgyhQnIGMdlXellqw3XLdbSiSnqACDfhfC4pygv3jl2EUWU7Z5Sr7BjVobYSb4qweBco5Gon2Edl+uuRelEViS/o8033sVxTFaAixLLHccd1OqwiXLBkHFNbbJSV9+iQRO3bv8M78j+gBb+NKxvnP66z3dCTnu+9NPRDBcagFYrj/zse9VmVP4oirI65UldJPJy/pjCuzDswGx5KE8a13LSMb4gELFpw/3/cdDm3ue9rs9YcQG5eF9o5j/bW85meBIv2yrKmrgJFRDmKj/71FEvuNyV1kNvU2XVJOhx9JeAsbDWIzywsYtFCrMnRgR4vXgafQFuT5L1/AyRzW4n88VodlNFMxE7emj6Z2OLICvlTCXkeiYzayPYU1TFlldFSvwwoJpxiNCIct47/ulqY02wkDi0zUzdpERBa3hIkxvVNuT4x8WddxnDnpehx5w3tZnHe4k8OiIbgaQvRaZpXvFbY+clAu/9BQ3fChHMiBd6L9N5ks1x/I/d9X8arei10Oeumu5szXAZYBjmnA2Ppgyw0beON8QuQX1A2FhYIcJrCQCau9rECHlbWJVdak66SjBvE8M+4zOvhb8GHRx7ErBLXb4QvnkO2003ivoRu2N8ZwXndNZPuFc+0fXp1+j61FFLe3FweL6Ag67IrTHxaRG2uwFKdPWQHFVtWvtrln1dgDNQ0IKO/09Dygq9iG8PQwaXNu5Xl4wHtxoofnjUJvMM8CUoO5+SaFcfGFJvnc4FQMFKvVLhnntSHgNceOtyDWII4fD0eMbhYIKBvhcIY/HXJOmDF1PmQ3uAh6aTMm72rEjyzm9RoFN2GZfk7gJwAB3qfbry08C4o9PsuI5jBgcaBJIELC4OBHR3SwvpBD7l5baDf/6PkR1Ml1RGe2exURbo5/lu/sZZuFa5uD757fzdsXrnnuuxdMjma88fN7kxbkEJDqb2Ybxv9jvDan+FPSoEJ6Vd91vxtUvW4E+HfsNidP7lbjBf+KedWetu621YE8MewEeq/+vu/b0xEt6pb7LZR2mJGajgZ880M8dHJ6qLfn1yDwmcnqZqB7kPfPCYXHIdP4Wy9NUT3EEzEW+xHtC5v2//eFuP/+cmQMJh8+AcMRGGTUJf1+EEJraIWzYZTy28MnLXTmM0p59PB2msXoxx+QZ/a/sfmppxX3bO7x4/ZN1RIoNRWIgUQlCcR7JUAsPRXub7ei0JjaaEEAPZb6xHHCaYZCnXMadXpCpd52GjmfZAfNKVZ9Wzn1Ll1qoq0cQ9FwYtlxbBAtdSzqivCaw8BMBkJTX6+BiFJGaBgRmMJv/OPH54+g9U1ifWKkDkVvYGsDpDHUZ6KHnRcghOqIpvsRbqeHDEOn3SLuX+2r53bf0kPwzHLA8pnAw/K+W/x37KsI1BmcAXcGFTGg5NJbqAPUFvp9cLuswQpS7DY5vbnmBRnSW/TfHuN/pccFjFNuXIbeoYXBBVxGi4OewXVr2BJTgMYujWZdSLFdcvvKtnskeosEXFcjTVeq6Eu+qwchPd2N2wIGBieAQOm4u1eV351Q2CXjB6538pt+8r7K+FGW0nuvMCLberVjobosnB5tO6XczM+/2dOPVlWNsrvZEgDCbpoIuMl64muBMJySwfDlpkOuMP7PH7Hkhvn7z49Nr+2/Kv6PU+uHKKMC1IbzDvF4wJtmeQNelneWgP4AfAehBwDRttmfKeMXWwkqjRa/v6KvlqA0qL9e7LhO0QgHkM3IAS7dGB4Fxnoh/vKBzXOU8PH0BcwRysSN4VSzBmS+h3RIYgbmHNh92aEh2FgFHMdt45NfPc+QzZx42S7u+HzPHa6wUJhXovcfwLBqprtqB+rrhx/kmEe+/UeqQsn4amxu6iK3bbGRu+gboMLmrgKqUiEk8sBCc7thYDTZoyi5f3BBiFRxaAJNQWl6fVqwUMcAEUtE2fq9y2ipaRQVBedH8CyalvoD/dzNU7rYJv3xFNCYR9qtzzFgfNe+br8WOazfcXN3e+YwuYcOkG3VjYBfo25c4lLhWu1a4SIZN6y6yxkLK9pRiw6WRII4U9olMS5GHcRV4w6iJL3gtLfqHNQxOjjV5L5jP5zS4EhiK59Kd3gsCwVRwqbzZ6cCrG/84pP3JMwH3+EqXL5ft5ufT5VSEQd19GPf1iGsTTDYD9tqbV+DpaCfJWX1gPcYQV9jXDNeYNJkSaCfu7UZeTyXKJM5Kj7v95RTx7adFzaBKAmf2NeVrq6fDozm2TJIRgFve6TlFE2xxUax1S4ZE8u3UHJUca5ptACpF2WSW6nNC9eG52krT37myC675DZRZD050lb+DtSXBmnb/tgkywk+pJYDnCDe7sUkBnnInJUO3sJuFvU7LmOTQhfwB14sj7MX2Y/h8UZ5ebQskjUX6xFFUD+5ruQ/+TLIHQevZRVhbh23tJNNQ6+Y5tas+VoNjfJNMGuKDMx4cmtXA/YB24+Ku2qZdO8BHJD2rvaSxt/1E6r3c5cnZc88z0GrIFcJJ4GyKV5UnjEk7vFKfwsmufbwtoWZx9POTTKL5MtcSt4bYErIwSTE132kTybxbnbkRZ/3EI6TFMOC9ER02QiGMXEORLBhQeAgc6Q7QvnpnmnMygBXW07yRzEmTAcEnFKbqtc8lg2chHiu/5Pfl/rOutLrOMCVPRU66TZpu9CcHnngXBFblDLXHHWg+0p4XfQmYCAlCNLoFDiebubEjhsv9ej0MJxSwiREhAseHjNwg/i4gwN+0jnazisISAG9z3IgHHMsDD7cdJIvxDfdsR3P1s6iwzLZdz2N9jDwMO2KDy0Q7HSlFY6ECOfD3JkOloDUOkubJog37g66+MsbMenqid3syX1B4RNmDtAbmvmRVf1j2rkTQqbEDyU+68sS/RTqzIZTvugF+jl6uTZ23OlVG23l5M5hJNQ0mYl82yJMY6iAzpPMuCSqv22TiATxbX/R4nMCbW9NphE60LzL6BJvP+4yThA/R+oLCrmzZIg/Q/n+7n04JNXuNnXRjfrwkhQ5ZmpB0MQqAQ70uIpnxmygIA/09gE8c9LGMWbc5xE5xJEiaU6FZJCe2lzPRKNLjRIi1kdgKG3D/pvXgUiiUzzOxXX0DdH2Nsp/+Me2qce4uY0+IWK0ae5ANY0O94H6zSIUL7fj+m7j4ZekpofyJkmqhNiSHrR9NoxBcKklxJsR7yeR1dFD1ysfVbZRtuKvYVn6jQl2Pa1u4/1qD2QkiHdLcRWV9PXxjKQt8+sGSDomSomslSIOGPqIA/R5PtYImrcaC3Y0iGlMH3P1itsQka2VCWv2OtBAfKBfMD0E8VyEj3bzY8Dob+6OvpD/mzAUwDd1HPiKBDzz8kduCCA1fmybvXKohuz/E7Xt/NqLQ3wwQ/GJ6MjbD9Do8Mj+K0bH8wE4mkBmaP/YBVywiwD4mnkfeGYTGUDe3UnARwxaUNT3bdOUSL2KAEvg2M/AsPEjLAcn67r7ORAI/Jywwvy83LR6fT4MUw0BZUcBqlsx8CFUl3wEsgs+jOo9B+l+56OY+c9HowbYx1MHBpNDAqcwolpIQAsxbL+gi7VUsXU6bfqD/Sg0blfiZ/7HmLomvKQy0fWfaBgibOZ7f12aQhKr4WNwbCjFgov9gtej6PK3p/QWrY1H5vpwggZoIYbtFr6ssrX01tcp9sD/YD8KDcZOly/7H2PqJx5eHp9T+D75lmqnuhjneX9dUE0hjWWr58gHqoZSLDi92i94PQqH6m9PuytLaflH+ZH6qYGvfbvcNibL/0LBFGXZ2nkmeVe3x+vzA4gw+ZUMfVGhU1UqbazzQRjFSZrlRVnVTdv1wzjNy7rtx3ndz/v9AAjBP1aHn/mLxLONifSzNllxvCBKb2KWp2q68Twxettxf3b0AxSEUZykWV6UVd20XT+M07ys236c1/283w+AEIygGE6QFM2wHC+Ikqy8soeqG8/i3R3bcT0/CKM4SbO8KKu6abt+GKd5+YOw7u72h+PpfLne8AQiiUyh0ugMJovN4fL4AqFI7Pml25LJtbSv7tJB/tBMwRuzudgO1ByO07HlupMvSmhRD/15p/Xy3EgK4ySTuOEMGwFlnmxMMQiWMqEVQcaeaaMJkGXLsC7RmyVxI7Z6MM1fTrQoy++ic8ieSqsOSV/d8CmXp100JloyZFxpCH8cCFF9tPrMeIutGbpuo/tkB4J3Wl6oZ5jlk+ZsTNCcGr39RuF9xv7h1nxmweX15K+vJLegUOlwrvAZpqJ9aMKNd9OSb0O8UwvCKXhWWTKu+6c4Xjc79AOLJibjVAsaLlxwPNufYt4Re7a3FFttkQ2GsFyK6WbGWnMkFEBjBFBjm7AurDwns6iciBeuZOLjrlWpFu/gQ5vLXLxETJ/2LucldX+WyrJkeb5I48Nh8+ibQwqTj8ioOX1Sw4e6pLSiHJJIR7GdGrTnl93FqqwZSvFCOc6jMR6N5dRztiZcBXI4EOWu5pTdETV8r4xYPcYOqZ0M1Iz6PB8yFWBZcrN216hjIKir58345V60wkPuUoEinHFzwO7eDs2JsCdpqjIpZJ3zAr9r1TVRWbjEECDR7iMFSxH1k8bLJxVEHZgyUgCZBj6JAsu4Fawee5s5HT6ZfECmdIqKegsoOglC/0zJQAAFo07pPAWouhaIFniwH2U7ErVzgYyBSKpwE/LGq2t3rEQDYlJfXeokwGbtRWMagrd5S3FMmtEvfPV0RttXVhP00QgyNZWmULkKPDVwgXrMGUa6Nqdh0qBCyjYstQkmtAAjAXvZgIZJBi7b7v2FhBKtExYJ5a4Hu+d1oxRq/iK2eki0oPeEj1OWneh3JryGGVrlvdqOpOqOwGz6+CWn3u/T/a3IJ3FBevI1zIBdukX8BL4ds1y7rUtSRbnjDP1etwvSN1HUdbC5r8ddUqyiwiFBmxNv9RpmfXt10aJDAFX5oH5CNdHabugdixB1rUtLYdnmKXwcTy3yTOLZGQJzetKitZgpIPjoLzMF1Ton0NRLyhu6dNyiQUuG6GMlWO60RaOWzTX67usKiuFECGN5oxXp5rRsZAG14Eyuzsqi0lcsIXbhZXfE6EcNZIbQMe0oYAQgasNMBz3b7BUkHTFTg0RHoQhMlFZGGU/ejdeMfwpLflT1HFiEd7znbVfdav94mdP3O1MIyQDLftKTl4cVRG0qHVMl62E/A27D/FIprv6AhPMnZyCtkyiY2+6pcPhsG04nYIZDR726wQ2tPPykY/qi72XWgLJd/QA7GNW5ClDzf93Ax5/xDwF6LH+Ojcb7g0HTgZkhDLg1su2qLt5SbLB98Sv0n7jS8XkU1BIX6/wZHi1U+twvu9VQ3N3+DwAAAA==') format('woff2'),
+		url('//at.alicdn.com/t/font_1529455_k4s6di1d1.woff?t=1596960292384') format('woff'),
+		url('//at.alicdn.com/t/font_1529455_k4s6di1d1.ttf?t=1596960292384') format('truetype'),
+		/* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+		url('//at.alicdn.com/t/font_1529455_k4s6di1d1.svg?t=1596960292384#iconfont') format('svg');
+}
+
+/* #endif */
+
+.u-iconfont {
+	position: relative;
+	display: flex;
+	font: normal normal normal 14px/1 "uicon-iconfont";
+	font-size: inherit;
+	text-rendering: auto;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.u-iconfont::before {
+	display: flex;
+	align-items: center;
+}
+
+.uicon-en:before {
+	content: "\e70a";
+}
+
+.uicon-zh:before {
+	content: "\e692";
+}
+
+.uicon-level:before {
+	content: "\e693";
+}
+
+.uicon-woman:before {
+	content: "\e69c";
+}
+
+.uicon-man:before {
+	content: "\e697";
+}
+
+.uicon-column-line:before {
+	content: "\e68e";
+}
+
+.uicon-empty-page:before {
+	content: "\e627";
+}
+
+.uicon-empty-data:before {
+	content: "\e62f";
+}
+
+.uicon-empty-car:before {
+	content: "\e602";
+}
+
+.uicon-empty-order:before {
+	content: "\e639";
+}
+
+.uicon-empty-address:before {
+	content: "\e646";
+}
+
+.uicon-empty-message:before {
+	content: "\e6a9";
+}
+
+.uicon-empty-search:before {
+	content: "\e664";
+}
+
+.uicon-empty-favor:before {
+	content: "\e67c";
+}
+
+.uicon-empty-coupon:before {
+	content: "\e682";
+}
+
+.uicon-empty-history:before {
+	content: "\e684";
+}
+
+.uicon-empty-permission:before {
+	content: "\e686";
+}
+
+.uicon-empty-news:before {
+	content: "\e687";
+}
+
+.uicon-empty-wifi:before {
+	content: "\e688";
+}
+
+.uicon-empty-list:before {
+	content: "\e68b";
+}
+
+.uicon-arrow-left-double:before {
+	content: "\e68c";
+}
+
+.uicon-arrow-right-double:before {
+	content: "\e68d";
+}
+
+.uicon-red-packet:before {
+	content: "\e691";
+}
+
+.uicon-red-packet-fill:before {
+	content: "\e690";
+}
+
+.uicon-order:before {
+	content: "\e68f";
+}
+
+.uicon-nav-back-arrow:before {
+	content: "\e67f";
+}
+
+.uicon-nav-back:before {
+	content: "\e683";
+}
+
+.uicon-checkbox-mark:before {
+	content: "\e6a8";
+}
+
+.uicon-arrow-up-fill:before {
+	content: "\e6b0";
+}
+
+.uicon-arrow-down-fill:before {
+	content: "\e600";
+}
+
+.uicon-backspace:before {
+	content: "\e67b";
+}
+
+.uicon-android-circle-fill:before {
+	content: "\e67e";
+}
+
+.uicon-android-fill:before {
+	content: "\e67d";
+}
+
+.uicon-question:before {
+	content: "\e715";
+}
+
+.uicon-pause:before {
+	content: "\e8fa";
+}
+
+.uicon-close:before {
+	content: "\e685";
+}
+
+.uicon-volume-up:before {
+	content: "\e633";
+}
+
+.uicon-volume-off:before {
+	content: "\e644";
+}
+
+.uicon-info:before {
+	content: "\e653";
+}
+
+.uicon-error:before {
+	content: "\e6d3";
+}
+
+.uicon-lock-opened-fill:before {
+	content: "\e974";
+}
+
+.uicon-lock-fill:before {
+	content: "\e979";
+}
+
+.uicon-lock:before {
+	content: "\e97a";
+}
+
+.uicon-photo-fill:before {
+	content: "\e98b";
+}
+
+.uicon-photo:before {
+	content: "\e98d";
+}
+
+.uicon-account-fill:before {
+	content: "\e614";
+}
+
+.uicon-minus-people-fill:before {
+	content: "\e615";
+}
+
+.uicon-plus-people-fill:before {
+	content: "\e626";
+}
+
+.uicon-account:before {
+	content: "\e628";
+}
+
+.uicon-thumb-down-fill:before {
+	content: "\e726";
+}
+
+.uicon-thumb-down:before {
+	content: "\e727";
+}
+
+.uicon-thumb-up-fill:before {
+	content: "\e72f";
+}
+
+.uicon-thumb-up:before {
+	content: "\e733";
+}
+
+.uicon-person-delete-fill:before {
+	content: "\e66a";
+}
+
+.uicon-cut:before {
+	content: "\e948";
+}
+
+.uicon-fingerprint:before {
+	content: "\e955";
+}
+
+.uicon-home-fill:before {
+	content: "\e964";
+}
+
+.uicon-home:before {
+	content: "\e965";
+}
+
+.uicon-hourglass-half-fill:before {
+	content: "\e966";
+}
+
+.uicon-hourglass:before {
+	content: "\e967";
+}
+
+.uicon-lock-open:before {
+	content: "\e973";
+}
+
+.uicon-integral-fill:before {
+	content: "\e703";
+}
+
+.uicon-integral:before {
+	content: "\e704";
+}
+
+.uicon-coupon:before {
+	content: "\e8ae";
+}
+
+.uicon-coupon-fill:before {
+	content: "\e8c4";
+}
+
+.uicon-kefu-ermai:before {
+	content: "\e656";
+}
+
+.uicon-scan:before {
+	content: "\e662";
+}
+
+.uicon-rmb:before {
+	content: "\e608";
+}
+
+.uicon-rmb-circle-fill:before {
+	content: "\e657";
+}
+
+.uicon-rmb-circle:before {
+	content: "\e677";
+}
+
+.uicon-gift:before {
+	content: "\e65b";
+}
+
+.uicon-gift-fill:before {
+	content: "\e65c";
+}
+
+.uicon-bookmark-fill:before {
+	content: "\e63b";
+}
+
+.uicon-zhuanfa:before {
+	content: "\e60b";
+}
+
+.uicon-eye-off-outline:before {
+	content: "\e62b";
+}
+
+.uicon-eye-off:before {
+	content: "\e648";
+}
+
+.uicon-pause-circle:before {
+	content: "\e643";
+}
+
+.uicon-play-circle:before {
+	content: "\e647";
+}
+
+.uicon-pause-circle-fill:before {
+	content: "\e654";
+}
+
+.uicon-play-circle-fill:before {
+	content: "\e655";
+}
+
+.uicon-grid:before {
+	content: "\e673";
+}
+
+.uicon-play-right:before {
+	content: "\e610";
+}
+
+.uicon-play-left:before {
+	content: "\e66d";
+}
+
+.uicon-calendar:before {
+	content: "\e66e";
+}
+
+.uicon-rewind-right:before {
+	content: "\e66f";
+}
+
+.uicon-rewind-left:before {
+	content: "\e671";
+}
+
+.uicon-skip-forward-right:before {
+	content: "\e672";
+}
+
+.uicon-skip-back-left:before {
+	content: "\e674";
+}
+
+.uicon-play-left-fill:before {
+	content: "\e675";
+}
+
+.uicon-play-right-fill:before {
+	content: "\e676";
+}
+
+.uicon-grid-fill:before {
+	content: "\e678";
+}
+
+.uicon-rewind-left-fill:before {
+	content: "\e679";
+}
+
+.uicon-rewind-right-fill:before {
+	content: "\e67a";
+}
+
+.uicon-pushpin:before {
+	content: "\e7e3";
+}
+
+.uicon-star:before {
+	content: "\e65f";
+}
+
+.uicon-star-fill:before {
+	content: "\e669";
+}
+
+.uicon-server-fill:before {
+	content: "\e751";
+}
+
+.uicon-server-man:before {
+	content: "\e6bc";
+}
+
+.uicon-edit-pen:before {
+	content: "\e612";
+}
+
+.uicon-edit-pen-fill:before {
+	content: "\e66b";
+}
+
+.uicon-wifi:before {
+	content: "\e667";
+}
+
+.uicon-wifi-off:before {
+	content: "\e668";
+}
+
+.uicon-file-text:before {
+	content: "\e663";
+}
+
+.uicon-file-text-fill:before {
+	content: "\e665";
+}
+
+.uicon-more-dot-fill:before {
+	content: "\e630";
+}
+
+.uicon-minus:before {
+	content: "\e618";
+}
+
+.uicon-minus-circle:before {
+	content: "\e61b";
+}
+
+.uicon-plus:before {
+	content: "\e62d";
+}
+
+.uicon-plus-circle:before {
+	content: "\e62e";
+}
+
+.uicon-minus-circle-fill:before {
+	content: "\e652";
+}
+
+.uicon-plus-circle-fill:before {
+	content: "\e661";
+}
+
+.uicon-email:before {
+	content: "\e611";
+}
+
+.uicon-email-fill:before {
+	content: "\e642";
+}
+
+.uicon-phone:before {
+	content: "\e622";
+}
+
+.uicon-phone-fill:before {
+	content: "\e64f";
+}
+
+.uicon-clock:before {
+	content: "\e60f";
+}
+
+.uicon-car:before {
+	content: "\e60c";
+}
+
+.uicon-car-fill:before {
+	content: "\e636";
+}
+
+.uicon-warning:before {
+	content: "\e694";
+}
+
+.uicon-warning-fill:before {
+	content: "\e64d";
+}
+
+.uicon-search:before {
+	content: "\e62a";
+}
+
+.uicon-baidu-circle-fill:before {
+	content: "\e680";
+}
+
+.uicon-baidu:before {
+	content: "\e681";
+}
+
+.uicon-facebook:before {
+	content: "\e689";
+}
+
+.uicon-facebook-circle-fill:before {
+	content: "\e68a";
+}
+
+.uicon-qzone:before {
+	content: "\e695";
+}
+
+.uicon-qzone-circle-fill:before {
+	content: "\e696";
+}
+
+.uicon-moments-circel-fill:before {
+	content: "\e69a";
+}
+
+.uicon-moments:before {
+	content: "\e69b";
+}
+
+.uicon-qq-circle-fill:before {
+	content: "\e6a0";
+}
+
+.uicon-qq-fill:before {
+	content: "\e6a1";
+}
+
+.uicon-weibo:before {
+	content: "\e6a4";
+}
+
+.uicon-weibo-circle-fill:before {
+	content: "\e6a5";
+}
+
+.uicon-taobao:before {
+	content: "\e6a6";
+}
+
+.uicon-taobao-circle-fill:before {
+	content: "\e6a7";
+}
+
+.uicon-twitter:before {
+	content: "\e6aa";
+}
+
+.uicon-twitter-circle-fill:before {
+	content: "\e6ab";
+}
+
+.uicon-weixin-circle-fill:before {
+	content: "\e6b1";
+}
+
+.uicon-weixin-fill:before {
+	content: "\e6b2";
+}
+
+.uicon-zhifubao-circle-fill:before {
+	content: "\e6b8";
+}
+
+.uicon-zhifubao:before {
+	content: "\e6b9";
+}
+
+.uicon-zhihu:before {
+	content: "\e6ba";
+}
+
+.uicon-zhihu-circle-fill:before {
+	content: "\e709";
+}
+
+.uicon-list:before {
+	content: "\e650";
+}
+
+.uicon-list-dot:before {
+	content: "\e616";
+}
+
+.uicon-setting:before {
+	content: "\e61f";
+}
+
+.uicon-bell:before {
+	content: "\e609";
+}
+
+.uicon-bell-fill:before {
+	content: "\e640";
+}
+
+.uicon-attach:before {
+	content: "\e632";
+}
+
+.uicon-shopping-cart:before {
+	content: "\e621";
+}
+
+.uicon-shopping-cart-fill:before {
+	content: "\e65d";
+}
+
+.uicon-tags:before {
+	content: "\e629";
+}
+
+.uicon-share:before {
+	content: "\e631";
+}
+
+.uicon-question-circle-fill:before {
+	content: "\e666";
+}
+
+.uicon-question-circle:before {
+	content: "\e625";
+}
+
+.uicon-error-circle:before {
+	content: "\e624";
+}
+
+.uicon-checkmark-circle:before {
+	content: "\e63d";
+}
+
+.uicon-close-circle:before {
+	content: "\e63f";
+}
+
+.uicon-info-circle:before {
+	content: "\e660";
+}
+
+.uicon-md-person-add:before {
+	content: "\e6e4";
+}
+
+.uicon-md-person-fill:before {
+	content: "\e6ea";
+}
+
+.uicon-bag-fill:before {
+	content: "\e617";
+}
+
+.uicon-bag:before {
+	content: "\e619";
+}
+
+.uicon-chat-fill:before {
+	content: "\e61e";
+}
+
+.uicon-chat:before {
+	content: "\e620";
+}
+
+.uicon-more-circle:before {
+	content: "\e63e";
+}
+
+.uicon-more-circle-fill:before {
+	content: "\e645";
+}
+
+.uicon-volume:before {
+	content: "\e66c";
+}
+
+.uicon-volume-fill:before {
+	content: "\e670";
+}
+
+.uicon-reload:before {
+	content: "\e788";
+}
+
+.uicon-camera:before {
+	content: "\e7d7";
+}
+
+.uicon-heart:before {
+	content: "\e7df";
+}
+
+.uicon-heart-fill:before {
+	content: "\e851";
+}
+
+.uicon-minus-square-fill:before {
+	content: "\e855";
+}
+
+.uicon-plus-square-fill:before {
+	content: "\e856";
+}
+
+.uicon-pushpin-fill:before {
+	content: "\e86e";
+}
+
+.uicon-camera-fill:before {
+	content: "\e870";
+}
+
+.uicon-setting-fill:before {
+	content: "\e872";
+}
+
+.uicon-google:before {
+	content: "\e87a";
+}
+
+.uicon-ie:before {
+	content: "\e87b";
+}
+
+.uicon-apple-fill:before {
+	content: "\e881";
+}
+
+.uicon-chrome-circle-fill:before {
+	content: "\e885";
+}
+
+.uicon-github-circle-fill:before {
+	content: "\e887";
+}
+
+.uicon-IE-circle-fill:before {
+	content: "\e889";
+}
+
+.uicon-google-circle-fill:before {
+	content: "\e88a";
+}
+
+.uicon-arrow-down:before {
+	content: "\e60d";
+}
+
+.uicon-arrow-left:before {
+	content: "\e60e";
+}
+
+.uicon-map:before {
+	content: "\e61d";
+}
+
+.uicon-man-add-fill:before {
+	content: "\e64c";
+}
+
+.uicon-tags-fill:before {
+	content: "\e651";
+}
+
+.uicon-arrow-leftward:before {
+	content: "\e601";
+}
+
+.uicon-arrow-rightward:before {
+	content: "\e603";
+}
+
+.uicon-arrow-downward:before {
+	content: "\e604";
+}
+
+.uicon-arrow-right:before {
+	content: "\e605";
+}
+
+.uicon-arrow-up:before {
+	content: "\e606";
+}
+
+.uicon-arrow-upward:before {
+	content: "\e607";
+}
+
+.uicon-bookmark:before {
+	content: "\e60a";
+}
+
+.uicon-eye:before {
+	content: "\e613";
+}
+
+.uicon-man-delete:before {
+	content: "\e61a";
+}
+
+.uicon-man-add:before {
+	content: "\e61c";
+}
+
+.uicon-trash:before {
+	content: "\e623";
+}
+
+.uicon-error-circle-fill:before {
+	content: "\e62c";
+}
+
+.uicon-calendar-fill:before {
+	content: "\e634";
+}
+
+.uicon-checkmark-circle-fill:before {
+	content: "\e635";
+}
+
+.uicon-close-circle-fill:before {
+	content: "\e637";
+}
+
+.uicon-clock-fill:before {
+	content: "\e638";
+}
+
+.uicon-checkmark:before {
+	content: "\e63a";
+}
+
+.uicon-download:before {
+	content: "\e63c";
+}
+
+.uicon-eye-fill:before {
+	content: "\e641";
+}
+
+.uicon-mic-off:before {
+	content: "\e649";
+}
+
+.uicon-mic:before {
+	content: "\e64a";
+}
+
+.uicon-info-circle-fill:before {
+	content: "\e64b";
+}
+
+.uicon-map-fill:before {
+	content: "\e64e";
+}
+
+.uicon-trash-fill:before {
+	content: "\e658";
+}
+
+.uicon-volume-off-fill:before {
+	content: "\e659";
+}
+
+.uicon-volume-up-fill:before {
+	content: "\e65a";
+}
+
+.uicon-share-fill:before {
+	content: "\e65e";
+}
diff --git a/uni_modules/vk-uview-ui/index.js b/uni_modules/vk-uview-ui/index.js
new file mode 100644
index 0000000..8d32c83
--- /dev/null
+++ b/uni_modules/vk-uview-ui/index.js
@@ -0,0 +1,146 @@
+// 引入全局mixin
+import mixin from './libs/mixin/mixin.js'
+// 引入关于是否mixin集成小程序分享的配置
+// import wxshare from './libs/mixin/mpShare.js'
+// 全局挂载引入http相关请求拦截插件
+import http from './libs/request'
+
+function wranning(str) {
+	// 开发环境进行信息输出,主要是一些报错信息
+	// 这个环境的来由是在程序编写时候,点击hx编辑器运行调试代码的时候,详见:
+	// 	https://uniapp.dcloud.io/frame?id=%e5%bc%80%e5%8f%91%e7%8e%af%e5%a2%83%e5%92%8c%e7%94%9f%e4%ba%a7%e7%8e%af%e5%a2%83
+	if (process.env.NODE_ENV === 'development') {
+		console.warn(str)
+	}
+}
+
+// 尝试判断在根目录的/store中是否有$u.mixin.js，此文件uView默认为需要挂在到全局的vuex的state变量
+// HX2.6.11版本,放到try中,控制台依然会警告,暂时不用此方式，
+// let vuexStore = {};
+// try {
+// 	vuexStore = require("@/store/$u.mixin.js");
+// } catch (e) {
+// 	//TODO handle the exception
+// }
+
+// post类型对象参数转为get类型url参数
+import queryParams from './libs/function/queryParams.js'
+// 路由封装
+import route from './libs/function/route.js'
+// 时间格式化
+import timeFormat from './libs/function/timeFormat.js'
+// 时间戳格式化,返回多久之前
+import timeFrom from './libs/function/timeFrom.js'
+// 颜色渐变相关,colorGradient-颜色渐变,hexToRgb-十六进制颜色转rgb颜色,rgbToHex-rgb转十六进制
+import colorGradient from './libs/function/colorGradient.js'
+// 生成全局唯一guid字符串
+import guid from './libs/function/guid.js'
+// 主题相关颜色,info|success|warning|primary|default|error,此颜色已在uview.scss中定义,但是为js中也能使用,故也定义一份
+import color from './libs/function/color.js'
+// 根据type获取图标名称
+import type2icon from './libs/function/type2icon.js'
+// 打乱数组的顺序
+import randomArray from './libs/function/randomArray.js'
+// 对象和数组的深度克隆
+import deepClone from './libs/function/deepClone.js'
+// 对象深度拷贝
+import deepMerge from './libs/function/deepMerge.js'
+// 添加单位
+import addUnit from './libs/function/addUnit.js'
+
+// 规则检验
+import test from './libs/function/test.js'
+// 随机数
+import random from './libs/function/random.js'
+// 去除空格
+import trim from './libs/function/trim.js'
+// toast提示，对uni.showToast的封装
+import toast from './libs/function/toast.js'
+// 获取父组件参数
+import getParent from './libs/function/getParent.js'
+// 获取整个父组件
+import $parent from './libs/function/$parent.js'
+// 获取sys()和os()工具方法
+// 获取设备信息，挂载到$u的sys()(system的缩写)属性中，
+// 同时把安卓和ios平台的名称"ios"和"android"挂到$u.os()中，方便取用
+import {sys, os} from './libs/function/sys.js'
+// 防抖方法
+import debounce from './libs/function/debounce.js'
+// 节流方法
+import throttle from './libs/function/throttle.js'
+
+
+// 配置信息
+import config from './libs/config/config.js'
+// 各个需要fixed的地方的z-index配置文件
+import zIndex from './libs/config/zIndex.js'
+
+const $u = {
+	queryParams: queryParams,
+	route: route,
+	timeFormat: timeFormat,
+	date: timeFormat, // 另名date
+	timeFrom,
+	colorGradient: colorGradient.colorGradient,
+	colorToRgba: colorGradient.colorToRgba,
+	guid,
+	color,
+	sys,
+	os,
+	type2icon,
+	randomArray,
+	wranning,
+	get: http.get,
+	post: http.post,
+	put: http.put,
+	'delete': http.delete,
+	hexToRgb: colorGradient.hexToRgb,
+	rgbToHex: colorGradient.rgbToHex,
+	test,
+	random,
+	deepClone,
+	deepMerge,
+	getParent,
+	$parent,
+	addUnit,
+	trim,
+	type: ['primary', 'success', 'error', 'warning', 'info'],
+	http,
+	toast,
+	config, // uView配置信息相关，比如版本号
+	zIndex,
+	debounce,
+	throttle,
+}
+
+// $u挂载到uni对象上
+uni.$u = $u
+
+const install = Vue => {
+	Vue.mixin(mixin) 
+  // #ifndef VUE3
+	if (Vue.prototype.openShare) {
+		Vue.mixin(mpShare);
+	}
+	// Vue.mixin(vuexStore);
+	// 时间格式化，同时两个名称，date和timeFormat
+	Vue.filter('timeFormat', (timestamp, format) => {
+		return timeFormat(timestamp, format)
+	})
+	Vue.filter('date', (timestamp, format) => {
+		return timeFormat(timestamp, format)
+	})
+	// 将多久以前的方法，注入到全局过滤器
+	Vue.filter('timeFrom', (timestamp, format) => {
+		return timeFrom(timestamp, format)
+	})
+	Vue.prototype.$u = $u
+  // #endif
+  // #ifdef VUE3
+  Vue.config.globalProperties.$u = $u
+  // #endif
+}
+
+export default {
+	install
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/index.scss b/uni_modules/vk-uview-ui/index.scss
new file mode 100644
index 0000000..84daa72
--- /dev/null
+++ b/uni_modules/vk-uview-ui/index.scss
@@ -0,0 +1,23 @@
+// 引入公共基础类
+@import "./libs/css/common.scss";
+@import "./libs/css/color.scss";
+
+// 非nvue的样式
+/* #ifndef APP-NVUE */
+@import "./libs/css/style.vue.scss";
+/* #endif */
+
+// nvue的特有样式
+/* #ifdef APP-NVUE */
+@import "./libs/css/style.nvue.scss";
+/* #endif */
+
+// 小程序特有的样式
+/* #ifdef MP */
+@import "./libs/css/style.mp.scss";
+/* #endif */
+
+// H5特有的样式
+/* #ifdef H5 */
+@import "./libs/css/style.h5.scss";
+/* #endif */
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/address/areas.json b/uni_modules/vk-uview-ui/libs/address/areas.json
new file mode 100644
index 0000000..16bef97
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/address/areas.json
@@ -0,0 +1 @@
+[[[{"code":"110101","name":"东城区"},{"code":"110102","name":"西城区"},{"code":"110105","name":"朝阳区"},{"code":"110106","name":"丰台区"},{"code":"110107","name":"石景山区"},{"code":"110108","name":"海淀区"},{"code":"110109","name":"门头沟区"},{"code":"110111","name":"房山区"},{"code":"110112","name":"通州区"},{"code":"110113","name":"顺义区"},{"code":"110114","name":"昌平区"},{"code":"110115","name":"大兴区"},{"code":"110116","name":"怀柔区"},{"code":"110117","name":"平谷区"},{"code":"110118","name":"密云区"},{"code":"110119","name":"延庆区"}]],[[{"code":"120101","name":"和平区"},{"code":"120102","name":"河东区"},{"code":"120103","name":"河西区"},{"code":"120104","name":"南开区"},{"code":"120105","name":"河北区"},{"code":"120106","name":"红桥区"},{"code":"120110","name":"东丽区"},{"code":"120111","name":"西青区"},{"code":"120112","name":"津南区"},{"code":"120113","name":"北辰区"},{"code":"120114","name":"武清区"},{"code":"120115","name":"宝坻区"},{"code":"120116","name":"滨海新区"},{"code":"120117","name":"宁河区"},{"code":"120118","name":"静海区"},{"code":"120119","name":"蓟州区"}]],[[{"code":"130102","name":"长安区"},{"code":"130104","name":"桥西区"},{"code":"130105","name":"新华区"},{"code":"130107","name":"井陉矿区"},{"code":"130108","name":"裕华区"},{"code":"130109","name":"藁城区"},{"code":"130110","name":"鹿泉区"},{"code":"130111","name":"栾城区"},{"code":"130121","name":"井陉县"},{"code":"130123","name":"正定县"},{"code":"130125","name":"行唐县"},{"code":"130126","name":"灵寿县"},{"code":"130127","name":"高邑县"},{"code":"130128","name":"深泽县"},{"code":"130129","name":"赞皇县"},{"code":"130130","name":"无极县"},{"code":"130131","name":"平山县"},{"code":"130132","name":"元氏县"},{"code":"130133","name":"赵县"},{"code":"130181","name":"辛集市"},{"code":"130183","name":"晋州市"},{"code":"130184","name":"新乐市"}],[{"code":"130202","name":"路南区"},{"code":"130203","name":"路北区"},{"code":"130204","name":"古冶区"},{"code":"130205","name":"开平区"},{"code":"130207","name":"丰南区"},{"code":"130208","name":"丰润区"},{"code":"130209","name":"曹妃甸区"},{"code":"130223","name":"滦县"},{"code":"130224","name":"滦南县"},{"code":"130225","name":"乐亭县"},{"code":"130227","name":"迁西县"},{"code":"130229","name":"玉田县"},{"code":"130281","name":"遵化市"},{"code":"130283","name":"迁安市"}],[{"code":"130302","name":"海港区"},{"code":"130303","name":"山海关区"},{"code":"130304","name":"北戴河区"},{"code":"130306","name":"抚宁区"},{"code":"130321","name":"青龙满族自治县"},{"code":"130322","name":"昌黎县"},{"code":"130324","name":"卢龙县"}],[{"code":"130402","name":"邯山区"},{"code":"130403","name":"丛台区"},{"code":"130404","name":"复兴区"},{"code":"130406","name":"峰峰矿区"},{"code":"130407","name":"肥乡区"},{"code":"130408","name":"永年区"},{"code":"130423","name":"临漳县"},{"code":"130424","name":"成安县"},{"code":"130425","name":"大名县"},{"code":"130426","name":"涉县"},{"code":"130427","name":"磁县"},{"code":"130430","name":"邱县"},{"code":"130431","name":"鸡泽县"},{"code":"130432","name":"广平县"},{"code":"130433","name":"馆陶县"},{"code":"130434","name":"魏县"},{"code":"130435","name":"曲周县"},{"code":"130481","name":"武安市"}],[{"code":"130502","name":"桥东区"},{"code":"130503","name":"桥西区"},{"code":"130521","name":"邢台县"},{"code":"130522","name":"临城县"},{"code":"130523","name":"内丘县"},{"code":"130524","name":"柏乡县"},{"code":"130525","name":"隆尧县"},{"code":"130526","name":"任县"},{"code":"130527","name":"南和县"},{"code":"130528","name":"宁晋县"},{"code":"130529","name":"巨鹿县"},{"code":"130530","name":"新河县"},{"code":"130531","name":"广宗县"},{"code":"130532","name":"平乡县"},{"code":"130533","name":"威县"},{"code":"130534","name":"清河县"},{"code":"130535","name":"临西县"},{"code":"130581","name":"南宫市"},{"code":"130582","name":"沙河市"}],[{"code":"130602","name":"竞秀区"},{"code":"130606","name":"莲池区"},{"code":"130607","name":"满城区"},{"code":"130608","name":"清苑区"},{"code":"130609","name":"徐水区"},{"code":"130623","name":"涞水县"},{"code":"130624","name":"阜平县"},{"code":"130626","name":"定兴县"},{"code":"130627","name":"唐县"},{"code":"130628","name":"高阳县"},{"code":"130629","name":"容城县"},{"code":"130630","name":"涞源县"},{"code":"130631","name":"望都县"},{"code":"130632","name":"安新县"},{"code":"130633","name":"易县"},{"code":"130634","name":"曲阳县"},{"code":"130635","name":"蠡县"},{"code":"130636","name":"顺平县"},{"code":"130637","name":"博野县"},{"code":"130638","name":"雄县"},{"code":"130681","name":"涿州市"},{"code":"130682","name":"定州市"},{"code":"130683","name":"安国市"},{"code":"130684","name":"高碑店市"}],[{"code":"130702","name":"桥东区"},{"code":"130703","name":"桥西区"},{"code":"130705","name":"宣化区"},{"code":"130706","name":"下花园区"},{"code":"130708","name":"万全区"},{"code":"130709","name":"崇礼区"},{"code":"130722","name":"张北县"},{"code":"130723","name":"康保县"},{"code":"130724","name":"沽源县"},{"code":"130725","name":"尚义县"},{"code":"130726","name":"蔚县"},{"code":"130727","name":"阳原县"},{"code":"130728","name":"怀安县"},{"code":"130730","name":"怀来县"},{"code":"130731","name":"涿鹿县"},{"code":"130732","name":"赤城县"}],[{"code":"130802","name":"双桥区"},{"code":"130803","name":"双滦区"},{"code":"130804","name":"鹰手营子矿区"},{"code":"130821","name":"承德县"},{"code":"130822","name":"兴隆县"},{"code":"130824","name":"滦平县"},{"code":"130825","name":"隆化县"},{"code":"130826","name":"丰宁满族自治县"},{"code":"130827","name":"宽城满族自治县"},{"code":"130828","name":"围场满族蒙古族自治县"},{"code":"130881","name":"平泉市"}],[{"code":"130902","name":"新华区"},{"code":"130903","name":"运河区"},{"code":"130921","name":"沧县"},{"code":"130922","name":"青县"},{"code":"130923","name":"东光县"},{"code":"130924","name":"海兴县"},{"code":"130925","name":"盐山县"},{"code":"130926","name":"肃宁县"},{"code":"130927","name":"南皮县"},{"code":"130928","name":"吴桥县"},{"code":"130929","name":"献县"},{"code":"130930","name":"孟村回族自治县"},{"code":"130981","name":"泊头市"},{"code":"130982","name":"任丘市"},{"code":"130983","name":"黄骅市"},{"code":"130984","name":"河间市"}],[{"code":"131002","name":"安次区"},{"code":"131003","name":"广阳区"},{"code":"131022","name":"固安县"},{"code":"131023","name":"永清县"},{"code":"131024","name":"香河县"},{"code":"131025","name":"大城县"},{"code":"131026","name":"文安县"},{"code":"131028","name":"大厂回族自治县"},{"code":"131081","name":"霸州市"},{"code":"131082","name":"三河市"}],[{"code":"131102","name":"桃城区"},{"code":"131103","name":"冀州区"},{"code":"131121","name":"枣强县"},{"code":"131122","name":"武邑县"},{"code":"131123","name":"武强县"},{"code":"131124","name":"饶阳县"},{"code":"131125","name":"安平县"},{"code":"131126","name":"故城县"},{"code":"131127","name":"景县"},{"code":"131128","name":"阜城县"},{"code":"131182","name":"深州市"}]],[[{"code":"140105","name":"小店区"},{"code":"140106","name":"迎泽区"},{"code":"140107","name":"杏花岭区"},{"code":"140108","name":"尖草坪区"},{"code":"140109","name":"万柏林区"},{"code":"140110","name":"晋源区"},{"code":"140121","name":"清徐县"},{"code":"140122","name":"阳曲县"},{"code":"140123","name":"娄烦县"},{"code":"140181","name":"古交市"}],[{"code":"140202","name":"城区"},{"code":"140203","name":"矿区"},{"code":"140211","name":"南郊区"},{"code":"140212","name":"新荣区"},{"code":"140221","name":"阳高县"},{"code":"140222","name":"天镇县"},{"code":"140223","name":"广灵县"},{"code":"140224","name":"灵丘县"},{"code":"140225","name":"浑源县"},{"code":"140226","name":"左云县"},{"code":"140227","name":"大同县"}],[{"code":"140302","name":"城区"},{"code":"140303","name":"矿区"},{"code":"140311","name":"郊区"},{"code":"140321","name":"平定县"},{"code":"140322","name":"盂县"}],[{"code":"140402","name":"城区"},{"code":"140411","name":"郊区"},{"code":"140421","name":"长治县"},{"code":"140423","name":"襄垣县"},{"code":"140424","name":"屯留县"},{"code":"140425","name":"平顺县"},{"code":"140426","name":"黎城县"},{"code":"140427","name":"壶关县"},{"code":"140428","name":"长子县"},{"code":"140429","name":"武乡县"},{"code":"140430","name":"沁县"},{"code":"140431","name":"沁源县"},{"code":"140481","name":"潞城市"}],[{"code":"140502","name":"城区"},{"code":"140521","name":"沁水县"},{"code":"140522","name":"阳城县"},{"code":"140524","name":"陵川县"},{"code":"140525","name":"泽州县"},{"code":"140581","name":"高平市"}],[{"code":"140602","name":"朔城区"},{"code":"140603","name":"平鲁区"},{"code":"140621","name":"山阴县"},{"code":"140622","name":"应县"},{"code":"140623","name":"右玉县"},{"code":"140624","name":"怀仁县"}],[{"code":"140702","name":"榆次区"},{"code":"140721","name":"榆社县"},{"code":"140722","name":"左权县"},{"code":"140723","name":"和顺县"},{"code":"140724","name":"昔阳县"},{"code":"140725","name":"寿阳县"},{"code":"140726","name":"太谷县"},{"code":"140727","name":"祁县"},{"code":"140728","name":"平遥县"},{"code":"140729","name":"灵石县"},{"code":"140781","name":"介休市"}],[{"code":"140802","name":"盐湖区"},{"code":"140821","name":"临猗县"},{"code":"140822","name":"万荣县"},{"code":"140823","name":"闻喜县"},{"code":"140824","name":"稷山县"},{"code":"140825","name":"新绛县"},{"code":"140826","name":"绛县"},{"code":"140827","name":"垣曲县"},{"code":"140828","name":"夏县"},{"code":"140829","name":"平陆县"},{"code":"140830","name":"芮城县"},{"code":"140881","name":"永济市"},{"code":"140882","name":"河津市"}],[{"code":"140902","name":"忻府区"},{"code":"140921","name":"定襄县"},{"code":"140922","name":"五台县"},{"code":"140923","name":"代县"},{"code":"140924","name":"繁峙县"},{"code":"140925","name":"宁武县"},{"code":"140926","name":"静乐县"},{"code":"140927","name":"神池县"},{"code":"140928","name":"五寨县"},{"code":"140929","name":"岢岚县"},{"code":"140930","name":"河曲县"},{"code":"140931","name":"保德县"},{"code":"140932","name":"偏关县"},{"code":"140981","name":"原平市"}],[{"code":"141002","name":"尧都区"},{"code":"141021","name":"曲沃县"},{"code":"141022","name":"翼城县"},{"code":"141023","name":"襄汾县"},{"code":"141024","name":"洪洞县"},{"code":"141025","name":"古县"},{"code":"141026","name":"安泽县"},{"code":"141027","name":"浮山县"},{"code":"141028","name":"吉县"},{"code":"141029","name":"乡宁县"},{"code":"141030","name":"大宁县"},{"code":"141031","name":"隰县"},{"code":"141032","name":"永和县"},{"code":"141033","name":"蒲县"},{"code":"141034","name":"汾西县"},{"code":"141081","name":"侯马市"},{"code":"141082","name":"霍州市"}],[{"code":"141102","name":"离石区"},{"code":"141121","name":"文水县"},{"code":"141122","name":"交城县"},{"code":"141123","name":"兴县"},{"code":"141124","name":"临县"},{"code":"141125","name":"柳林县"},{"code":"141126","name":"石楼县"},{"code":"141127","name":"岚县"},{"code":"141128","name":"方山县"},{"code":"141129","name":"中阳县"},{"code":"141130","name":"交口县"},{"code":"141181","name":"孝义市"},{"code":"141182","name":"汾阳市"}]],[[{"code":"150102","name":"新城区"},{"code":"150103","name":"回民区"},{"code":"150104","name":"玉泉区"},{"code":"150105","name":"赛罕区"},{"code":"150121","name":"土默特左旗"},{"code":"150122","name":"托克托县"},{"code":"150123","name":"和林格尔县"},{"code":"150124","name":"清水河县"},{"code":"150125","name":"武川县"}],[{"code":"150202","name":"东河区"},{"code":"150203","name":"昆都仑区"},{"code":"150204","name":"青山区"},{"code":"150205","name":"石拐区"},{"code":"150206","name":"白云鄂博矿区"},{"code":"150207","name":"九原区"},{"code":"150221","name":"土默特右旗"},{"code":"150222","name":"固阳县"},{"code":"150223","name":"达尔罕茂明安联合旗"}],[{"code":"150302","name":"海勃湾区"},{"code":"150303","name":"海南区"},{"code":"150304","name":"乌达区"}],[{"code":"150402","name":"红山区"},{"code":"150403","name":"元宝山区"},{"code":"150404","name":"松山区"},{"code":"150421","name":"阿鲁科尔沁旗"},{"code":"150422","name":"巴林左旗"},{"code":"150423","name":"巴林右旗"},{"code":"150424","name":"林西县"},{"code":"150425","name":"克什克腾旗"},{"code":"150426","name":"翁牛特旗"},{"code":"150428","name":"喀喇沁旗"},{"code":"150429","name":"宁城县"},{"code":"150430","name":"敖汉旗"}],[{"code":"150502","name":"科尔沁区"},{"code":"150521","name":"科尔沁左翼中旗"},{"code":"150522","name":"科尔沁左翼后旗"},{"code":"150523","name":"开鲁县"},{"code":"150524","name":"库伦旗"},{"code":"150525","name":"奈曼旗"},{"code":"150526","name":"扎鲁特旗"},{"code":"150581","name":"霍林郭勒市"}],[{"code":"150602","name":"东胜区"},{"code":"150603","name":"康巴什区"},{"code":"150621","name":"达拉特旗"},{"code":"150622","name":"准格尔旗"},{"code":"150623","name":"鄂托克前旗"},{"code":"150624","name":"鄂托克旗"},{"code":"150625","name":"杭锦旗"},{"code":"150626","name":"乌审旗"},{"code":"150627","name":"伊金霍洛旗"}],[{"code":"150702","name":"海拉尔区"},{"code":"150703","name":"扎赉诺尔区"},{"code":"150721","name":"阿荣旗"},{"code":"150722","name":"莫力达瓦达斡尔族自治旗"},{"code":"150723","name":"鄂伦春自治旗"},{"code":"150724","name":"鄂温克族自治旗"},{"code":"150725","name":"陈巴尔虎旗"},{"code":"150726","name":"新巴尔虎左旗"},{"code":"150727","name":"新巴尔虎右旗"},{"code":"150781","name":"满洲里市"},{"code":"150782","name":"牙克石市"},{"code":"150783","name":"扎兰屯市"},{"code":"150784","name":"额尔古纳市"},{"code":"150785","name":"根河市"}],[{"code":"150802","name":"临河区"},{"code":"150821","name":"五原县"},{"code":"150822","name":"磴口县"},{"code":"150823","name":"乌拉特前旗"},{"code":"150824","name":"乌拉特中旗"},{"code":"150825","name":"乌拉特后旗"},{"code":"150826","name":"杭锦后旗"}],[{"code":"150902","name":"集宁区"},{"code":"150921","name":"卓资县"},{"code":"150922","name":"化德县"},{"code":"150923","name":"商都县"},{"code":"150924","name":"兴和县"},{"code":"150925","name":"凉城县"},{"code":"150926","name":"察哈尔右翼前旗"},{"code":"150927","name":"察哈尔右翼中旗"},{"code":"150928","name":"察哈尔右翼后旗"},{"code":"150929","name":"四子王旗"},{"code":"150981","name":"丰镇市"}],[{"code":"152201","name":"乌兰浩特市"},{"code":"152202","name":"阿尔山市"},{"code":"152221","name":"科尔沁右翼前旗"},{"code":"152222","name":"科尔沁右翼中旗"},{"code":"152223","name":"扎赉特旗"},{"code":"152224","name":"突泉县"}],[{"code":"152501","name":"二连浩特市"},{"code":"152502","name":"锡林浩特市"},{"code":"152522","name":"阿巴嘎旗"},{"code":"152523","name":"苏尼特左旗"},{"code":"152524","name":"苏尼特右旗"},{"code":"152525","name":"东乌珠穆沁旗"},{"code":"152526","name":"西乌珠穆沁旗"},{"code":"152527","name":"太仆寺旗"},{"code":"152528","name":"镶黄旗"},{"code":"152529","name":"正镶白旗"},{"code":"152530","name":"正蓝旗"},{"code":"152531","name":"多伦县"}],[{"code":"152921","name":"阿拉善左旗"},{"code":"152922","name":"阿拉善右旗"},{"code":"152923","name":"额济纳旗"}]],[[{"code":"210102","name":"和平区"},{"code":"210103","name":"沈河区"},{"code":"210104","name":"大东区"},{"code":"210105","name":"皇姑区"},{"code":"210106","name":"铁西区"},{"code":"210111","name":"苏家屯区"},{"code":"210112","name":"浑南区"},{"code":"210113","name":"沈北新区"},{"code":"210114","name":"于洪区"},{"code":"210115","name":"辽中区"},{"code":"210123","name":"康平县"},{"code":"210124","name":"法库县"},{"code":"210181","name":"新民市"}],[{"code":"210202","name":"中山区"},{"code":"210203","name":"西岗区"},{"code":"210204","name":"沙河口区"},{"code":"210211","name":"甘井子区"},{"code":"210212","name":"旅顺口区"},{"code":"210213","name":"金州区"},{"code":"210214","name":"普兰店区"},{"code":"210224","name":"长海县"},{"code":"210281","name":"瓦房店市"},{"code":"210283","name":"庄河市"}],[{"code":"210302","name":"铁东区"},{"code":"210303","name":"铁西区"},{"code":"210304","name":"立山区"},{"code":"210311","name":"千山区"},{"code":"210321","name":"台安县"},{"code":"210323","name":"岫岩满族自治县"},{"code":"210381","name":"海城市"}],[{"code":"210402","name":"新抚区"},{"code":"210403","name":"东洲区"},{"code":"210404","name":"望花区"},{"code":"210411","name":"顺城区"},{"code":"210421","name":"抚顺县"},{"code":"210422","name":"新宾满族自治县"},{"code":"210423","name":"清原满族自治县"}],[{"code":"210502","name":"平山区"},{"code":"210503","name":"溪湖区"},{"code":"210504","name":"明山区"},{"code":"210505","name":"南芬区"},{"code":"210521","name":"本溪满族自治县"},{"code":"210522","name":"桓仁满族自治县"}],[{"code":"210602","name":"元宝区"},{"code":"210603","name":"振兴区"},{"code":"210604","name":"振安区"},{"code":"210624","name":"宽甸满族自治县"},{"code":"210681","name":"东港市"},{"code":"210682","name":"凤城市"}],[{"code":"210702","name":"古塔区"},{"code":"210703","name":"凌河区"},{"code":"210711","name":"太和区"},{"code":"210726","name":"黑山县"},{"code":"210727","name":"义县"},{"code":"210781","name":"凌海市"},{"code":"210782","name":"北镇市"}],[{"code":"210802","name":"站前区"},{"code":"210803","name":"西市区"},{"code":"210804","name":"鲅鱼圈区"},{"code":"210811","name":"老边区"},{"code":"210881","name":"盖州市"},{"code":"210882","name":"大石桥市"}],[{"code":"210902","name":"海州区"},{"code":"210903","name":"新邱区"},{"code":"210904","name":"太平区"},{"code":"210905","name":"清河门区"},{"code":"210911","name":"细河区"},{"code":"210921","name":"阜新蒙古族自治县"},{"code":"210922","name":"彰武县"}],[{"code":"211002","name":"白塔区"},{"code":"211003","name":"文圣区"},{"code":"211004","name":"宏伟区"},{"code":"211005","name":"弓长岭区"},{"code":"211011","name":"太子河区"},{"code":"211021","name":"辽阳县"},{"code":"211081","name":"灯塔市"}],[{"code":"211102","name":"双台子区"},{"code":"211103","name":"兴隆台区"},{"code":"211104","name":"大洼区"},{"code":"211122","name":"盘山县"}],[{"code":"211202","name":"银州区"},{"code":"211204","name":"清河区"},{"code":"211221","name":"铁岭县"},{"code":"211223","name":"西丰县"},{"code":"211224","name":"昌图县"},{"code":"211281","name":"调兵山市"},{"code":"211282","name":"开原市"}],[{"code":"211302","name":"双塔区"},{"code":"211303","name":"龙城区"},{"code":"211321","name":"朝阳县"},{"code":"211322","name":"建平县"},{"code":"211324","name":"喀喇沁左翼蒙古族自治县"},{"code":"211381","name":"北票市"},{"code":"211382","name":"凌源市"}],[{"code":"211402","name":"连山区"},{"code":"211403","name":"龙港区"},{"code":"211404","name":"南票区"},{"code":"211421","name":"绥中县"},{"code":"211422","name":"建昌县"},{"code":"211481","name":"兴城市"}]],[[{"code":"220102","name":"南关区"},{"code":"220103","name":"宽城区"},{"code":"220104","name":"朝阳区"},{"code":"220105","name":"二道区"},{"code":"220106","name":"绿园区"},{"code":"220112","name":"双阳区"},{"code":"220113","name":"九台区"},{"code":"220122","name":"农安县"},{"code":"220182","name":"榆树市"},{"code":"220183","name":"德惠市"}],[{"code":"220202","name":"昌邑区"},{"code":"220203","name":"龙潭区"},{"code":"220204","name":"船营区"},{"code":"220211","name":"丰满区"},{"code":"220221","name":"永吉县"},{"code":"220281","name":"蛟河市"},{"code":"220282","name":"桦甸市"},{"code":"220283","name":"舒兰市"},{"code":"220284","name":"磐石市"}],[{"code":"220302","name":"铁西区"},{"code":"220303","name":"铁东区"},{"code":"220322","name":"梨树县"},{"code":"220323","name":"伊通满族自治县"},{"code":"220381","name":"公主岭市"},{"code":"220382","name":"双辽市"}],[{"code":"220402","name":"龙山区"},{"code":"220403","name":"西安区"},{"code":"220421","name":"东丰县"},{"code":"220422","name":"东辽县"}],[{"code":"220502","name":"东昌区"},{"code":"220503","name":"二道江区"},{"code":"220521","name":"通化县"},{"code":"220523","name":"辉南县"},{"code":"220524","name":"柳河县"},{"code":"220581","name":"梅河口市"},{"code":"220582","name":"集安市"}],[{"code":"220602","name":"浑江区"},{"code":"220605","name":"江源区"},{"code":"220621","name":"抚松县"},{"code":"220622","name":"靖宇县"},{"code":"220623","name":"长白朝鲜族自治县"},{"code":"220681","name":"临江市"}],[{"code":"220702","name":"宁江区"},{"code":"220721","name":"前郭尔罗斯蒙古族自治县"},{"code":"220722","name":"长岭县"},{"code":"220723","name":"乾安县"},{"code":"220781","name":"扶余市"}],[{"code":"220802","name":"洮北区"},{"code":"220821","name":"镇赉县"},{"code":"220822","name":"通榆县"},{"code":"220881","name":"洮南市"},{"code":"220882","name":"大安市"}],[{"code":"222401","name":"延吉市"},{"code":"222402","name":"图们市"},{"code":"222403","name":"敦化市"},{"code":"222404","name":"珲春市"},{"code":"222405","name":"龙井市"},{"code":"222406","name":"和龙市"},{"code":"222424","name":"汪清县"},{"code":"222426","name":"安图县"}]],[[{"code":"230102","name":"道里区"},{"code":"230103","name":"南岗区"},{"code":"230104","name":"道外区"},{"code":"230108","name":"平房区"},{"code":"230109","name":"松北区"},{"code":"230110","name":"香坊区"},{"code":"230111","name":"呼兰区"},{"code":"230112","name":"阿城区"},{"code":"230113","name":"双城区"},{"code":"230123","name":"依兰县"},{"code":"230124","name":"方正县"},{"code":"230125","name":"宾县"},{"code":"230126","name":"巴彦县"},{"code":"230127","name":"木兰县"},{"code":"230128","name":"通河县"},{"code":"230129","name":"延寿县"},{"code":"230183","name":"尚志市"},{"code":"230184","name":"五常市"}],[{"code":"230202","name":"龙沙区"},{"code":"230203","name":"建华区"},{"code":"230204","name":"铁锋区"},{"code":"230205","name":"昂昂溪区"},{"code":"230206","name":"富拉尔基区"},{"code":"230207","name":"碾子山区"},{"code":"230208","name":"梅里斯达斡尔族区"},{"code":"230221","name":"龙江县"},{"code":"230223","name":"依安县"},{"code":"230224","name":"泰来县"},{"code":"230225","name":"甘南县"},{"code":"230227","name":"富裕县"},{"code":"230229","name":"克山县"},{"code":"230230","name":"克东县"},{"code":"230231","name":"拜泉县"},{"code":"230281","name":"讷河市"}],[{"code":"230302","name":"鸡冠区"},{"code":"230303","name":"恒山区"},{"code":"230304","name":"滴道区"},{"code":"230305","name":"梨树区"},{"code":"230306","name":"城子河区"},{"code":"230307","name":"麻山区"},{"code":"230321","name":"鸡东县"},{"code":"230381","name":"虎林市"},{"code":"230382","name":"密山市"}],[{"code":"230402","name":"向阳区"},{"code":"230403","name":"工农区"},{"code":"230404","name":"南山区"},{"code":"230405","name":"兴安区"},{"code":"230406","name":"东山区"},{"code":"230407","name":"兴山区"},{"code":"230421","name":"萝北县"},{"code":"230422","name":"绥滨县"}],[{"code":"230502","name":"尖山区"},{"code":"230503","name":"岭东区"},{"code":"230505","name":"四方台区"},{"code":"230506","name":"宝山区"},{"code":"230521","name":"集贤县"},{"code":"230522","name":"友谊县"},{"code":"230523","name":"宝清县"},{"code":"230524","name":"饶河县"}],[{"code":"230602","name":"萨尔图区"},{"code":"230603","name":"龙凤区"},{"code":"230604","name":"让胡路区"},{"code":"230605","name":"红岗区"},{"code":"230606","name":"大同区"},{"code":"230621","name":"肇州县"},{"code":"230622","name":"肇源县"},{"code":"230623","name":"林甸县"},{"code":"230624","name":"杜尔伯特蒙古族自治县"}],[{"code":"230702","name":"伊春区"},{"code":"230703","name":"南岔区"},{"code":"230704","name":"友好区"},{"code":"230705","name":"西林区"},{"code":"230706","name":"翠峦区"},{"code":"230707","name":"新青区"},{"code":"230708","name":"美溪区"},{"code":"230709","name":"金山屯区"},{"code":"230710","name":"五营区"},{"code":"230711","name":"乌马河区"},{"code":"230712","name":"汤旺河区"},{"code":"230713","name":"带岭区"},{"code":"230714","name":"乌伊岭区"},{"code":"230715","name":"红星区"},{"code":"230716","name":"上甘岭区"},{"code":"230722","name":"嘉荫县"},{"code":"230781","name":"铁力市"}],[{"code":"230803","name":"向阳区"},{"code":"230804","name":"前进区"},{"code":"230805","name":"东风区"},{"code":"230811","name":"郊区"},{"code":"230822","name":"桦南县"},{"code":"230826","name":"桦川县"},{"code":"230828","name":"汤原县"},{"code":"230881","name":"同江市"},{"code":"230882","name":"富锦市"},{"code":"230883","name":"抚远市"}],[{"code":"230902","name":"新兴区"},{"code":"230903","name":"桃山区"},{"code":"230904","name":"茄子河区"},{"code":"230921","name":"勃利县"}],[{"code":"231002","name":"东安区"},{"code":"231003","name":"阳明区"},{"code":"231004","name":"爱民区"},{"code":"231005","name":"西安区"},{"code":"231025","name":"林口县"},{"code":"231081","name":"绥芬河市"},{"code":"231083","name":"海林市"},{"code":"231084","name":"宁安市"},{"code":"231085","name":"穆棱市"},{"code":"231086","name":"东宁市"}],[{"code":"231102","name":"爱辉区"},{"code":"231121","name":"嫩江县"},{"code":"231123","name":"逊克县"},{"code":"231124","name":"孙吴县"},{"code":"231181","name":"北安市"},{"code":"231182","name":"五大连池市"}],[{"code":"231202","name":"北林区"},{"code":"231221","name":"望奎县"},{"code":"231222","name":"兰西县"},{"code":"231223","name":"青冈县"},{"code":"231224","name":"庆安县"},{"code":"231225","name":"明水县"},{"code":"231226","name":"绥棱县"},{"code":"231281","name":"安达市"},{"code":"231282","name":"肇东市"},{"code":"231283","name":"海伦市"}],[{"code":"232701","name":"加格达奇区"},{"code":"232702","name":"松岭区"},{"code":"232703","name":"新林区"},{"code":"232704","name":"呼中区"},{"code":"232721","name":"呼玛县"},{"code":"232722","name":"塔河县"},{"code":"232723","name":"漠河县"}]],[[{"code":"310101","name":"黄浦区"},{"code":"310104","name":"徐汇区"},{"code":"310105","name":"长宁区"},{"code":"310106","name":"静安区"},{"code":"310107","name":"普陀区"},{"code":"310109","name":"虹口区"},{"code":"310110","name":"杨浦区"},{"code":"310112","name":"闵行区"},{"code":"310113","name":"宝山区"},{"code":"310114","name":"嘉定区"},{"code":"310115","name":"浦东新区"},{"code":"310116","name":"金山区"},{"code":"310117","name":"松江区"},{"code":"310118","name":"青浦区"},{"code":"310120","name":"奉贤区"},{"code":"310151","name":"崇明区"}]],[[{"code":"320102","name":"玄武区"},{"code":"320104","name":"秦淮区"},{"code":"320105","name":"建邺区"},{"code":"320106","name":"鼓楼区"},{"code":"320111","name":"浦口区"},{"code":"320113","name":"栖霞区"},{"code":"320114","name":"雨花台区"},{"code":"320115","name":"江宁区"},{"code":"320116","name":"六合区"},{"code":"320117","name":"溧水区"},{"code":"320118","name":"高淳区"}],[{"code":"320205","name":"锡山区"},{"code":"320206","name":"惠山区"},{"code":"320211","name":"滨湖区"},{"code":"320213","name":"梁溪区"},{"code":"320214","name":"新吴区"},{"code":"320281","name":"江阴市"},{"code":"320282","name":"宜兴市"}],[{"code":"320302","name":"鼓楼区"},{"code":"320303","name":"云龙区"},{"code":"320305","name":"贾汪区"},{"code":"320311","name":"泉山区"},{"code":"320312","name":"铜山区"},{"code":"320321","name":"丰县"},{"code":"320322","name":"沛县"},{"code":"320324","name":"睢宁县"},{"code":"320381","name":"新沂市"},{"code":"320382","name":"邳州市"}],[{"code":"320402","name":"天宁区"},{"code":"320404","name":"钟楼区"},{"code":"320411","name":"新北区"},{"code":"320412","name":"武进区"},{"code":"320413","name":"金坛区"},{"code":"320481","name":"溧阳市"}],[{"code":"320505","name":"虎丘区"},{"code":"320506","name":"吴中区"},{"code":"320507","name":"相城区"},{"code":"320508","name":"姑苏区"},{"code":"320509","name":"吴江区"},{"code":"320581","name":"常熟市"},{"code":"320582","name":"张家港市"},{"code":"320583","name":"昆山市"},{"code":"320585","name":"太仓市"}],[{"code":"320602","name":"崇川区"},{"code":"320611","name":"港闸区"},{"code":"320612","name":"通州区"},{"code":"320621","name":"海安县"},{"code":"320623","name":"如东县"},{"code":"320681","name":"启东市"},{"code":"320682","name":"如皋市"},{"code":"320684","name":"海门市"}],[{"code":"320703","name":"连云区"},{"code":"320706","name":"海州区"},{"code":"320707","name":"赣榆区"},{"code":"320722","name":"东海县"},{"code":"320723","name":"灌云县"},{"code":"320724","name":"灌南县"}],[{"code":"320803","name":"淮安区"},{"code":"320804","name":"淮阴区"},{"code":"320812","name":"清江浦区"},{"code":"320813","name":"洪泽区"},{"code":"320826","name":"涟水县"},{"code":"320830","name":"盱眙县"},{"code":"320831","name":"金湖县"}],[{"code":"320902","name":"亭湖区"},{"code":"320903","name":"盐都区"},{"code":"320904","name":"大丰区"},{"code":"320921","name":"响水县"},{"code":"320922","name":"滨海县"},{"code":"320923","name":"阜宁县"},{"code":"320924","name":"射阳县"},{"code":"320925","name":"建湖县"},{"code":"320981","name":"东台市"}],[{"code":"321002","name":"广陵区"},{"code":"321003","name":"邗江区"},{"code":"321012","name":"江都区"},{"code":"321023","name":"宝应县"},{"code":"321081","name":"仪征市"},{"code":"321084","name":"高邮市"}],[{"code":"321102","name":"京口区"},{"code":"321111","name":"润州区"},{"code":"321112","name":"丹徒区"},{"code":"321181","name":"丹阳市"},{"code":"321182","name":"扬中市"},{"code":"321183","name":"句容市"}],[{"code":"321202","name":"海陵区"},{"code":"321203","name":"高港区"},{"code":"321204","name":"姜堰区"},{"code":"321281","name":"兴化市"},{"code":"321282","name":"靖江市"},{"code":"321283","name":"泰兴市"}],[{"code":"321302","name":"宿城区"},{"code":"321311","name":"宿豫区"},{"code":"321322","name":"沭阳县"},{"code":"321323","name":"泗阳县"},{"code":"321324","name":"泗洪县"}]],[[{"code":"330102","name":"上城区"},{"code":"330105","name":"拱墅区"},{"code":"330106","name":"西湖区"},{"code":"330108","name":"滨江区"},{"code":"330109","name":"萧山区"},{"code":"330110","name":"余杭区"},{"code":"330111","name":"富阳区"},{"code":"330112","name":"临安区"},{"code":"330113","name":"临平区"},{"code":"330114","name":"钱塘区"},{"code":"330122","name":"桐庐县"},{"code":"330127","name":"淳安县"},{"code":"330182","name":"建德市"}],[{"code":"330203","name":"海曙区"},{"code":"330205","name":"江北区"},{"code":"330206","name":"北仑区"},{"code":"330211","name":"镇海区"},{"code":"330212","name":"鄞州区"},{"code":"330213","name":"奉化区"},{"code":"330225","name":"象山县"},{"code":"330226","name":"宁海县"},{"code":"330281","name":"余姚市"},{"code":"330282","name":"慈溪市"}],[{"code":"330302","name":"鹿城区"},{"code":"330303","name":"龙湾区"},{"code":"330304","name":"瓯海区"},{"code":"330305","name":"洞头区"},{"code":"330324","name":"永嘉县"},{"code":"330326","name":"平阳县"},{"code":"330327","name":"苍南县"},{"code":"330328","name":"文成县"},{"code":"330329","name":"泰顺县"},{"code":"330381","name":"瑞安市"},{"code":"330382","name":"乐清市"}],[{"code":"330402","name":"南湖区"},{"code":"330411","name":"秀洲区"},{"code":"330421","name":"嘉善县"},{"code":"330424","name":"海盐县"},{"code":"330481","name":"海宁市"},{"code":"330482","name":"平湖市"},{"code":"330483","name":"桐乡市"}],[{"code":"330502","name":"吴兴区"},{"code":"330503","name":"南浔区"},{"code":"330521","name":"德清县"},{"code":"330522","name":"长兴县"},{"code":"330523","name":"安吉县"}],[{"code":"330602","name":"越城区"},{"code":"330603","name":"柯桥区"},{"code":"330604","name":"上虞区"},{"code":"330624","name":"新昌县"},{"code":"330681","name":"诸暨市"},{"code":"330683","name":"嵊州市"}],[{"code":"330702","name":"婺城区"},{"code":"330703","name":"金东区"},{"code":"330723","name":"武义县"},{"code":"330726","name":"浦江县"},{"code":"330727","name":"磐安县"},{"code":"330781","name":"兰溪市"},{"code":"330782","name":"义乌市"},{"code":"330783","name":"东阳市"},{"code":"330784","name":"永康市"}],[{"code":"330802","name":"柯城区"},{"code":"330803","name":"衢江区"},{"code":"330822","name":"常山县"},{"code":"330824","name":"开化县"},{"code":"330825","name":"龙游县"},{"code":"330881","name":"江山市"}],[{"code":"330902","name":"定海区"},{"code":"330903","name":"普陀区"},{"code":"330921","name":"岱山县"},{"code":"330922","name":"嵊泗县"}],[{"code":"331002","name":"椒江区"},{"code":"331003","name":"黄岩区"},{"code":"331004","name":"路桥区"},{"code":"331022","name":"三门县"},{"code":"331023","name":"天台县"},{"code":"331024","name":"仙居县"},{"code":"331081","name":"温岭市"},{"code":"331082","name":"临海市"},{"code":"331083","name":"玉环市"}],[{"code":"331102","name":"莲都区"},{"code":"331121","name":"青田县"},{"code":"331122","name":"缙云县"},{"code":"331123","name":"遂昌县"},{"code":"331124","name":"松阳县"},{"code":"331125","name":"云和县"},{"code":"331126","name":"庆元县"},{"code":"331127","name":"景宁畲族自治县"},{"code":"331181","name":"龙泉市"}]],[[{"code":"340102","name":"瑶海区"},{"code":"340103","name":"庐阳区"},{"code":"340104","name":"蜀山区"},{"code":"340111","name":"包河区"},{"code":"340121","name":"长丰县"},{"code":"340122","name":"肥东县"},{"code":"340123","name":"肥西县"},{"code":"340124","name":"庐江县"},{"code":"340181","name":"巢湖市"}],[{"code":"340202","name":"镜湖区"},{"code":"340203","name":"弋江区"},{"code":"340207","name":"鸠江区"},{"code":"340208","name":"三山区"},{"code":"340221","name":"芜湖县"},{"code":"340222","name":"繁昌县"},{"code":"340223","name":"南陵县"},{"code":"340225","name":"无为县"}],[{"code":"340302","name":"龙子湖区"},{"code":"340303","name":"蚌山区"},{"code":"340304","name":"禹会区"},{"code":"340311","name":"淮上区"},{"code":"340321","name":"怀远县"},{"code":"340322","name":"五河县"},{"code":"340323","name":"固镇县"}],[{"code":"340402","name":"大通区"},{"code":"340403","name":"田家庵区"},{"code":"340404","name":"谢家集区"},{"code":"340405","name":"八公山区"},{"code":"340406","name":"潘集区"},{"code":"340421","name":"凤台县"},{"code":"340422","name":"寿县"}],[{"code":"340503","name":"花山区"},{"code":"340504","name":"雨山区"},{"code":"340506","name":"博望区"},{"code":"340521","name":"当涂县"},{"code":"340522","name":"含山县"},{"code":"340523","name":"和县"}],[{"code":"340602","name":"杜集区"},{"code":"340603","name":"相山区"},{"code":"340604","name":"烈山区"},{"code":"340621","name":"濉溪县"}],[{"code":"340705","name":"铜官区"},{"code":"340706","name":"义安区"},{"code":"340711","name":"郊区"},{"code":"340722","name":"枞阳县"}],[{"code":"340802","name":"迎江区"},{"code":"340803","name":"大观区"},{"code":"340811","name":"宜秀区"},{"code":"340822","name":"怀宁县"},{"code":"340824","name":"潜山县"},{"code":"340825","name":"太湖县"},{"code":"340826","name":"宿松县"},{"code":"340827","name":"望江县"},{"code":"340828","name":"岳西县"},{"code":"340881","name":"桐城市"}],[{"code":"341002","name":"屯溪区"},{"code":"341003","name":"黄山区"},{"code":"341004","name":"徽州区"},{"code":"341021","name":"歙县"},{"code":"341022","name":"休宁县"},{"code":"341023","name":"黟县"},{"code":"341024","name":"祁门县"}],[{"code":"341102","name":"琅琊区"},{"code":"341103","name":"南谯区"},{"code":"341122","name":"来安县"},{"code":"341124","name":"全椒县"},{"code":"341125","name":"定远县"},{"code":"341126","name":"凤阳县"},{"code":"341181","name":"天长市"},{"code":"341182","name":"明光市"}],[{"code":"341202","name":"颍州区"},{"code":"341203","name":"颍东区"},{"code":"341204","name":"颍泉区"},{"code":"341221","name":"临泉县"},{"code":"341222","name":"太和县"},{"code":"341225","name":"阜南县"},{"code":"341226","name":"颍上县"},{"code":"341282","name":"界首市"}],[{"code":"341302","name":"埇桥区"},{"code":"341321","name":"砀山县"},{"code":"341322","name":"萧县"},{"code":"341323","name":"灵璧县"},{"code":"341324","name":"泗县"}],[{"code":"341502","name":"金安区"},{"code":"341503","name":"裕安区"},{"code":"341504","name":"叶集区"},{"code":"341522","name":"霍邱县"},{"code":"341523","name":"舒城县"},{"code":"341524","name":"金寨县"},{"code":"341525","name":"霍山县"}],[{"code":"341602","name":"谯城区"},{"code":"341621","name":"涡阳县"},{"code":"341622","name":"蒙城县"},{"code":"341623","name":"利辛县"}],[{"code":"341702","name":"贵池区"},{"code":"341721","name":"东至县"},{"code":"341722","name":"石台县"},{"code":"341723","name":"青阳县"}],[{"code":"341802","name":"宣州区"},{"code":"341821","name":"郎溪县"},{"code":"341822","name":"广德县"},{"code":"341823","name":"泾县"},{"code":"341824","name":"绩溪县"},{"code":"341825","name":"旌德县"},{"code":"341881","name":"宁国市"}]],[[{"code":"350102","name":"鼓楼区"},{"code":"350103","name":"台江区"},{"code":"350104","name":"仓山区"},{"code":"350105","name":"马尾区"},{"code":"350111","name":"晋安区"},{"code":"350112","name":"长乐区"},{"code":"350121","name":"闽侯县"},{"code":"350122","name":"连江县"},{"code":"350123","name":"罗源县"},{"code":"350124","name":"闽清县"},{"code":"350125","name":"永泰县"},{"code":"350128","name":"平潭县"},{"code":"350181","name":"福清市"}],[{"code":"350203","name":"思明区"},{"code":"350205","name":"海沧区"},{"code":"350206","name":"湖里区"},{"code":"350211","name":"集美区"},{"code":"350212","name":"同安区"},{"code":"350213","name":"翔安区"}],[{"code":"350302","name":"城厢区"},{"code":"350303","name":"涵江区"},{"code":"350304","name":"荔城区"},{"code":"350305","name":"秀屿区"},{"code":"350322","name":"仙游县"}],[{"code":"350404","name":"三元区"},{"code":"350405","name":"沙县区"},{"code":"350421","name":"明溪县"},{"code":"350423","name":"清流县"},{"code":"350424","name":"宁化县"},{"code":"350425","name":"大田县"},{"code":"350426","name":"尤溪县"},{"code":"350428","name":"将乐县"},{"code":"350429","name":"泰宁县"},{"code":"350430","name":"建宁县"},{"code":"350481","name":"永安市"}],[{"code":"350502","name":"鲤城区"},{"code":"350503","name":"丰泽区"},{"code":"350504","name":"洛江区"},{"code":"350505","name":"泉港区"},{"code":"350521","name":"惠安县"},{"code":"350524","name":"安溪县"},{"code":"350525","name":"永春县"},{"code":"350526","name":"德化县"},{"code":"350527","name":"金门县"},{"code":"350581","name":"石狮市"},{"code":"350582","name":"晋江市"},{"code":"350583","name":"南安市"}],[{"code":"350602","name":"芗城区"},{"code":"350603","name":"龙文区"},{"code":"350604","name":"龙海区"},{"code":"350605","name":"长泰区"},{"code":"350622","name":"云霄县"},{"code":"350623","name":"漳浦县"},{"code":"350624","name":"诏安县"},{"code":"350626","name":"东山县"},{"code":"350627","name":"南靖县"},{"code":"350628","name":"平和县"},{"code":"350629","name":"华安县"}],[{"code":"350702","name":"延平区"},{"code":"350703","name":"建阳区"},{"code":"350721","name":"顺昌县"},{"code":"350722","name":"浦城县"},{"code":"350723","name":"光泽县"},{"code":"350724","name":"松溪县"},{"code":"350725","name":"政和县"},{"code":"350781","name":"邵武市"},{"code":"350782","name":"武夷山市"},{"code":"350783","name":"建瓯市"}],[{"code":"350802","name":"新罗区"},{"code":"350803","name":"永定区"},{"code":"350821","name":"长汀县"},{"code":"350823","name":"上杭县"},{"code":"350824","name":"武平县"},{"code":"350825","name":"连城县"},{"code":"350881","name":"漳平市"}],[{"code":"350902","name":"蕉城区"},{"code":"350921","name":"霞浦县"},{"code":"350922","name":"古田县"},{"code":"350923","name":"屏南县"},{"code":"350924","name":"寿宁县"},{"code":"350925","name":"周宁县"},{"code":"350926","name":"柘荣县"},{"code":"350981","name":"福安市"},{"code":"350982","name":"福鼎市"}]],[[{"code":"360102","name":"东湖区"},{"code":"360103","name":"西湖区"},{"code":"360104","name":"青云谱区"},{"code":"360105","name":"湾里区"},{"code":"360111","name":"青山湖区"},{"code":"360112","name":"新建区"},{"code":"360121","name":"南昌县"},{"code":"360123","name":"安义县"},{"code":"360124","name":"进贤县"}],[{"code":"360202","name":"昌江区"},{"code":"360203","name":"珠山区"},{"code":"360222","name":"浮梁县"},{"code":"360281","name":"乐平市"}],[{"code":"360302","name":"安源区"},{"code":"360313","name":"湘东区"},{"code":"360321","name":"莲花县"},{"code":"360322","name":"上栗县"},{"code":"360323","name":"芦溪县"}],[{"code":"360402","name":"濂溪区"},{"code":"360403","name":"浔阳区"},{"code":"360404","name":"柴桑区"},{"code":"360423","name":"武宁县"},{"code":"360424","name":"修水县"},{"code":"360425","name":"永修县"},{"code":"360426","name":"德安县"},{"code":"360428","name":"都昌县"},{"code":"360429","name":"湖口县"},{"code":"360430","name":"彭泽县"},{"code":"360481","name":"瑞昌市"},{"code":"360482","name":"共青城市"},{"code":"360483","name":"庐山市"}],[{"code":"360502","name":"渝水区"},{"code":"360521","name":"分宜县"}],[{"code":"360602","name":"月湖区"},{"code":"360622","name":"余江区"},{"code":"360681","name":"贵溪市"}],[{"code":"360702","name":"章贡区"},{"code":"360703","name":"南康区"},{"code":"360704","name":"赣县区"},{"code":"360722","name":"信丰县"},{"code":"360723","name":"大余县"},{"code":"360724","name":"上犹县"},{"code":"360725","name":"崇义县"},{"code":"360726","name":"安远县"},{"code":"360727","name":"龙南县"},{"code":"360728","name":"定南县"},{"code":"360729","name":"全南县"},{"code":"360730","name":"宁都县"},{"code":"360731","name":"于都县"},{"code":"360732","name":"兴国县"},{"code":"360733","name":"会昌县"},{"code":"360734","name":"寻乌县"},{"code":"360735","name":"石城县"},{"code":"360781","name":"瑞金市"}],[{"code":"360802","name":"吉州区"},{"code":"360803","name":"青原区"},{"code":"360821","name":"吉安县"},{"code":"360822","name":"吉水县"},{"code":"360823","name":"峡江县"},{"code":"360824","name":"新干县"},{"code":"360825","name":"永丰县"},{"code":"360826","name":"泰和县"},{"code":"360827","name":"遂川县"},{"code":"360828","name":"万安县"},{"code":"360829","name":"安福县"},{"code":"360830","name":"永新县"},{"code":"360881","name":"井冈山市"}],[{"code":"360902","name":"袁州区"},{"code":"360921","name":"奉新县"},{"code":"360922","name":"万载县"},{"code":"360923","name":"上高县"},{"code":"360924","name":"宜丰县"},{"code":"360925","name":"靖安县"},{"code":"360926","name":"铜鼓县"},{"code":"360981","name":"丰城市"},{"code":"360982","name":"樟树市"},{"code":"360983","name":"高安市"}],[{"code":"361002","name":"临川区"},{"code":"361003","name":"东乡区"},{"code":"361021","name":"南城县"},{"code":"361022","name":"黎川县"},{"code":"361023","name":"南丰县"},{"code":"361024","name":"崇仁县"},{"code":"361025","name":"乐安县"},{"code":"361026","name":"宜黄县"},{"code":"361027","name":"金溪县"},{"code":"361028","name":"资溪县"},{"code":"361030","name":"广昌县"}],[{"code":"361102","name":"信州区"},{"code":"361103","name":"广丰区"},{"code":"361121","name":"上饶县"},{"code":"361123","name":"玉山县"},{"code":"361124","name":"铅山县"},{"code":"361125","name":"横峰县"},{"code":"361126","name":"弋阳县"},{"code":"361127","name":"余干县"},{"code":"361128","name":"鄱阳县"},{"code":"361129","name":"万年县"},{"code":"361130","name":"婺源县"},{"code":"361181","name":"德兴市"}]],[[{"code":"370102","name":"历下区"},{"code":"370103","name":"市中区"},{"code":"370104","name":"槐荫区"},{"code":"370105","name":"天桥区"},{"code":"370112","name":"历城区"},{"code":"370113","name":"长清区"},{"code":"370114","name":"章丘区"},{"code":"370124","name":"平阴县"},{"code":"370125","name":"济阳县"},{"code":"370126","name":"商河县"}],[{"code":"370202","name":"市南区"},{"code":"370203","name":"市北区"},{"code":"370211","name":"黄岛区"},{"code":"370212","name":"崂山区"},{"code":"370213","name":"李沧区"},{"code":"370214","name":"城阳区"},{"code":"370215","name":"即墨区"},{"code":"370281","name":"胶州市"},{"code":"370283","name":"平度市"},{"code":"370285","name":"莱西市"}],[{"code":"370302","name":"淄川区"},{"code":"370303","name":"张店区"},{"code":"370304","name":"博山区"},{"code":"370305","name":"临淄区"},{"code":"370306","name":"周村区"},{"code":"370321","name":"桓台县"},{"code":"370322","name":"高青县"},{"code":"370323","name":"沂源县"}],[{"code":"370402","name":"市中区"},{"code":"370403","name":"薛城区"},{"code":"370404","name":"峄城区"},{"code":"370405","name":"台儿庄区"},{"code":"370406","name":"山亭区"},{"code":"370481","name":"滕州市"}],[{"code":"370502","name":"东营区"},{"code":"370503","name":"河口区"},{"code":"370505","name":"垦利区"},{"code":"370522","name":"利津县"},{"code":"370523","name":"广饶县"}],[{"code":"370602","name":"芝罘区"},{"code":"370611","name":"福山区"},{"code":"370612","name":"牟平区"},{"code":"370613","name":"莱山区"},{"code":"370634","name":"长岛县"},{"code":"370681","name":"龙口市"},{"code":"370682","name":"莱阳市"},{"code":"370683","name":"莱州市"},{"code":"370684","name":"蓬莱市"},{"code":"370685","name":"招远市"},{"code":"370686","name":"栖霞市"},{"code":"370687","name":"海阳市"}],[{"code":"370702","name":"潍城区"},{"code":"370703","name":"寒亭区"},{"code":"370704","name":"坊子区"},{"code":"370705","name":"奎文区"},{"code":"370724","name":"临朐县"},{"code":"370725","name":"昌乐县"},{"code":"370781","name":"青州市"},{"code":"370782","name":"诸城市"},{"code":"370783","name":"寿光市"},{"code":"370784","name":"安丘市"},{"code":"370785","name":"高密市"},{"code":"370786","name":"昌邑市"}],[{"code":"370811","name":"任城区"},{"code":"370812","name":"兖州区"},{"code":"370826","name":"微山县"},{"code":"370827","name":"鱼台县"},{"code":"370828","name":"金乡县"},{"code":"370829","name":"嘉祥县"},{"code":"370830","name":"汶上县"},{"code":"370831","name":"泗水县"},{"code":"370832","name":"梁山县"},{"code":"370881","name":"曲阜市"},{"code":"370883","name":"邹城市"}],[{"code":"370902","name":"泰山区"},{"code":"370911","name":"岱岳区"},{"code":"370921","name":"宁阳县"},{"code":"370923","name":"东平县"},{"code":"370982","name":"新泰市"},{"code":"370983","name":"肥城市"}],[{"code":"371002","name":"环翠区"},{"code":"371003","name":"文登区"},{"code":"371082","name":"荣成市"},{"code":"371083","name":"乳山市"}],[{"code":"371102","name":"东港区"},{"code":"371103","name":"岚山区"},{"code":"371121","name":"五莲县"},{"code":"371122","name":"莒县"}],[{"code":"371202","name":"莱城区"},{"code":"371203","name":"钢城区"}],[{"code":"371302","name":"兰山区"},{"code":"371311","name":"罗庄区"},{"code":"371312","name":"河东区"},{"code":"371321","name":"沂南县"},{"code":"371322","name":"郯城县"},{"code":"371323","name":"沂水县"},{"code":"371324","name":"兰陵县"},{"code":"371325","name":"费县"},{"code":"371326","name":"平邑县"},{"code":"371327","name":"莒南县"},{"code":"371328","name":"蒙阴县"},{"code":"371329","name":"临沭县"}],[{"code":"371402","name":"德城区"},{"code":"371403","name":"陵城区"},{"code":"371422","name":"宁津县"},{"code":"371423","name":"庆云县"},{"code":"371424","name":"临邑县"},{"code":"371425","name":"齐河县"},{"code":"371426","name":"平原县"},{"code":"371427","name":"夏津县"},{"code":"371428","name":"武城县"},{"code":"371481","name":"乐陵市"},{"code":"371482","name":"禹城市"}],[{"code":"371502","name":"东昌府区"},{"code":"371521","name":"阳谷县"},{"code":"371522","name":"莘县"},{"code":"371523","name":"茌平县"},{"code":"371524","name":"东阿县"},{"code":"371525","name":"冠县"},{"code":"371526","name":"高唐县"},{"code":"371581","name":"临清市"}],[{"code":"371602","name":"滨城区"},{"code":"371603","name":"沾化区"},{"code":"371621","name":"惠民县"},{"code":"371622","name":"阳信县"},{"code":"371623","name":"无棣县"},{"code":"371625","name":"博兴县"},{"code":"371626","name":"邹平县"}],[{"code":"371702","name":"牡丹区"},{"code":"371703","name":"定陶区"},{"code":"371721","name":"曹县"},{"code":"371722","name":"单县"},{"code":"371723","name":"成武县"},{"code":"371724","name":"巨野县"},{"code":"371725","name":"郓城县"},{"code":"371726","name":"鄄城县"},{"code":"371728","name":"东明县"}]],[[{"code":"410102","name":"中原区"},{"code":"410103","name":"二七区"},{"code":"410104","name":"管城回族区"},{"code":"410105","name":"金水区"},{"code":"410106","name":"上街区"},{"code":"410108","name":"惠济区"},{"code":"410122","name":"中牟县"},{"code":"410181","name":"巩义市"},{"code":"410182","name":"荥阳市"},{"code":"410183","name":"新密市"},{"code":"410184","name":"新郑市"},{"code":"410185","name":"登封市"}],[{"code":"410202","name":"龙亭区"},{"code":"410203","name":"顺河回族区"},{"code":"410204","name":"鼓楼区"},{"code":"410205","name":"禹王台区"},{"code":"410212","name":"祥符区"},{"code":"410221","name":"杞县"},{"code":"410222","name":"通许县"},{"code":"410223","name":"尉氏县"},{"code":"410225","name":"兰考县"}],[{"code":"410302","name":"老城区"},{"code":"410303","name":"西工区"},{"code":"410304","name":"瀍河回族区"},{"code":"410305","name":"涧西区"},{"code":"410307","name":"偃师区"},{"code":"410308","name":"孟津区"},{"code":"410311","name":"洛龙区"},{"code":"410323","name":"新安县"},{"code":"410324","name":"栾川县"},{"code":"410325","name":"嵩县"},{"code":"410326","name":"汝阳县"},{"code":"410327","name":"宜阳县"},{"code":"410328","name":"洛宁县"},{"code":"410329","name":"伊川县"}],[{"code":"410402","name":"新华区"},{"code":"410403","name":"卫东区"},{"code":"410404","name":"石龙区"},{"code":"410411","name":"湛河区"},{"code":"410421","name":"宝丰县"},{"code":"410422","name":"叶县"},{"code":"410423","name":"鲁山县"},{"code":"410425","name":"郏县"},{"code":"410481","name":"舞钢市"},{"code":"410482","name":"汝州市"}],[{"code":"410502","name":"文峰区"},{"code":"410503","name":"北关区"},{"code":"410505","name":"殷都区"},{"code":"410506","name":"龙安区"},{"code":"410522","name":"安阳县"},{"code":"410523","name":"汤阴县"},{"code":"410526","name":"滑县"},{"code":"410527","name":"内黄县"},{"code":"410581","name":"林州市"}],[{"code":"410602","name":"鹤山区"},{"code":"410603","name":"山城区"},{"code":"410611","name":"淇滨区"},{"code":"410621","name":"浚县"},{"code":"410622","name":"淇县"}],[{"code":"410702","name":"红旗区"},{"code":"410703","name":"卫滨区"},{"code":"410704","name":"凤泉区"},{"code":"410711","name":"牧野区"},{"code":"410721","name":"新乡县"},{"code":"410724","name":"获嘉县"},{"code":"410725","name":"原阳县"},{"code":"410726","name":"延津县"},{"code":"410727","name":"封丘县"},{"code":"410728","name":"长垣县"},{"code":"410781","name":"卫辉市"},{"code":"410782","name":"辉县市"}],[{"code":"410802","name":"解放区"},{"code":"410803","name":"中站区"},{"code":"410804","name":"马村区"},{"code":"410811","name":"山阳区"},{"code":"410821","name":"修武县"},{"code":"410822","name":"博爱县"},{"code":"410823","name":"武陟县"},{"code":"410825","name":"温县"},{"code":"410882","name":"沁阳市"},{"code":"410883","name":"孟州市"}],[{"code":"410902","name":"华龙区"},{"code":"410922","name":"清丰县"},{"code":"410923","name":"南乐县"},{"code":"410926","name":"范县"},{"code":"410927","name":"台前县"},{"code":"410928","name":"濮阳县"}],[{"code":"411002","name":"魏都区"},{"code":"411003","name":"建安区"},{"code":"411024","name":"鄢陵县"},{"code":"411025","name":"襄城县"},{"code":"411081","name":"禹州市"},{"code":"411082","name":"长葛市"}],[{"code":"411102","name":"源汇区"},{"code":"411103","name":"郾城区"},{"code":"411104","name":"召陵区"},{"code":"411121","name":"舞阳县"},{"code":"411122","name":"临颍县"}],[{"code":"411202","name":"湖滨区"},{"code":"411203","name":"陕州区"},{"code":"411221","name":"渑池县"},{"code":"411224","name":"卢氏县"},{"code":"411281","name":"义马市"},{"code":"411282","name":"灵宝市"}],[{"code":"411302","name":"宛城区"},{"code":"411303","name":"卧龙区"},{"code":"411321","name":"南召县"},{"code":"411322","name":"方城县"},{"code":"411323","name":"西峡县"},{"code":"411324","name":"镇平县"},{"code":"411325","name":"内乡县"},{"code":"411326","name":"淅川县"},{"code":"411327","name":"社旗县"},{"code":"411328","name":"唐河县"},{"code":"411329","name":"新野县"},{"code":"411330","name":"桐柏县"},{"code":"411381","name":"邓州市"}],[{"code":"411402","name":"梁园区"},{"code":"411403","name":"睢阳区"},{"code":"411421","name":"民权县"},{"code":"411422","name":"睢县"},{"code":"411423","name":"宁陵县"},{"code":"411424","name":"柘城县"},{"code":"411425","name":"虞城县"},{"code":"411426","name":"夏邑县"},{"code":"411481","name":"永城市"}],[{"code":"411502","name":"浉河区"},{"code":"411503","name":"平桥区"},{"code":"411521","name":"罗山县"},{"code":"411522","name":"光山县"},{"code":"411523","name":"新县"},{"code":"411524","name":"商城县"},{"code":"411525","name":"固始县"},{"code":"411526","name":"潢川县"},{"code":"411527","name":"淮滨县"},{"code":"411528","name":"息县"}],[{"code":"411602","name":"川汇区"},{"code":"411621","name":"扶沟县"},{"code":"411622","name":"西华县"},{"code":"411623","name":"商水县"},{"code":"411624","name":"沈丘县"},{"code":"411625","name":"郸城县"},{"code":"411626","name":"淮阳县"},{"code":"411627","name":"太康县"},{"code":"411628","name":"鹿邑县"},{"code":"411681","name":"项城市"}],[{"code":"411702","name":"驿城区"},{"code":"411721","name":"西平县"},{"code":"411722","name":"上蔡县"},{"code":"411723","name":"平舆县"},{"code":"411724","name":"正阳县"},{"code":"411725","name":"确山县"},{"code":"411726","name":"泌阳县"},{"code":"411727","name":"汝南县"},{"code":"411728","name":"遂平县"},{"code":"411729","name":"新蔡县"}],[{"code":"419001","name":"济源市"}]],[[{"code":"420102","name":"江岸区"},{"code":"420103","name":"江汉区"},{"code":"420104","name":"硚口区"},{"code":"420105","name":"汉阳区"},{"code":"420106","name":"武昌区"},{"code":"420107","name":"青山区"},{"code":"420111","name":"洪山区"},{"code":"420112","name":"东西湖区"},{"code":"420113","name":"汉南区"},{"code":"420114","name":"蔡甸区"},{"code":"420115","name":"江夏区"},{"code":"420116","name":"黄陂区"},{"code":"420117","name":"新洲区"}],[{"code":"420202","name":"黄石港区"},{"code":"420203","name":"西塞山区"},{"code":"420204","name":"下陆区"},{"code":"420205","name":"铁山区"},{"code":"420222","name":"阳新县"},{"code":"420281","name":"大冶市"}],[{"code":"420302","name":"茅箭区"},{"code":"420303","name":"张湾区"},{"code":"420304","name":"郧阳区"},{"code":"420322","name":"郧西县"},{"code":"420323","name":"竹山县"},{"code":"420324","name":"竹溪县"},{"code":"420325","name":"房县"},{"code":"420381","name":"丹江口市"}],[{"code":"420502","name":"西陵区"},{"code":"420503","name":"伍家岗区"},{"code":"420504","name":"点军区"},{"code":"420505","name":"猇亭区"},{"code":"420506","name":"夷陵区"},{"code":"420525","name":"远安县"},{"code":"420526","name":"兴山县"},{"code":"420527","name":"秭归县"},{"code":"420528","name":"长阳土家族自治县"},{"code":"420529","name":"五峰土家族自治县"},{"code":"420581","name":"宜都市"},{"code":"420582","name":"当阳市"},{"code":"420583","name":"枝江市"}],[{"code":"420602","name":"襄城区"},{"code":"420606","name":"樊城区"},{"code":"420607","name":"襄州区"},{"code":"420624","name":"南漳县"},{"code":"420625","name":"谷城县"},{"code":"420626","name":"保康县"},{"code":"420682","name":"老河口市"},{"code":"420683","name":"枣阳市"},{"code":"420684","name":"宜城市"}],[{"code":"420702","name":"梁子湖区"},{"code":"420703","name":"华容区"},{"code":"420704","name":"鄂城区"}],[{"code":"420802","name":"东宝区"},{"code":"420804","name":"掇刀区"},{"code":"420821","name":"京山县"},{"code":"420822","name":"沙洋县"},{"code":"420881","name":"钟祥市"}],[{"code":"420902","name":"孝南区"},{"code":"420921","name":"孝昌县"},{"code":"420922","name":"大悟县"},{"code":"420923","name":"云梦县"},{"code":"420981","name":"应城市"},{"code":"420982","name":"安陆市"},{"code":"420984","name":"汉川市"}],[{"code":"421002","name":"沙市区"},{"code":"421003","name":"荆州区"},{"code":"421022","name":"公安县"},{"code":"421023","name":"监利县"},{"code":"421024","name":"江陵县"},{"code":"421081","name":"石首市"},{"code":"421083","name":"洪湖市"},{"code":"421087","name":"松滋市"}],[{"code":"421102","name":"黄州区"},{"code":"421121","name":"团风县"},{"code":"421122","name":"红安县"},{"code":"421123","name":"罗田县"},{"code":"421124","name":"英山县"},{"code":"421125","name":"浠水县"},{"code":"421126","name":"蕲春县"},{"code":"421127","name":"黄梅县"},{"code":"421181","name":"麻城市"},{"code":"421182","name":"武穴市"}],[{"code":"421202","name":"咸安区"},{"code":"421221","name":"嘉鱼县"},{"code":"421222","name":"通城县"},{"code":"421223","name":"崇阳县"},{"code":"421224","name":"通山县"},{"code":"421281","name":"赤壁市"}],[{"code":"421303","name":"曾都区"},{"code":"421321","name":"随县"},{"code":"421381","name":"广水市"}],[{"code":"422801","name":"恩施市"},{"code":"422802","name":"利川市"},{"code":"422822","name":"建始县"},{"code":"422823","name":"巴东县"},{"code":"422825","name":"宣恩县"},{"code":"422826","name":"咸丰县"},{"code":"422827","name":"来凤县"},{"code":"422828","name":"鹤峰县"}],[{"code":"429004","name":"仙桃市"},{"code":"429005","name":"潜江市"},{"code":"429006","name":"天门市"},{"code":"429021","name":"神农架林区"}]],[[{"code":"430102","name":"芙蓉区"},{"code":"430103","name":"天心区"},{"code":"430104","name":"岳麓区"},{"code":"430105","name":"开福区"},{"code":"430111","name":"雨花区"},{"code":"430112","name":"望城区"},{"code":"430121","name":"长沙县"},{"code":"430181","name":"浏阳市"},{"code":"430182","name":"宁乡市"}],[{"code":"430202","name":"荷塘区"},{"code":"430203","name":"芦淞区"},{"code":"430204","name":"石峰区"},{"code":"430211","name":"天元区"},{"code":"430221","name":"株洲县"},{"code":"430223","name":"攸县"},{"code":"430224","name":"茶陵县"},{"code":"430225","name":"炎陵县"},{"code":"430281","name":"醴陵市"}],[{"code":"430302","name":"雨湖区"},{"code":"430304","name":"岳塘区"},{"code":"430321","name":"湘潭县"},{"code":"430381","name":"湘乡市"},{"code":"430382","name":"韶山市"}],[{"code":"430405","name":"珠晖区"},{"code":"430406","name":"雁峰区"},{"code":"430407","name":"石鼓区"},{"code":"430408","name":"蒸湘区"},{"code":"430412","name":"南岳区"},{"code":"430421","name":"衡阳县"},{"code":"430422","name":"衡南县"},{"code":"430423","name":"衡山县"},{"code":"430424","name":"衡东县"},{"code":"430426","name":"祁东县"},{"code":"430481","name":"耒阳市"},{"code":"430482","name":"常宁市"}],[{"code":"430502","name":"双清区"},{"code":"430503","name":"大祥区"},{"code":"430511","name":"北塔区"},{"code":"430521","name":"邵东县"},{"code":"430522","name":"新邵县"},{"code":"430523","name":"邵阳县"},{"code":"430524","name":"隆回县"},{"code":"430525","name":"洞口县"},{"code":"430527","name":"绥宁县"},{"code":"430528","name":"新宁县"},{"code":"430529","name":"城步苗族自治县"},{"code":"430581","name":"武冈市"}],[{"code":"430602","name":"岳阳楼区"},{"code":"430603","name":"云溪区"},{"code":"430611","name":"君山区"},{"code":"430621","name":"岳阳县"},{"code":"430623","name":"华容县"},{"code":"430624","name":"湘阴县"},{"code":"430626","name":"平江县"},{"code":"430681","name":"汨罗市"},{"code":"430682","name":"临湘市"}],[{"code":"430702","name":"武陵区"},{"code":"430703","name":"鼎城区"},{"code":"430721","name":"安乡县"},{"code":"430722","name":"汉寿县"},{"code":"430723","name":"澧县"},{"code":"430724","name":"临澧县"},{"code":"430725","name":"桃源县"},{"code":"430726","name":"石门县"},{"code":"430781","name":"津市市"}],[{"code":"430802","name":"永定区"},{"code":"430811","name":"武陵源区"},{"code":"430821","name":"慈利县"},{"code":"430822","name":"桑植县"}],[{"code":"430902","name":"资阳区"},{"code":"430903","name":"赫山区"},{"code":"430921","name":"南县"},{"code":"430922","name":"桃江县"},{"code":"430923","name":"安化县"},{"code":"430981","name":"沅江市"}],[{"code":"431002","name":"北湖区"},{"code":"431003","name":"苏仙区"},{"code":"431021","name":"桂阳县"},{"code":"431022","name":"宜章县"},{"code":"431023","name":"永兴县"},{"code":"431024","name":"嘉禾县"},{"code":"431025","name":"临武县"},{"code":"431026","name":"汝城县"},{"code":"431027","name":"桂东县"},{"code":"431028","name":"安仁县"},{"code":"431081","name":"资兴市"}],[{"code":"431102","name":"零陵区"},{"code":"431103","name":"冷水滩区"},{"code":"431122","name":"东安县"},{"code":"431123","name":"双牌县"},{"code":"431124","name":"道县"},{"code":"431125","name":"江永县"},{"code":"431126","name":"宁远县"},{"code":"431127","name":"蓝山县"},{"code":"431128","name":"新田县"},{"code":"431129","name":"江华瑶族自治县"},{"code":"431181","name":"祁阳市"}],[{"code":"431202","name":"鹤城区"},{"code":"431221","name":"中方县"},{"code":"431222","name":"沅陵县"},{"code":"431223","name":"辰溪县"},{"code":"431224","name":"溆浦县"},{"code":"431225","name":"会同县"},{"code":"431226","name":"麻阳苗族自治县"},{"code":"431227","name":"新晃侗族自治县"},{"code":"431228","name":"芷江侗族自治县"},{"code":"431229","name":"靖州苗族侗族自治县"},{"code":"431230","name":"通道侗族自治县"},{"code":"431281","name":"洪江市"}],[{"code":"431302","name":"娄星区"},{"code":"431321","name":"双峰县"},{"code":"431322","name":"新化县"},{"code":"431381","name":"冷水江市"},{"code":"431382","name":"涟源市"}],[{"code":"433101","name":"吉首市"},{"code":"433122","name":"泸溪县"},{"code":"433123","name":"凤凰县"},{"code":"433124","name":"花垣县"},{"code":"433125","name":"保靖县"},{"code":"433126","name":"古丈县"},{"code":"433127","name":"永顺县"},{"code":"433130","name":"龙山县"}]],[[{"code":"440103","name":"荔湾区"},{"code":"440104","name":"越秀区"},{"code":"440105","name":"海珠区"},{"code":"440106","name":"天河区"},{"code":"440111","name":"白云区"},{"code":"440112","name":"黄埔区"},{"code":"440113","name":"番禺区"},{"code":"440114","name":"花都区"},{"code":"440115","name":"南沙区"},{"code":"440117","name":"从化区"},{"code":"440118","name":"增城区"}],[{"code":"440203","name":"武江区"},{"code":"440204","name":"浈江区"},{"code":"440205","name":"曲江区"},{"code":"440222","name":"始兴县"},{"code":"440224","name":"仁化县"},{"code":"440229","name":"翁源县"},{"code":"440232","name":"乳源瑶族自治县"},{"code":"440233","name":"新丰县"},{"code":"440281","name":"乐昌市"},{"code":"440282","name":"南雄市"}],[{"code":"440303","name":"罗湖区"},{"code":"440304","name":"福田区"},{"code":"440305","name":"南山区"},{"code":"440306","name":"宝安区"},{"code":"440307","name":"龙岗区"},{"code":"440308","name":"盐田区"},{"code":"440309","name":"龙华区"},{"code":"440310","name":"坪山区"}],[{"code":"440402","name":"香洲区"},{"code":"440403","name":"斗门区"},{"code":"440404","name":"金湾区"}],[{"code":"440507","name":"龙湖区"},{"code":"440511","name":"金平区"},{"code":"440512","name":"濠江区"},{"code":"440513","name":"潮阳区"},{"code":"440514","name":"潮南区"},{"code":"440515","name":"澄海区"},{"code":"440523","name":"南澳县"}],[{"code":"440604","name":"禅城区"},{"code":"440605","name":"南海区"},{"code":"440606","name":"顺德区"},{"code":"440607","name":"三水区"},{"code":"440608","name":"高明区"}],[{"code":"440703","name":"蓬江区"},{"code":"440704","name":"江海区"},{"code":"440705","name":"新会区"},{"code":"440781","name":"台山市"},{"code":"440783","name":"开平市"},{"code":"440784","name":"鹤山市"},{"code":"440785","name":"恩平市"}],[{"code":"440802","name":"赤坎区"},{"code":"440803","name":"霞山区"},{"code":"440804","name":"坡头区"},{"code":"440811","name":"麻章区"},{"code":"440823","name":"遂溪县"},{"code":"440825","name":"徐闻县"},{"code":"440881","name":"廉江市"},{"code":"440882","name":"雷州市"},{"code":"440883","name":"吴川市"}],[{"code":"440902","name":"茂南区"},{"code":"440904","name":"电白区"},{"code":"440981","name":"高州市"},{"code":"440982","name":"化州市"},{"code":"440983","name":"信宜市"}],[{"code":"441202","name":"端州区"},{"code":"441203","name":"鼎湖区"},{"code":"441204","name":"高要区"},{"code":"441223","name":"广宁县"},{"code":"441224","name":"怀集县"},{"code":"441225","name":"封开县"},{"code":"441226","name":"德庆县"},{"code":"441284","name":"四会市"}],[{"code":"441302","name":"惠城区"},{"code":"441303","name":"惠阳区"},{"code":"441322","name":"博罗县"},{"code":"441323","name":"惠东县"},{"code":"441324","name":"龙门县"}],[{"code":"441402","name":"梅江区"},{"code":"441403","name":"梅县区"},{"code":"441422","name":"大埔县"},{"code":"441423","name":"丰顺县"},{"code":"441424","name":"五华县"},{"code":"441426","name":"平远县"},{"code":"441427","name":"蕉岭县"},{"code":"441481","name":"兴宁市"}],[{"code":"441502","name":"城区"},{"code":"441521","name":"海丰县"},{"code":"441523","name":"陆河县"},{"code":"441581","name":"陆丰市"}],[{"code":"441602","name":"源城区"},{"code":"441621","name":"紫金县"},{"code":"441622","name":"龙川县"},{"code":"441623","name":"连平县"},{"code":"441624","name":"和平县"},{"code":"441625","name":"东源县"}],[{"code":"441702","name":"江城区"},{"code":"441704","name":"阳东区"},{"code":"441721","name":"阳西县"},{"code":"441781","name":"阳春市"}],[{"code":"441802","name":"清城区"},{"code":"441803","name":"清新区"},{"code":"441821","name":"佛冈县"},{"code":"441823","name":"阳山县"},{"code":"441825","name":"连山壮族瑶族自治县"},{"code":"441826","name":"连南瑶族自治县"},{"code":"441881","name":"英德市"},{"code":"441882","name":"连州市"}],[{"code":"441901","name":"东城街道"},{"code":"441902","name":"南城街道"},{"code":"441903","name":"万江街道"},{"code":"441904","name":"莞城街道"},{"code":"441905","name":"石碣镇"},{"code":"441906","name":"石龙镇"},{"code":"441907","name":"茶山镇"},{"code":"441908","name":"石排镇"},{"code":"441909","name":"企石镇"},{"code":"441910","name":"横沥镇"},{"code":"441911","name":"桥头镇"},{"code":"441912","name":"谢岗镇"},{"code":"441913","name":"东坑镇"},{"code":"441914","name":"常平镇"},{"code":"441915","name":"寮步镇"},{"code":"441916","name":"樟木头镇"},{"code":"441917","name":"大朗镇"},{"code":"441918","name":"黄江镇"},{"code":"441919","name":"清溪镇"},{"code":"441920","name":"塘厦镇"},{"code":"441921","name":"凤岗镇"},{"code":"441922","name":"大岭山镇"},{"code":"441923","name":"长安镇"},{"code":"441924","name":"虎门镇"},{"code":"441925","name":"厚街镇"},{"code":"441926","name":"沙田镇"},{"code":"441927","name":"道滘镇"},{"code":"441928","name":"洪梅镇"},{"code":"441929","name":"麻涌镇"},{"code":"441930","name":"望牛墩镇"},{"code":"441931","name":"中堂镇"},{"code":"441932","name":"高埗镇"},{"code":"441933","name":"松山湖管委会"},{"code":"441934","name":"虎门港管委会"},{"code":"441935","name":"东莞生态园"}],[{"code":"442001","name":"石岐区街道"},{"code":"442002","name":"东区街道"},{"code":"442003","name":"火炬开发区"},{"code":"442004","name":"西区街道"},{"code":"442005","name":"南区街道"},{"code":"442006","name":"五桂山街道"},{"code":"442007","name":"小榄镇"},{"code":"442008","name":"黄圃镇"},{"code":"442009","name":"民众镇"},{"code":"442010","name":"东凤镇"},{"code":"442011","name":"东升镇"},{"code":"442012","name":"古镇镇"},{"code":"442013","name":"沙溪镇"},{"code":"442014","name":"坦洲镇"},{"code":"442015","name":"港口镇"},{"code":"442016","name":"三角镇"},{"code":"442017","name":"横栏镇"},{"code":"442018","name":"南头镇"},{"code":"442019","name":"阜沙镇"},{"code":"442020","name":"南朗镇"},{"code":"442021","name":"三乡镇"},{"code":"442022","name":"板芙镇"},{"code":"442023","name":"大涌镇"},{"code":"442024","name":"神湾镇"}],[{"code":"445102","name":"湘桥区"},{"code":"445103","name":"潮安区"},{"code":"445122","name":"饶平县"}],[{"code":"445202","name":"榕城区"},{"code":"445203","name":"揭东区"},{"code":"445222","name":"揭西县"},{"code":"445224","name":"惠来县"},{"code":"445281","name":"普宁市"}],[{"code":"445302","name":"云城区"},{"code":"445303","name":"云安区"},{"code":"445321","name":"新兴县"},{"code":"445322","name":"郁南县"},{"code":"445381","name":"罗定市"}]],[[{"code":"450102","name":"兴宁区"},{"code":"450103","name":"青秀区"},{"code":"450105","name":"江南区"},{"code":"450107","name":"西乡塘区"},{"code":"450108","name":"良庆区"},{"code":"450109","name":"邕宁区"},{"code":"450110","name":"武鸣区"},{"code":"450123","name":"隆安县"},{"code":"450124","name":"马山县"},{"code":"450125","name":"上林县"},{"code":"450126","name":"宾阳县"},{"code":"450181","name":"横州市"}],[{"code":"450202","name":"城中区"},{"code":"450203","name":"鱼峰区"},{"code":"450204","name":"柳南区"},{"code":"450205","name":"柳北区"},{"code":"450206","name":"柳江区"},{"code":"450222","name":"柳城县"},{"code":"450223","name":"鹿寨县"},{"code":"450224","name":"融安县"},{"code":"450225","name":"融水苗族自治县"},{"code":"450226","name":"三江侗族自治县"}],[{"code":"450302","name":"秀峰区"},{"code":"450303","name":"叠彩区"},{"code":"450304","name":"象山区"},{"code":"450305","name":"七星区"},{"code":"450311","name":"雁山区"},{"code":"450312","name":"临桂区"},{"code":"450321","name":"阳朔县"},{"code":"450323","name":"灵川县"},{"code":"450324","name":"全州县"},{"code":"450325","name":"兴安县"},{"code":"450326","name":"永福县"},{"code":"450327","name":"灌阳县"},{"code":"450328","name":"龙胜各族自治县"},{"code":"450329","name":"资源县"},{"code":"450330","name":"平乐县"},{"code":"450331","name":"荔浦县"},{"code":"450332","name":"恭城瑶族自治县"}],[{"code":"450403","name":"万秀区"},{"code":"450405","name":"长洲区"},{"code":"450406","name":"龙圩区"},{"code":"450421","name":"苍梧县"},{"code":"450422","name":"藤县"},{"code":"450423","name":"蒙山县"},{"code":"450481","name":"岑溪市"}],[{"code":"450502","name":"海城区"},{"code":"450503","name":"银海区"},{"code":"450512","name":"铁山港区"},{"code":"450521","name":"合浦县"}],[{"code":"450602","name":"港口区"},{"code":"450603","name":"防城区"},{"code":"450621","name":"上思县"},{"code":"450681","name":"东兴市"}],[{"code":"450702","name":"钦南区"},{"code":"450703","name":"钦北区"},{"code":"450721","name":"灵山县"},{"code":"450722","name":"浦北县"}],[{"code":"450802","name":"港北区"},{"code":"450803","name":"港南区"},{"code":"450804","name":"覃塘区"},{"code":"450821","name":"平南县"},{"code":"450881","name":"桂平市"}],[{"code":"450902","name":"玉州区"},{"code":"450903","name":"福绵区"},{"code":"450921","name":"容县"},{"code":"450922","name":"陆川县"},{"code":"450923","name":"博白县"},{"code":"450924","name":"兴业县"},{"code":"450981","name":"北流市"}],[{"code":"451002","name":"右江区"},{"code":"451021","name":"田阳县"},{"code":"451022","name":"田东县"},{"code":"451023","name":"平果县"},{"code":"451024","name":"德保县"},{"code":"451026","name":"那坡县"},{"code":"451027","name":"凌云县"},{"code":"451028","name":"乐业县"},{"code":"451029","name":"田林县"},{"code":"451030","name":"西林县"},{"code":"451031","name":"隆林各族自治县"},{"code":"451081","name":"靖西市"}],[{"code":"451102","name":"八步区"},{"code":"451103","name":"平桂区"},{"code":"451121","name":"昭平县"},{"code":"451122","name":"钟山县"},{"code":"451123","name":"富川瑶族自治县"}],[{"code":"451202","name":"金城江区"},{"code":"451203","name":"宜州区"},{"code":"451221","name":"南丹县"},{"code":"451222","name":"天峨县"},{"code":"451223","name":"凤山县"},{"code":"451224","name":"东兰县"},{"code":"451225","name":"罗城仫佬族自治县"},{"code":"451226","name":"环江毛南族自治县"},{"code":"451227","name":"巴马瑶族自治县"},{"code":"451228","name":"都安瑶族自治县"},{"code":"451229","name":"大化瑶族自治县"}],[{"code":"451302","name":"兴宾区"},{"code":"451321","name":"忻城县"},{"code":"451322","name":"象州县"},{"code":"451323","name":"武宣县"},{"code":"451324","name":"金秀瑶族自治县"},{"code":"451381","name":"合山市"}],[{"code":"451402","name":"江州区"},{"code":"451421","name":"扶绥县"},{"code":"451422","name":"宁明县"},{"code":"451423","name":"龙州县"},{"code":"451424","name":"大新县"},{"code":"451425","name":"天等县"},{"code":"451481","name":"凭祥市"}]],[[{"code":"460105","name":"秀英区"},{"code":"460106","name":"龙华区"},{"code":"460107","name":"琼山区"},{"code":"460108","name":"美兰区"}],[{"code":"460202","name":"海棠区"},{"code":"460203","name":"吉阳区"},{"code":"460204","name":"天涯区"},{"code":"460205","name":"崖州区"}],[{"code":"460321","name":"西沙群岛"},{"code":"460322","name":"南沙群岛"},{"code":"460323","name":"中沙群岛的岛礁及其海域"}],[{"code":"460401","name":"那大镇"},{"code":"460402","name":"和庆镇"},{"code":"460403","name":"南丰镇"},{"code":"460404","name":"大成镇"},{"code":"460405","name":"雅星镇"},{"code":"460406","name":"兰洋镇"},{"code":"460407","name":"光村镇"},{"code":"460408","name":"木棠镇"},{"code":"460409","name":"海头镇"},{"code":"460410","name":"峨蔓镇"},{"code":"460411","name":"三都镇"},{"code":"460412","name":"王五镇"},{"code":"460413","name":"白马井镇"},{"code":"460414","name":"中和镇"},{"code":"460415","name":"排浦镇"},{"code":"460416","name":"东成镇"},{"code":"460417","name":"新州镇"},{"code":"460418","name":"国营西培农场"},{"code":"460419","name":"国营西联农场"},{"code":"460420","name":"国营蓝洋农场"},{"code":"460421","name":"国营八一农场"},{"code":"460422","name":"洋浦经济开发区"},{"code":"460423","name":"华南热作学院"},{"code":"460424","name":"红岭农场"}],[{"code":"469001","name":"五指山市"},{"code":"469002","name":"琼海市"},{"code":"469005","name":"文昌市"},{"code":"469006","name":"万宁市"},{"code":"469007","name":"东方市"},{"code":"469021","name":"定安县"},{"code":"469022","name":"屯昌县"},{"code":"469023","name":"澄迈县"},{"code":"469024","name":"临高县"},{"code":"469025","name":"白沙黎族自治县"},{"code":"469026","name":"昌江黎族自治县"},{"code":"469027","name":"乐东黎族自治县"},{"code":"469028","name":"陵水黎族自治县"},{"code":"469029","name":"保亭黎族苗族自治县"},{"code":"469030","name":"琼中黎族苗族自治县"}]],[[{"code":"500101","name":"万州区"},{"code":"500102","name":"涪陵区"},{"code":"500103","name":"渝中区"},{"code":"500104","name":"大渡口区"},{"code":"500105","name":"江北区"},{"code":"500106","name":"沙坪坝区"},{"code":"500107","name":"九龙坡区"},{"code":"500108","name":"南岸区"},{"code":"500109","name":"北碚区"},{"code":"500110","name":"綦江区"},{"code":"500111","name":"大足区"},{"code":"500112","name":"渝北区"},{"code":"500113","name":"巴南区"},{"code":"500114","name":"黔江区"},{"code":"500115","name":"长寿区"},{"code":"500116","name":"江津区"},{"code":"500117","name":"合川区"},{"code":"500118","name":"永川区"},{"code":"500119","name":"南川区"},{"code":"500120","name":"璧山区"},{"code":"500151","name":"铜梁区"},{"code":"500152","name":"潼南区"},{"code":"500153","name":"荣昌区"},{"code":"500154","name":"开州区"},{"code":"500155","name":"梁平区"},{"code":"500156","name":"武隆区"}],[{"code":"500229","name":"城口县"},{"code":"500230","name":"丰都县"},{"code":"500231","name":"垫江县"},{"code":"500233","name":"忠县"},{"code":"500235","name":"云阳县"},{"code":"500236","name":"奉节县"},{"code":"500237","name":"巫山县"},{"code":"500238","name":"巫溪县"},{"code":"500240","name":"石柱土家族自治县"},{"code":"500241","name":"秀山土家族苗族自治县"},{"code":"500242","name":"酉阳土家族苗族自治县"},{"code":"500243","name":"彭水苗族土家族自治县"}]],[[{"code":"510104","name":"锦江区"},{"code":"510105","name":"青羊区"},{"code":"510106","name":"金牛区"},{"code":"510107","name":"武侯区"},{"code":"510108","name":"成华区"},{"code":"510112","name":"龙泉驿区"},{"code":"510113","name":"青白江区"},{"code":"510114","name":"新都区"},{"code":"510115","name":"温江区"},{"code":"510116","name":"双流区"},{"code":"510117","name":"郫都区"},{"code":"510121","name":"金堂县"},{"code":"510129","name":"大邑县"},{"code":"510131","name":"蒲江县"},{"code":"510132","name":"新津县"},{"code":"510181","name":"都江堰市"},{"code":"510182","name":"彭州市"},{"code":"510183","name":"邛崃市"},{"code":"510184","name":"崇州市"},{"code":"510185","name":"简阳市"}],[{"code":"510302","name":"自流井区"},{"code":"510303","name":"贡井区"},{"code":"510304","name":"大安区"},{"code":"510311","name":"沿滩区"},{"code":"510321","name":"荣县"},{"code":"510322","name":"富顺县"}],[{"code":"510402","name":"东区"},{"code":"510403","name":"西区"},{"code":"510411","name":"仁和区"},{"code":"510421","name":"米易县"},{"code":"510422","name":"盐边县"}],[{"code":"510502","name":"江阳区"},{"code":"510503","name":"纳溪区"},{"code":"510504","name":"龙马潭区"},{"code":"510521","name":"泸县"},{"code":"510522","name":"合江县"},{"code":"510524","name":"叙永县"},{"code":"510525","name":"古蔺县"}],[{"code":"510603","name":"旌阳区"},{"code":"510604","name":"罗江区"},{"code":"510623","name":"中江县"},{"code":"510681","name":"广汉市"},{"code":"510682","name":"什邡市"},{"code":"510683","name":"绵竹市"}],[{"code":"510703","name":"涪城区"},{"code":"510704","name":"游仙区"},{"code":"510705","name":"安州区"},{"code":"510722","name":"三台县"},{"code":"510723","name":"盐亭县"},{"code":"510725","name":"梓潼县"},{"code":"510726","name":"北川羌族自治县"},{"code":"510727","name":"平武县"},{"code":"510781","name":"江油市"}],[{"code":"510802","name":"利州区"},{"code":"510811","name":"昭化区"},{"code":"510812","name":"朝天区"},{"code":"510821","name":"旺苍县"},{"code":"510822","name":"青川县"},{"code":"510823","name":"剑阁县"},{"code":"510824","name":"苍溪县"}],[{"code":"510903","name":"船山区"},{"code":"510904","name":"安居区"},{"code":"510921","name":"蓬溪县"},{"code":"510922","name":"射洪县"},{"code":"510923","name":"大英县"}],[{"code":"511002","name":"市中区"},{"code":"511011","name":"东兴区"},{"code":"511024","name":"威远县"},{"code":"511025","name":"资中县"},{"code":"511083","name":"隆昌市"}],[{"code":"511102","name":"市中区"},{"code":"511111","name":"沙湾区"},{"code":"511112","name":"五通桥区"},{"code":"511113","name":"金口河区"},{"code":"511123","name":"犍为县"},{"code":"511124","name":"井研县"},{"code":"511126","name":"夹江县"},{"code":"511129","name":"沐川县"},{"code":"511132","name":"峨边彝族自治县"},{"code":"511133","name":"马边彝族自治县"},{"code":"511181","name":"峨眉山市"}],[{"code":"511302","name":"顺庆区"},{"code":"511303","name":"高坪区"},{"code":"511304","name":"嘉陵区"},{"code":"511321","name":"南部县"},{"code":"511322","name":"营山县"},{"code":"511323","name":"蓬安县"},{"code":"511324","name":"仪陇县"},{"code":"511325","name":"西充县"},{"code":"511381","name":"阆中市"}],[{"code":"511402","name":"东坡区"},{"code":"511403","name":"彭山区"},{"code":"511421","name":"仁寿县"},{"code":"511423","name":"洪雅县"},{"code":"511424","name":"丹棱县"},{"code":"511425","name":"青神县"}],[{"code":"511502","name":"翠屏区"},{"code":"511503","name":"南溪区"},{"code":"511521","name":"宜宾县"},{"code":"511523","name":"江安县"},{"code":"511524","name":"长宁县"},{"code":"511525","name":"高县"},{"code":"511526","name":"珙县"},{"code":"511527","name":"筠连县"},{"code":"511528","name":"兴文县"},{"code":"511529","name":"屏山县"}],[{"code":"511602","name":"广安区"},{"code":"511603","name":"前锋区"},{"code":"511621","name":"岳池县"},{"code":"511622","name":"武胜县"},{"code":"511623","name":"邻水县"},{"code":"511681","name":"华蓥市"}],[{"code":"511702","name":"通川区"},{"code":"511703","name":"达川区"},{"code":"511722","name":"宣汉县"},{"code":"511723","name":"开江县"},{"code":"511724","name":"大竹县"},{"code":"511725","name":"渠县"},{"code":"511781","name":"万源市"}],[{"code":"511802","name":"雨城区"},{"code":"511803","name":"名山区"},{"code":"511822","name":"荥经县"},{"code":"511823","name":"汉源县"},{"code":"511824","name":"石棉县"},{"code":"511825","name":"天全县"},{"code":"511826","name":"芦山县"},{"code":"511827","name":"宝兴县"}],[{"code":"511902","name":"巴州区"},{"code":"511903","name":"恩阳区"},{"code":"511921","name":"通江县"},{"code":"511922","name":"南江县"},{"code":"511923","name":"平昌县"}],[{"code":"512002","name":"雁江区"},{"code":"512021","name":"安岳县"},{"code":"512022","name":"乐至县"}],[{"code":"513201","name":"马尔康市"},{"code":"513221","name":"汶川县"},{"code":"513222","name":"理县"},{"code":"513223","name":"茂县"},{"code":"513224","name":"松潘县"},{"code":"513225","name":"九寨沟县"},{"code":"513226","name":"金川县"},{"code":"513227","name":"小金县"},{"code":"513228","name":"黑水县"},{"code":"513230","name":"壤塘县"},{"code":"513231","name":"阿坝县"},{"code":"513232","name":"若尔盖县"},{"code":"513233","name":"红原县"}],[{"code":"513301","name":"康定市"},{"code":"513322","name":"泸定县"},{"code":"513323","name":"丹巴县"},{"code":"513324","name":"九龙县"},{"code":"513325","name":"雅江县"},{"code":"513326","name":"道孚县"},{"code":"513327","name":"炉霍县"},{"code":"513328","name":"甘孜县"},{"code":"513329","name":"新龙县"},{"code":"513330","name":"德格县"},{"code":"513331","name":"白玉县"},{"code":"513332","name":"石渠县"},{"code":"513333","name":"色达县"},{"code":"513334","name":"理塘县"},{"code":"513335","name":"巴塘县"},{"code":"513336","name":"乡城县"},{"code":"513337","name":"稻城县"},{"code":"513338","name":"得荣县"}],[{"code":"513401","name":"西昌市"},{"code":"513402","name":"会理市"},{"code":"513422","name":"木里藏族自治县"},{"code":"513423","name":"盐源县"},{"code":"513424","name":"德昌县"},{"code":"513426","name":"会东县"},{"code":"513427","name":"宁南县"},{"code":"513428","name":"普格县"},{"code":"513429","name":"布拖县"},{"code":"513430","name":"金阳县"},{"code":"513431","name":"昭觉县"},{"code":"513432","name":"喜德县"},{"code":"513433","name":"冕宁县"},{"code":"513434","name":"越西县"},{"code":"513435","name":"甘洛县"},{"code":"513436","name":"美姑县"},{"code":"513437","name":"雷波县"}]],[[{"code":"520102","name":"南明区"},{"code":"520103","name":"云岩区"},{"code":"520111","name":"花溪区"},{"code":"520112","name":"乌当区"},{"code":"520113","name":"白云区"},{"code":"520115","name":"观山湖区"},{"code":"520121","name":"开阳县"},{"code":"520122","name":"息烽县"},{"code":"520123","name":"修文县"},{"code":"520181","name":"清镇市"}],[{"code":"520201","name":"钟山区"},{"code":"520203","name":"六枝特区"},{"code":"520221","name":"水城县"},{"code":"520281","name":"盘州市"}],[{"code":"520302","name":"红花岗区"},{"code":"520303","name":"汇川区"},{"code":"520304","name":"播州区"},{"code":"520322","name":"桐梓县"},{"code":"520323","name":"绥阳县"},{"code":"520324","name":"正安县"},{"code":"520325","name":"道真仡佬族苗族自治县"},{"code":"520326","name":"务川仡佬族苗族自治县"},{"code":"520327","name":"凤冈县"},{"code":"520328","name":"湄潭县"},{"code":"520329","name":"余庆县"},{"code":"520330","name":"习水县"},{"code":"520381","name":"赤水市"},{"code":"520382","name":"仁怀市"}],[{"code":"520402","name":"西秀区"},{"code":"520403","name":"平坝区"},{"code":"520422","name":"普定县"},{"code":"520423","name":"镇宁布依族苗族自治县"},{"code":"520424","name":"关岭布依族苗族自治县"},{"code":"520425","name":"紫云苗族布依族自治县"}],[{"code":"520502","name":"七星关区"},{"code":"520521","name":"大方县"},{"code":"520523","name":"金沙县"},{"code":"520524","name":"织金县"},{"code":"520525","name":"纳雍县"},{"code":"520526","name":"威宁彝族回族苗族自治县"},{"code":"520527","name":"赫章县"},{"code":"520581","name":"黔西市"}],[{"code":"520602","name":"碧江区"},{"code":"520603","name":"万山区"},{"code":"520621","name":"江口县"},{"code":"520622","name":"玉屏侗族自治县"},{"code":"520623","name":"石阡县"},{"code":"520624","name":"思南县"},{"code":"520625","name":"印江土家族苗族自治县"},{"code":"520626","name":"德江县"},{"code":"520627","name":"沿河土家族自治县"},{"code":"520628","name":"松桃苗族自治县"}],[{"code":"522301","name":"兴义市"},{"code":"522322","name":"兴仁县"},{"code":"522323","name":"普安县"},{"code":"522324","name":"晴隆县"},{"code":"522325","name":"贞丰县"},{"code":"522326","name":"望谟县"},{"code":"522327","name":"册亨县"},{"code":"522328","name":"安龙县"}],[{"code":"522601","name":"凯里市"},{"code":"522622","name":"黄平县"},{"code":"522623","name":"施秉县"},{"code":"522624","name":"三穗县"},{"code":"522625","name":"镇远县"},{"code":"522626","name":"岑巩县"},{"code":"522627","name":"天柱县"},{"code":"522628","name":"锦屏县"},{"code":"522629","name":"剑河县"},{"code":"522630","name":"台江县"},{"code":"522631","name":"黎平县"},{"code":"522632","name":"榕江县"},{"code":"522633","name":"从江县"},{"code":"522634","name":"雷山县"},{"code":"522635","name":"麻江县"},{"code":"522636","name":"丹寨县"}],[{"code":"522701","name":"都匀市"},{"code":"522702","name":"福泉市"},{"code":"522722","name":"荔波县"},{"code":"522723","name":"贵定县"},{"code":"522725","name":"瓮安县"},{"code":"522726","name":"独山县"},{"code":"522727","name":"平塘县"},{"code":"522728","name":"罗甸县"},{"code":"522729","name":"长顺县"},{"code":"522730","name":"龙里县"},{"code":"522731","name":"惠水县"},{"code":"522732","name":"三都水族自治县"}]],[[{"code":"530102","name":"五华区"},{"code":"530103","name":"盘龙区"},{"code":"530111","name":"官渡区"},{"code":"530112","name":"西山区"},{"code":"530113","name":"东川区"},{"code":"530114","name":"呈贡区"},{"code":"530115","name":"晋宁区"},{"code":"530124","name":"富民县"},{"code":"530125","name":"宜良县"},{"code":"530126","name":"石林彝族自治县"},{"code":"530127","name":"嵩明县"},{"code":"530128","name":"禄劝彝族苗族自治县"},{"code":"530129","name":"寻甸回族彝族自治县"},{"code":"530181","name":"安宁市"}],[{"code":"530302","name":"麒麟区"},{"code":"530303","name":"沾益区"},{"code":"530321","name":"马龙县"},{"code":"530322","name":"陆良县"},{"code":"530323","name":"师宗县"},{"code":"530324","name":"罗平县"},{"code":"530325","name":"富源县"},{"code":"530326","name":"会泽县"},{"code":"530381","name":"宣威市"}],[{"code":"530402","name":"红塔区"},{"code":"530403","name":"江川区"},{"code":"530422","name":"澄江县"},{"code":"530423","name":"通海县"},{"code":"530424","name":"华宁县"},{"code":"530425","name":"易门县"},{"code":"530426","name":"峨山彝族自治县"},{"code":"530427","name":"新平彝族傣族自治县"},{"code":"530428","name":"元江哈尼族彝族傣族自治县"}],[{"code":"530502","name":"隆阳区"},{"code":"530521","name":"施甸县"},{"code":"530523","name":"龙陵县"},{"code":"530524","name":"昌宁县"},{"code":"530581","name":"腾冲市"}],[{"code":"530602","name":"昭阳区"},{"code":"530621","name":"鲁甸县"},{"code":"530622","name":"巧家县"},{"code":"530623","name":"盐津县"},{"code":"530624","name":"大关县"},{"code":"530625","name":"永善县"},{"code":"530626","name":"绥江县"},{"code":"530627","name":"镇雄县"},{"code":"530628","name":"彝良县"},{"code":"530629","name":"威信县"},{"code":"530630","name":"水富县"}],[{"code":"530702","name":"古城区"},{"code":"530721","name":"玉龙纳西族自治县"},{"code":"530722","name":"永胜县"},{"code":"530723","name":"华坪县"},{"code":"530724","name":"宁蒗彝族自治县"}],[{"code":"530802","name":"思茅区"},{"code":"530821","name":"宁洱哈尼族彝族自治县"},{"code":"530822","name":"墨江哈尼族自治县"},{"code":"530823","name":"景东彝族自治县"},{"code":"530824","name":"景谷傣族彝族自治县"},{"code":"530825","name":"镇沅彝族哈尼族拉祜族自治县"},{"code":"530826","name":"江城哈尼族彝族自治县"},{"code":"530827","name":"孟连傣族拉祜族佤族自治县"},{"code":"530828","name":"澜沧拉祜族自治县"},{"code":"530829","name":"西盟佤族自治县"}],[{"code":"530902","name":"临翔区"},{"code":"530921","name":"凤庆县"},{"code":"530922","name":"云县"},{"code":"530923","name":"永德县"},{"code":"530924","name":"镇康县"},{"code":"530925","name":"双江拉祜族佤族布朗族傣族自治县"},{"code":"530926","name":"耿马傣族佤族自治县"},{"code":"530927","name":"沧源佤族自治县"}],[{"code":"532301","name":"楚雄市"},{"code":"532302","name":"禄丰市"},{"code":"532322","name":"双柏县"},{"code":"532323","name":"牟定县"},{"code":"532324","name":"南华县"},{"code":"532325","name":"姚安县"},{"code":"532326","name":"大姚县"},{"code":"532327","name":"永仁县"},{"code":"532328","name":"元谋县"},{"code":"532329","name":"武定县"}],[{"code":"532501","name":"个旧市"},{"code":"532502","name":"开远市"},{"code":"532503","name":"蒙自市"},{"code":"532504","name":"弥勒市"},{"code":"532523","name":"屏边苗族自治县"},{"code":"532524","name":"建水县"},{"code":"532525","name":"石屏县"},{"code":"532527","name":"泸西县"},{"code":"532528","name":"元阳县"},{"code":"532529","name":"红河县"},{"code":"532530","name":"金平苗族瑶族傣族自治县"},{"code":"532531","name":"绿春县"},{"code":"532532","name":"河口瑶族自治县"}],[{"code":"532601","name":"文山市"},{"code":"532622","name":"砚山县"},{"code":"532623","name":"西畴县"},{"code":"532624","name":"麻栗坡县"},{"code":"532625","name":"马关县"},{"code":"532626","name":"丘北县"},{"code":"532627","name":"广南县"},{"code":"532628","name":"富宁县"}],[{"code":"532801","name":"景洪市"},{"code":"532822","name":"勐海县"},{"code":"532823","name":"勐腊县"}],[{"code":"532901","name":"大理市"},{"code":"532922","name":"漾濞彝族自治县"},{"code":"532923","name":"祥云县"},{"code":"532924","name":"宾川县"},{"code":"532925","name":"弥渡县"},{"code":"532926","name":"南涧彝族自治县"},{"code":"532927","name":"巍山彝族回族自治县"},{"code":"532928","name":"永平县"},{"code":"532929","name":"云龙县"},{"code":"532930","name":"洱源县"},{"code":"532931","name":"剑川县"},{"code":"532932","name":"鹤庆县"}],[{"code":"533102","name":"瑞丽市"},{"code":"533103","name":"芒市"},{"code":"533122","name":"梁河县"},{"code":"533123","name":"盈江县"},{"code":"533124","name":"陇川县"}],[{"code":"533301","name":"泸水市"},{"code":"533323","name":"福贡县"},{"code":"533324","name":"贡山独龙族怒族自治县"},{"code":"533325","name":"兰坪白族普米族自治县"}],[{"code":"533401","name":"香格里拉市"},{"code":"533422","name":"德钦县"},{"code":"533423","name":"维西傈僳族自治县"}]],[[{"code":"540102","name":"城关区"},{"code":"540103","name":"堆龙德庆区"},{"code":"540104","name":"达孜区"},{"code":"540121","name":"林周县"},{"code":"540122","name":"当雄县"},{"code":"540123","name":"尼木县"},{"code":"540124","name":"曲水县"},{"code":"540127","name":"墨竹工卡县"}],[{"code":"540202","name":"桑珠孜区"},{"code":"540221","name":"南木林县"},{"code":"540222","name":"江孜县"},{"code":"540223","name":"定日县"},{"code":"540224","name":"萨迦县"},{"code":"540225","name":"拉孜县"},{"code":"540226","name":"昂仁县"},{"code":"540227","name":"谢通门县"},{"code":"540228","name":"白朗县"},{"code":"540229","name":"仁布县"},{"code":"540230","name":"康马县"},{"code":"540231","name":"定结县"},{"code":"540232","name":"仲巴县"},{"code":"540233","name":"亚东县"},{"code":"540234","name":"吉隆县"},{"code":"540235","name":"聂拉木县"},{"code":"540236","name":"萨嘎县"},{"code":"540237","name":"岗巴县"}],[{"code":"540302","name":"卡若区"},{"code":"540321","name":"江达县"},{"code":"540322","name":"贡觉县"},{"code":"540323","name":"类乌齐县"},{"code":"540324","name":"丁青县"},{"code":"540325","name":"察雅县"},{"code":"540326","name":"八宿县"},{"code":"540327","name":"左贡县"},{"code":"540328","name":"芒康县"},{"code":"540329","name":"洛隆县"},{"code":"540330","name":"边坝县"}],[{"code":"540402","name":"巴宜区"},{"code":"540421","name":"工布江达县"},{"code":"540422","name":"米林县"},{"code":"540423","name":"墨脱县"},{"code":"540424","name":"波密县"},{"code":"540425","name":"察隅县"},{"code":"540426","name":"朗县"}],[{"code":"540502","name":"乃东区"},{"code":"540521","name":"扎囊县"},{"code":"540522","name":"贡嘎县"},{"code":"540523","name":"桑日县"},{"code":"540524","name":"琼结县"},{"code":"540525","name":"曲松县"},{"code":"540526","name":"措美县"},{"code":"540527","name":"洛扎县"},{"code":"540528","name":"加查县"},{"code":"540529","name":"隆子县"},{"code":"540530","name":"错那县"},{"code":"540531","name":"浪卡子县"}],[{"code":"542421","name":"那曲县"},{"code":"542422","name":"嘉黎县"},{"code":"542423","name":"比如县"},{"code":"542424","name":"聂荣县"},{"code":"542425","name":"安多县"},{"code":"542426","name":"申扎县"},{"code":"542427","name":"索县"},{"code":"542428","name":"班戈县"},{"code":"542429","name":"巴青县"},{"code":"542430","name":"尼玛县"},{"code":"542431","name":"双湖县"}],[{"code":"542521","name":"普兰县"},{"code":"542522","name":"札达县"},{"code":"542523","name":"噶尔县"},{"code":"542524","name":"日土县"},{"code":"542525","name":"革吉县"},{"code":"542526","name":"改则县"},{"code":"542527","name":"措勤县"}]],[[{"code":"610102","name":"新城区"},{"code":"610103","name":"碑林区"},{"code":"610104","name":"莲湖区"},{"code":"610111","name":"灞桥区"},{"code":"610112","name":"未央区"},{"code":"610113","name":"雁塔区"},{"code":"610114","name":"阎良区"},{"code":"610115","name":"临潼区"},{"code":"610116","name":"长安区"},{"code":"610117","name":"高陵区"},{"code":"610118","name":"鄠邑区"},{"code":"610122","name":"蓝田县"},{"code":"610124","name":"周至县"}],[{"code":"610202","name":"王益区"},{"code":"610203","name":"印台区"},{"code":"610204","name":"耀州区"},{"code":"610222","name":"宜君县"}],[{"code":"610302","name":"渭滨区"},{"code":"610303","name":"金台区"},{"code":"610304","name":"陈仓区"},{"code":"610305","name":"凤翔区"},{"code":"610323","name":"岐山县"},{"code":"610324","name":"扶风县"},{"code":"610326","name":"眉县"},{"code":"610327","name":"陇县"},{"code":"610328","name":"千阳县"},{"code":"610329","name":"麟游县"},{"code":"610330","name":"凤县"},{"code":"610331","name":"太白县"}],[{"code":"610402","name":"秦都区"},{"code":"610403","name":"杨陵区"},{"code":"610404","name":"渭城区"},{"code":"610422","name":"三原县"},{"code":"610423","name":"泾阳县"},{"code":"610424","name":"乾县"},{"code":"610425","name":"礼泉县"},{"code":"610426","name":"永寿县"},{"code":"610427","name":"彬州市"},{"code":"610428","name":"长武县"},{"code":"610429","name":"旬邑县"},{"code":"610430","name":"淳化县"},{"code":"610431","name":"武功县"},{"code":"610481","name":"兴平市"}],[{"code":"610502","name":"临渭区"},{"code":"610503","name":"华州区"},{"code":"610522","name":"潼关县"},{"code":"610523","name":"大荔县"},{"code":"610524","name":"合阳县"},{"code":"610525","name":"澄城县"},{"code":"610526","name":"蒲城县"},{"code":"610527","name":"白水县"},{"code":"610528","name":"富平县"},{"code":"610581","name":"韩城市"},{"code":"610582","name":"华阴市"}],[{"code":"610602","name":"宝塔区"},{"code":"610603","name":"安塞区"},{"code":"610621","name":"延长县"},{"code":"610622","name":"延川县"},{"code":"610623","name":"子长县"},{"code":"610625","name":"志丹县"},{"code":"610626","name":"吴起县"},{"code":"610627","name":"甘泉县"},{"code":"610628","name":"富县"},{"code":"610629","name":"洛川县"},{"code":"610630","name":"宜川县"},{"code":"610631","name":"黄龙县"},{"code":"610632","name":"黄陵县"}],[{"code":"610702","name":"汉台区"},{"code":"610703","name":"南郑区"},{"code":"610722","name":"城固县"},{"code":"610723","name":"洋县"},{"code":"610724","name":"西乡县"},{"code":"610725","name":"勉县"},{"code":"610726","name":"宁强县"},{"code":"610727","name":"略阳县"},{"code":"610728","name":"镇巴县"},{"code":"610729","name":"留坝县"},{"code":"610730","name":"佛坪县"}],[{"code":"610802","name":"榆阳区"},{"code":"610803","name":"横山区"},{"code":"610822","name":"府谷县"},{"code":"610824","name":"靖边县"},{"code":"610825","name":"定边县"},{"code":"610826","name":"绥德县"},{"code":"610827","name":"米脂县"},{"code":"610828","name":"佳县"},{"code":"610829","name":"吴堡县"},{"code":"610830","name":"清涧县"},{"code":"610831","name":"子洲县"},{"code":"610881","name":"神木市"}],[{"code":"610902","name":"汉滨区"},{"code":"610921","name":"汉阴县"},{"code":"610922","name":"石泉县"},{"code":"610923","name":"宁陕县"},{"code":"610924","name":"紫阳县"},{"code":"610925","name":"岚皋县"},{"code":"610926","name":"平利县"},{"code":"610927","name":"镇坪县"},{"code":"610929","name":"白河县"},{"code":"610981","name":"旬阳市"}],[{"code":"611002","name":"商州区"},{"code":"611021","name":"洛南县"},{"code":"611022","name":"丹凤县"},{"code":"611023","name":"商南县"},{"code":"611024","name":"山阳县"},{"code":"611025","name":"镇安县"},{"code":"611026","name":"柞水县"}]],[[{"code":"620102","name":"城关区"},{"code":"620103","name":"七里河区"},{"code":"620104","name":"西固区"},{"code":"620105","name":"安宁区"},{"code":"620111","name":"红古区"},{"code":"620121","name":"永登县"},{"code":"620122","name":"皋兰县"},{"code":"620123","name":"榆中县"}],[{"code":"620201","name":"雄关区"},{"code":"620202","name":"镜铁区"},{"code":"620203","name":"长城区"}],[{"code":"620302","name":"金川区"},{"code":"620321","name":"永昌县"}],[{"code":"620402","name":"白银区"},{"code":"620403","name":"平川区"},{"code":"620421","name":"靖远县"},{"code":"620422","name":"会宁县"},{"code":"620423","name":"景泰县"}],[{"code":"620502","name":"秦州区"},{"code":"620503","name":"麦积区"},{"code":"620521","name":"清水县"},{"code":"620522","name":"秦安县"},{"code":"620523","name":"甘谷县"},{"code":"620524","name":"武山县"},{"code":"620525","name":"张家川回族自治县"}],[{"code":"620602","name":"凉州区"},{"code":"620621","name":"民勤县"},{"code":"620622","name":"古浪县"},{"code":"620623","name":"天祝藏族自治县"}],[{"code":"620702","name":"甘州区"},{"code":"620721","name":"肃南裕固族自治县"},{"code":"620722","name":"民乐县"},{"code":"620723","name":"临泽县"},{"code":"620724","name":"高台县"},{"code":"620725","name":"山丹县"}],[{"code":"620802","name":"崆峒区"},{"code":"620821","name":"泾川县"},{"code":"620822","name":"灵台县"},{"code":"620823","name":"崇信县"},{"code":"620824","name":"华亭县"},{"code":"620825","name":"庄浪县"},{"code":"620826","name":"静宁县"}],[{"code":"620902","name":"肃州区"},{"code":"620921","name":"金塔县"},{"code":"620922","name":"瓜州县"},{"code":"620923","name":"肃北蒙古族自治县"},{"code":"620924","name":"阿克塞哈萨克族自治县"},{"code":"620981","name":"玉门市"},{"code":"620982","name":"敦煌市"}],[{"code":"621002","name":"西峰区"},{"code":"621021","name":"庆城县"},{"code":"621022","name":"环县"},{"code":"621023","name":"华池县"},{"code":"621024","name":"合水县"},{"code":"621025","name":"正宁县"},{"code":"621026","name":"宁县"},{"code":"621027","name":"镇原县"}],[{"code":"621102","name":"安定区"},{"code":"621121","name":"通渭县"},{"code":"621122","name":"陇西县"},{"code":"621123","name":"渭源县"},{"code":"621124","name":"临洮县"},{"code":"621125","name":"漳县"},{"code":"621126","name":"岷县"}],[{"code":"621202","name":"武都区"},{"code":"621221","name":"成县"},{"code":"621222","name":"文县"},{"code":"621223","name":"宕昌县"},{"code":"621224","name":"康县"},{"code":"621225","name":"西和县"},{"code":"621226","name":"礼县"},{"code":"621227","name":"徽县"},{"code":"621228","name":"两当县"}],[{"code":"622901","name":"临夏市"},{"code":"622921","name":"临夏县"},{"code":"622922","name":"康乐县"},{"code":"622923","name":"永靖县"},{"code":"622924","name":"广河县"},{"code":"622925","name":"和政县"},{"code":"622926","name":"东乡族自治县"},{"code":"622927","name":"积石山保安族东乡族撒拉族自治县"}],[{"code":"623001","name":"合作市"},{"code":"623021","name":"临潭县"},{"code":"623022","name":"卓尼县"},{"code":"623023","name":"舟曲县"},{"code":"623024","name":"迭部县"},{"code":"623025","name":"玛曲县"},{"code":"623026","name":"碌曲县"},{"code":"623027","name":"夏河县"}]],[[{"code":"630102","name":"城东区"},{"code":"630103","name":"城中区"},{"code":"630104","name":"城西区"},{"code":"630105","name":"城北区"},{"code":"630121","name":"大通回族土族自治县"},{"code":"630122","name":"湟中县"},{"code":"630123","name":"湟源县"}],[{"code":"630202","name":"乐都区"},{"code":"630203","name":"平安区"},{"code":"630222","name":"民和回族土族自治县"},{"code":"630223","name":"互助土族自治县"},{"code":"630224","name":"化隆回族自治县"},{"code":"630225","name":"循化撒拉族自治县"}],[{"code":"632221","name":"门源回族自治县"},{"code":"632222","name":"祁连县"},{"code":"632223","name":"海晏县"},{"code":"632224","name":"刚察县"}],[{"code":"632321","name":"同仁县"},{"code":"632322","name":"尖扎县"},{"code":"632323","name":"泽库县"},{"code":"632324","name":"河南蒙古族自治县"}],[{"code":"632521","name":"共和县"},{"code":"632522","name":"同德县"},{"code":"632523","name":"贵德县"},{"code":"632524","name":"兴海县"},{"code":"632525","name":"贵南县"}],[{"code":"632621","name":"玛沁县"},{"code":"632622","name":"班玛县"},{"code":"632623","name":"甘德县"},{"code":"632624","name":"达日县"},{"code":"632625","name":"久治县"},{"code":"632626","name":"玛多县"}],[{"code":"632701","name":"玉树市"},{"code":"632722","name":"杂多县"},{"code":"632723","name":"称多县"},{"code":"632724","name":"治多县"},{"code":"632725","name":"囊谦县"},{"code":"632726","name":"曲麻莱县"}],[{"code":"632801","name":"格尔木市"},{"code":"632802","name":"德令哈市"},{"code":"632821","name":"乌兰县"},{"code":"632822","name":"都兰县"},{"code":"632823","name":"天峻县"},{"code":"632824","name":"冷湖行政委员会"},{"code":"632825","name":"大柴旦行政委员会"},{"code":"632826","name":"茫崖行政委员会"}]],[[{"code":"640104","name":"兴庆区"},{"code":"640105","name":"西夏区"},{"code":"640106","name":"金凤区"},{"code":"640121","name":"永宁县"},{"code":"640122","name":"贺兰县"},{"code":"640181","name":"灵武市"}],[{"code":"640202","name":"大武口区"},{"code":"640205","name":"惠农区"},{"code":"640221","name":"平罗县"}],[{"code":"640302","name":"利通区"},{"code":"640303","name":"红寺堡区"},{"code":"640323","name":"盐池县"},{"code":"640324","name":"同心县"},{"code":"640381","name":"青铜峡市"}],[{"code":"640402","name":"原州区"},{"code":"640422","name":"西吉县"},{"code":"640423","name":"隆德县"},{"code":"640424","name":"泾源县"},{"code":"640425","name":"彭阳县"}],[{"code":"640502","name":"沙坡头区"},{"code":"640521","name":"中宁县"},{"code":"640522","name":"海原县"}]],[[{"code":"650102","name":"天山区"},{"code":"650103","name":"沙依巴克区"},{"code":"650104","name":"新市区"},{"code":"650105","name":"水磨沟区"},{"code":"650106","name":"头屯河区"},{"code":"650107","name":"达坂城区"},{"code":"650109","name":"米东区"},{"code":"650121","name":"乌鲁木齐县"}],[{"code":"650202","name":"独山子区"},{"code":"650203","name":"克拉玛依区"},{"code":"650204","name":"白碱滩区"},{"code":"650205","name":"乌尔禾区"}],[{"code":"650402","name":"高昌区"},{"code":"650421","name":"鄯善县"},{"code":"650422","name":"托克逊县"}],[{"code":"650502","name":"伊州区"},{"code":"650521","name":"巴里坤哈萨克自治县"},{"code":"650522","name":"伊吾县"}],[{"code":"652301","name":"昌吉市"},{"code":"652302","name":"阜康市"},{"code":"652323","name":"呼图壁县"},{"code":"652324","name":"玛纳斯县"},{"code":"652325","name":"奇台县"},{"code":"652327","name":"吉木萨尔县"},{"code":"652328","name":"木垒哈萨克自治县"}],[{"code":"652701","name":"博乐市"},{"code":"652702","name":"阿拉山口市"},{"code":"652722","name":"精河县"},{"code":"652723","name":"温泉县"}],[{"code":"652801","name":"库尔勒市"},{"code":"652822","name":"轮台县"},{"code":"652823","name":"尉犁县"},{"code":"652824","name":"若羌县"},{"code":"652825","name":"且末县"},{"code":"652826","name":"焉耆回族自治县"},{"code":"652827","name":"和静县"},{"code":"652828","name":"和硕县"},{"code":"652829","name":"博湖县"}],[{"code":"652901","name":"阿克苏市"},{"code":"652922","name":"温宿县"},{"code":"652923","name":"库车县"},{"code":"652924","name":"沙雅县"},{"code":"652925","name":"新和县"},{"code":"652926","name":"拜城县"},{"code":"652927","name":"乌什县"},{"code":"652928","name":"阿瓦提县"},{"code":"652929","name":"柯坪县"}],[{"code":"653001","name":"阿图什市"},{"code":"653022","name":"阿克陶县"},{"code":"653023","name":"阿合奇县"},{"code":"653024","name":"乌恰县"}],[{"code":"653101","name":"喀什市"},{"code":"653121","name":"疏附县"},{"code":"653122","name":"疏勒县"},{"code":"653123","name":"英吉沙县"},{"code":"653124","name":"泽普县"},{"code":"653125","name":"莎车县"},{"code":"653126","name":"叶城县"},{"code":"653127","name":"麦盖提县"},{"code":"653128","name":"岳普湖县"},{"code":"653129","name":"伽师县"},{"code":"653130","name":"巴楚县"},{"code":"653131","name":"塔什库尔干塔吉克自治县"}],[{"code":"653201","name":"和田市"},{"code":"653221","name":"和田县"},{"code":"653222","name":"墨玉县"},{"code":"653223","name":"皮山县"},{"code":"653224","name":"洛浦县"},{"code":"653225","name":"策勒县"},{"code":"653226","name":"于田县"},{"code":"653227","name":"民丰县"}],[{"code":"654002","name":"伊宁市"},{"code":"654003","name":"奎屯市"},{"code":"654004","name":"霍尔果斯市"},{"code":"654021","name":"伊宁县"},{"code":"654022","name":"察布查尔锡伯自治县"},{"code":"654023","name":"霍城县"},{"code":"654024","name":"巩留县"},{"code":"654025","name":"新源县"},{"code":"654026","name":"昭苏县"},{"code":"654027","name":"特克斯县"},{"code":"654028","name":"尼勒克县"}],[{"code":"654201","name":"塔城市"},{"code":"654202","name":"乌苏市"},{"code":"654203","name":"沙湾市"},{"code":"654221","name":"额敏县"},{"code":"654224","name":"托里县"},{"code":"654225","name":"裕民县"},{"code":"654226","name":"和布克赛尔蒙古自治县"}],[{"code":"654301","name":"阿勒泰市"},{"code":"654321","name":"布尔津县"},{"code":"654322","name":"富蕴县"},{"code":"654323","name":"福海县"},{"code":"654324","name":"哈巴河县"},{"code":"654325","name":"青河县"},{"code":"654326","name":"吉木乃县"}],[{"code":"659001","name":"石河子市"},{"code":"659002","name":"阿拉尔市"},{"code":"659003","name":"图木舒克市"},{"code":"659004","name":"五家渠市"},{"code":"659005","name":"北屯市"},{"code":"659006","name":"铁门关市"},{"code":"659007","name":"双河市"},{"code":"659008","name":"可克达拉市"},{"code":"659009","name":"昆玉市"}]],[[{"code":"710101","name":"中正区"},{"code":"710102","name":"大同区"},{"code":"710103","name":"中山区"},{"code":"710104","name":"松山区"},{"code":"710105","name":"大安区"},{"code":"710106","name":"万华区"},{"code":"710107","name":"信义区"},{"code":"710108","name":"士林区"},{"code":"710109","name":"北投区"},{"code":"710110","name":"内湖区"},{"code":"710111","name":"南港区"},{"code":"710112","name":"文山区"}],[{"code":"710201","name":"新兴区"},{"code":"710202","name":"前金区"},{"code":"710203","name":"苓雅区"},{"code":"710204","name":"盐埕区"},{"code":"710205","name":"鼓山区"},{"code":"710206","name":"旗津区"},{"code":"710207","name":"前镇区"},{"code":"710208","name":"三民区"},{"code":"710209","name":"左营区"},{"code":"710210","name":"楠梓区"},{"code":"710211","name":"小港区"},{"code":"710242","name":"仁武区"},{"code":"710243","name":"大社区"},{"code":"710244","name":"冈山区"},{"code":"710245","name":"路竹区"},{"code":"710246","name":"阿莲区"},{"code":"710247","name":"田寮区"},{"code":"710248","name":"燕巢区"},{"code":"710249","name":"桥头区"},{"code":"710250","name":"梓官区"},{"code":"710251","name":"弥陀区"},{"code":"710252","name":"永安区"},{"code":"710253","name":"湖内区"},{"code":"710254","name":"凤山区"},{"code":"710255","name":"大寮区"},{"code":"710256","name":"林园区"},{"code":"710257","name":"鸟松区"},{"code":"710258","name":"大树区"},{"code":"710259","name":"旗山区"},{"code":"710260","name":"美浓区"},{"code":"710261","name":"六龟区"},{"code":"710262","name":"内门区"},{"code":"710263","name":"杉林区"},{"code":"710264","name":"甲仙区"},{"code":"710265","name":"桃源区"},{"code":"710266","name":"那玛夏区"},{"code":"710267","name":"茂林区"},{"code":"710268","name":"茄萣区"}],[{"code":"710301","name":"中西区"},{"code":"710302","name":"东区"},{"code":"710303","name":"南区"},{"code":"710304","name":"北区"},{"code":"710305","name":"安平区"},{"code":"710306","name":"安南区"},{"code":"710339","name":"永康区"},{"code":"710340","name":"归仁区"},{"code":"710341","name":"新化区"},{"code":"710342","name":"左镇区"},{"code":"710343","name":"玉井区"},{"code":"710344","name":"楠西区"},{"code":"710345","name":"南化区"},{"code":"710346","name":"仁德区"},{"code":"710347","name":"关庙区"},{"code":"710348","name":"龙崎区"},{"code":"710349","name":"官田区"},{"code":"710350","name":"麻豆区"},{"code":"710351","name":"佳里区"},{"code":"710352","name":"西港区"},{"code":"710353","name":"七股区"},{"code":"710354","name":"将军区"},{"code":"710355","name":"学甲区"},{"code":"710356","name":"北门区"},{"code":"710357","name":"新营区"},{"code":"710358","name":"后壁区"},{"code":"710359","name":"白河区"},{"code":"710360","name":"东山区"},{"code":"710361","name":"六甲区"},{"code":"710362","name":"下营区"},{"code":"710363","name":"柳营区"},{"code":"710364","name":"盐水区"},{"code":"710365","name":"善化区"},{"code":"710366","name":"大内区"},{"code":"710367","name":"山上区"},{"code":"710368","name":"新市区"},{"code":"710369","name":"安定区"}],[{"code":"710401","name":"中区"},{"code":"710402","name":"东区"},{"code":"710403","name":"南区"},{"code":"710404","name":"西区"},{"code":"710405","name":"北区"},{"code":"710406","name":"北屯区"},{"code":"710407","name":"西屯区"},{"code":"710408","name":"南屯区"},{"code":"710431","name":"太平区"},{"code":"710432","name":"大里区"},{"code":"710433","name":"雾峰区"},{"code":"710434","name":"乌日区"},{"code":"710435","name":"丰原区"},{"code":"710436","name":"后里区"},{"code":"710437","name":"石冈区"},{"code":"710438","name":"东势区"},{"code":"710439","name":"和平区"},{"code":"710440","name":"新社区"},{"code":"710441","name":"潭子区"},{"code":"710442","name":"大雅区"},{"code":"710443","name":"神冈区"},{"code":"710444","name":"大肚区"},{"code":"710445","name":"沙鹿区"},{"code":"710446","name":"龙井区"},{"code":"710447","name":"梧栖区"},{"code":"710448","name":"清水区"},{"code":"710449","name":"大甲区"},{"code":"710450","name":"外埔区"},{"code":"710451","name":"大安区"}],[{"code":"710614","name":"南投市"},{"code":"710615","name":"中寮乡"},{"code":"710616","name":"草屯镇"},{"code":"710617","name":"国姓乡"},{"code":"710618","name":"埔里镇"},{"code":"710619","name":"仁爱乡"},{"code":"710620","name":"名间乡"},{"code":"710621","name":"集集镇"},{"code":"710622","name":"水里乡"},{"code":"710623","name":"鱼池乡"},{"code":"710624","name":"信义乡"},{"code":"710625","name":"竹山镇"},{"code":"710626","name":"鹿谷乡"}],[{"code":"710701","name":"仁爱区"},{"code":"710702","name":"信义区"},{"code":"710703","name":"中正区"},{"code":"710704","name":"中山区"},{"code":"710705","name":"安乐区"},{"code":"710706","name":"暖暖区"},{"code":"710707","name":"七堵区"}],[{"code":"710801","name":"东区"},{"code":"710802","name":"北区"},{"code":"710803","name":"香山区"}],[{"code":"710901","name":"东区"},{"code":"710902","name":"西区"}],[{"code":"711130","name":"万里区"},{"code":"711131","name":"金山区"},{"code":"711132","name":"板桥区"},{"code":"711133","name":"汐止区"},{"code":"711134","name":"深坑区"},{"code":"711135","name":"石碇区"},{"code":"711136","name":"瑞芳区"},{"code":"711137","name":"平溪区"},{"code":"711138","name":"双溪区"},{"code":"711139","name":"贡寮区"},{"code":"711140","name":"新店区"},{"code":"711141","name":"坪林区"},{"code":"711142","name":"乌来区"},{"code":"711143","name":"永和区"},{"code":"711144","name":"中和区"},{"code":"711145","name":"土城区"},{"code":"711146","name":"三峡区"},{"code":"711147","name":"树林区"},{"code":"711148","name":"莺歌区"},{"code":"711149","name":"三重区"},{"code":"711150","name":"新庄区"},{"code":"711151","name":"泰山区"},{"code":"711152","name":"林口区"},{"code":"711153","name":"芦洲区"},{"code":"711154","name":"五股区"},{"code":"711155","name":"八里区"},{"code":"711156","name":"淡水区"},{"code":"711157","name":"三芝区"},{"code":"711158","name":"石门区"}],[{"code":"711214","name":"宜兰市"},{"code":"711215","name":"头城镇"},{"code":"711216","name":"礁溪乡"},{"code":"711217","name":"壮围乡"},{"code":"711218","name":"员山乡"},{"code":"711219","name":"罗东镇"},{"code":"711220","name":"三星乡"},{"code":"711221","name":"大同乡"},{"code":"711222","name":"五结乡"},{"code":"711223","name":"冬山乡"},{"code":"711224","name":"苏澳镇"},{"code":"711225","name":"南澳乡"}],[{"code":"711314","name":"竹北市"},{"code":"711315","name":"湖口乡"},{"code":"711316","name":"新丰乡"},{"code":"711317","name":"新埔镇"},{"code":"711318","name":"关西镇"},{"code":"711319","name":"芎林乡"},{"code":"711320","name":"宝山乡"},{"code":"711321","name":"竹东镇"},{"code":"711322","name":"五峰乡"},{"code":"711323","name":"横山乡"},{"code":"711324","name":"尖石乡"},{"code":"711325","name":"北埔乡"},{"code":"711326","name":"峨眉乡"}],[{"code":"711414","name":"中坜区"},{"code":"711415","name":"平镇区"},{"code":"711416","name":"龙潭区"},{"code":"711417","name":"杨梅区"},{"code":"711418","name":"新屋区"},{"code":"711419","name":"观音区"},{"code":"711420","name":"桃园区"},{"code":"711421","name":"龟山区"},{"code":"711422","name":"八德区"},{"code":"711423","name":"大溪区"},{"code":"711424","name":"复兴区"},{"code":"711425","name":"大园区"},{"code":"711426","name":"芦竹区"}],[{"code":"711519","name":"竹南镇"},{"code":"711520","name":"头份市"},{"code":"711521","name":"三湾乡"},{"code":"711522","name":"南庄乡"},{"code":"711523","name":"狮潭乡"},{"code":"711524","name":"后龙镇"},{"code":"711525","name":"通霄镇"},{"code":"711526","name":"苑里镇"},{"code":"711527","name":"苗栗市"},{"code":"711528","name":"造桥乡"},{"code":"711529","name":"头屋乡"},{"code":"711530","name":"公馆乡"},{"code":"711531","name":"大湖乡"},{"code":"711532","name":"泰安乡"},{"code":"711533","name":"铜锣乡"},{"code":"711534","name":"三义乡"},{"code":"711535","name":"西湖乡"},{"code":"711536","name":"卓兰镇"}],[{"code":"711727","name":"彰化市"},{"code":"711728","name":"芬园乡"},{"code":"711729","name":"花坛乡"},{"code":"711730","name":"秀水乡"},{"code":"711731","name":"鹿港镇"},{"code":"711732","name":"福兴乡"},{"code":"711733","name":"线西乡"},{"code":"711734","name":"和美镇"},{"code":"711735","name":"伸港乡"},{"code":"711736","name":"员林市"},{"code":"711737","name":"社头乡"},{"code":"711738","name":"永靖乡"},{"code":"711739","name":"埔心乡"},{"code":"711740","name":"溪湖镇"},{"code":"711741","name":"大村乡"},{"code":"711742","name":"埔盐乡"},{"code":"711743","name":"田中镇"},{"code":"711744","name":"北斗镇"},{"code":"711745","name":"田尾乡"},{"code":"711746","name":"埤头乡"},{"code":"711747","name":"溪州乡"},{"code":"711748","name":"竹塘乡"},{"code":"711749","name":"二林镇"},{"code":"711750","name":"大城乡"},{"code":"711751","name":"芳苑乡"},{"code":"711752","name":"二水乡"}],[{"code":"711919","name":"番路乡"},{"code":"711920","name":"梅山乡"},{"code":"711921","name":"竹崎乡"},{"code":"711922","name":"阿里山乡"},{"code":"711923","name":"中埔乡"},{"code":"711924","name":"大埔乡"},{"code":"711925","name":"水上乡"},{"code":"711926","name":"鹿草乡"},{"code":"711927","name":"太保市"},{"code":"711928","name":"朴子市"},{"code":"711929","name":"东石乡"},{"code":"711930","name":"六脚乡"},{"code":"711931","name":"新港乡"},{"code":"711932","name":"民雄乡"},{"code":"711933","name":"大林镇"},{"code":"711934","name":"溪口乡"},{"code":"711935","name":"义竹乡"},{"code":"711936","name":"布袋镇"}],[{"code":"712121","name":"斗南镇"},{"code":"712122","name":"大埤乡"},{"code":"712123","name":"虎尾镇"},{"code":"712124","name":"土库镇"},{"code":"712125","name":"褒忠乡"},{"code":"712126","name":"东势乡"},{"code":"712127","name":"台西乡"},{"code":"712128","name":"仑背乡"},{"code":"712129","name":"麦寮乡"},{"code":"712130","name":"斗六市"},{"code":"712131","name":"林内乡"},{"code":"712132","name":"古坑乡"},{"code":"712133","name":"莿桐乡"},{"code":"712134","name":"西螺镇"},{"code":"712135","name":"二仑乡"},{"code":"712136","name":"北港镇"},{"code":"712137","name":"水林乡"},{"code":"712138","name":"口湖乡"},{"code":"712139","name":"四湖乡"},{"code":"712140","name":"元长乡"}],[{"code":"712434","name":"屏东市"},{"code":"712435","name":"三地门乡"},{"code":"712436","name":"雾台乡"},{"code":"712437","name":"玛家乡"},{"code":"712438","name":"九如乡"},{"code":"712439","name":"里港乡"},{"code":"712440","name":"高树乡"},{"code":"712441","name":"盐埔乡"},{"code":"712442","name":"长治乡"},{"code":"712443","name":"麟洛乡"},{"code":"712444","name":"竹田乡"},{"code":"712445","name":"内埔乡"},{"code":"712446","name":"万丹乡"},{"code":"712447","name":"潮州镇"},{"code":"712448","name":"泰武乡"},{"code":"712449","name":"来义乡"},{"code":"712450","name":"万峦乡"},{"code":"712451","name":"崁顶乡"},{"code":"712452","name":"新埤乡"},{"code":"712453","name":"南州乡"},{"code":"712454","name":"林边乡"},{"code":"712455","name":"东港镇"},{"code":"712456","name":"琉球乡"},{"code":"712457","name":"佳冬乡"},{"code":"712458","name":"新园乡"},{"code":"712459","name":"枋寮乡"},{"code":"712460","name":"枋山乡"},{"code":"712461","name":"春日乡"},{"code":"712462","name":"狮子乡"},{"code":"712463","name":"车城乡"},{"code":"712464","name":"牡丹乡"},{"code":"712465","name":"恒春镇"},{"code":"712466","name":"满州乡"}],[{"code":"712517","name":"台东市"},{"code":"712518","name":"绿岛乡"},{"code":"712519","name":"兰屿乡"},{"code":"712520","name":"延平乡"},{"code":"712521","name":"卑南乡"},{"code":"712522","name":"鹿野乡"},{"code":"712523","name":"关山镇"},{"code":"712524","name":"海端乡"},{"code":"712525","name":"池上乡"},{"code":"712526","name":"东河乡"},{"code":"712527","name":"成功镇"},{"code":"712528","name":"长滨乡"},{"code":"712529","name":"金峰乡"},{"code":"712530","name":"大武乡"},{"code":"712531","name":"达仁乡"},{"code":"712532","name":"太麻里乡"}],[{"code":"712615","name":"花莲市"},{"code":"712616","name":"新城乡"},{"code":"712618","name":"秀林乡"},{"code":"712619","name":"吉安乡"},{"code":"712620","name":"寿丰乡"},{"code":"712621","name":"凤林镇"},{"code":"712622","name":"光复乡"},{"code":"712623","name":"丰滨乡"},{"code":"712624","name":"瑞穗乡"},{"code":"712625","name":"万荣乡"},{"code":"712626","name":"玉里镇"},{"code":"712627","name":"卓溪乡"},{"code":"712628","name":"富里乡"}],[{"code":"712707","name":"马公市"},{"code":"712708","name":"西屿乡"},{"code":"712709","name":"望安乡"},{"code":"712710","name":"七美乡"},{"code":"712711","name":"白沙乡"},{"code":"712712","name":"湖西乡"}]],[[{"code":"810101","name":"中西区"},{"code":"810102","name":"东区"},{"code":"810103","name":"九龙城区"},{"code":"810104","name":"观塘区"},{"code":"810105","name":"南区"},{"code":"810106","name":"深水埗区"},{"code":"810107","name":"湾仔区"},{"code":"810108","name":"黄大仙区"},{"code":"810109","name":"油尖旺区"},{"code":"810110","name":"离岛区"},{"code":"810111","name":"葵青区"},{"code":"810112","name":"北区"},{"code":"810113","name":"西贡区"},{"code":"810114","name":"沙田区"},{"code":"810115","name":"屯门区"},{"code":"810116","name":"大埔区"},{"code":"810117","name":"荃湾区"},{"code":"810118","name":"元朗区"}]],[[{"code":"820101","name":"澳门半岛"},{"code":"820102","name":"凼仔"},{"code":"820103","name":"路凼城"},{"code":"820104","name":"路环"}]]]
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/address/citys.json b/uni_modules/vk-uview-ui/libs/address/citys.json
new file mode 100644
index 0000000..a4b90fe
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/address/citys.json
@@ -0,0 +1 @@
+[[{"code":"110100","name":"北京市"}],[{"code":"120100","name":"天津市"}],[{"code":"130100","name":"石家庄市"},{"code":"130200","name":"唐山市"},{"code":"130300","name":"秦皇岛市"},{"code":"130400","name":"邯郸市"},{"code":"130500","name":"邢台市"},{"code":"130600","name":"保定市"},{"code":"130700","name":"张家口市"},{"code":"130800","name":"承德市"},{"code":"130900","name":"沧州市"},{"code":"131000","name":"廊坊市"},{"code":"131100","name":"衡水市"}],[{"code":"140100","name":"太原市"},{"code":"140200","name":"大同市"},{"code":"140300","name":"阳泉市"},{"code":"140400","name":"长治市"},{"code":"140500","name":"晋城市"},{"code":"140600","name":"朔州市"},{"code":"140700","name":"晋中市"},{"code":"140800","name":"运城市"},{"code":"140900","name":"忻州市"},{"code":"141000","name":"临汾市"},{"code":"141100","name":"吕梁市"}],[{"code":"150100","name":"呼和浩特市"},{"code":"150200","name":"包头市"},{"code":"150300","name":"乌海市"},{"code":"150400","name":"赤峰市"},{"code":"150500","name":"通辽市"},{"code":"150600","name":"鄂尔多斯市"},{"code":"150700","name":"呼伦贝尔市"},{"code":"150800","name":"巴彦淖尔市"},{"code":"150900","name":"乌兰察布市"},{"code":"152200","name":"兴安盟"},{"code":"152500","name":"锡林郭勒盟"},{"code":"152900","name":"阿拉善盟"}],[{"code":"210100","name":"沈阳市"},{"code":"210200","name":"大连市"},{"code":"210300","name":"鞍山市"},{"code":"210400","name":"抚顺市"},{"code":"210500","name":"本溪市"},{"code":"210600","name":"丹东市"},{"code":"210700","name":"锦州市"},{"code":"210800","name":"营口市"},{"code":"210900","name":"阜新市"},{"code":"211000","name":"辽阳市"},{"code":"211100","name":"盘锦市"},{"code":"211200","name":"铁岭市"},{"code":"211300","name":"朝阳市"},{"code":"211400","name":"葫芦岛市"}],[{"code":"220100","name":"长春市"},{"code":"220200","name":"吉林市"},{"code":"220300","name":"四平市"},{"code":"220400","name":"辽源市"},{"code":"220500","name":"通化市"},{"code":"220600","name":"白山市"},{"code":"220700","name":"松原市"},{"code":"220800","name":"白城市"},{"code":"222400","name":"延边朝鲜族自治州"}],[{"code":"230100","name":"哈尔滨市"},{"code":"230200","name":"齐齐哈尔市"},{"code":"230300","name":"鸡西市"},{"code":"230400","name":"鹤岗市"},{"code":"230500","name":"双鸭山市"},{"code":"230600","name":"大庆市"},{"code":"230700","name":"伊春市"},{"code":"230800","name":"佳木斯市"},{"code":"230900","name":"七台河市"},{"code":"231000","name":"牡丹江市"},{"code":"231100","name":"黑河市"},{"code":"231200","name":"绥化市"},{"code":"232700","name":"大兴安岭地区"}],[{"code":"310100","name":"上海市"}],[{"code":"320100","name":"南京市"},{"code":"320200","name":"无锡市"},{"code":"320300","name":"徐州市"},{"code":"320400","name":"常州市"},{"code":"320500","name":"苏州市"},{"code":"320600","name":"南通市"},{"code":"320700","name":"连云港市"},{"code":"320800","name":"淮安市"},{"code":"320900","name":"盐城市"},{"code":"321000","name":"扬州市"},{"code":"321100","name":"镇江市"},{"code":"321200","name":"泰州市"},{"code":"321300","name":"宿迁市"}],[{"code":"330100","name":"杭州市"},{"code":"330200","name":"宁波市"},{"code":"330300","name":"温州市"},{"code":"330400","name":"嘉兴市"},{"code":"330500","name":"湖州市"},{"code":"330600","name":"绍兴市"},{"code":"330700","name":"金华市"},{"code":"330800","name":"衢州市"},{"code":"330900","name":"舟山市"},{"code":"331000","name":"台州市"},{"code":"331100","name":"丽水市"}],[{"code":"340100","name":"合肥市"},{"code":"340200","name":"芜湖市"},{"code":"340300","name":"蚌埠市"},{"code":"340400","name":"淮南市"},{"code":"340500","name":"马鞍山市"},{"code":"340600","name":"淮北市"},{"code":"340700","name":"铜陵市"},{"code":"340800","name":"安庆市"},{"code":"341000","name":"黄山市"},{"code":"341100","name":"滁州市"},{"code":"341200","name":"阜阳市"},{"code":"341300","name":"宿州市"},{"code":"341500","name":"六安市"},{"code":"341600","name":"亳州市"},{"code":"341700","name":"池州市"},{"code":"341800","name":"宣城市"}],[{"code":"350100","name":"福州市"},{"code":"350200","name":"厦门市"},{"code":"350300","name":"莆田市"},{"code":"350400","name":"三明市"},{"code":"350500","name":"泉州市"},{"code":"350600","name":"漳州市"},{"code":"350700","name":"南平市"},{"code":"350800","name":"龙岩市"},{"code":"350900","name":"宁德市"}],[{"code":"360100","name":"南昌市"},{"code":"360200","name":"景德镇市"},{"code":"360300","name":"萍乡市"},{"code":"360400","name":"九江市"},{"code":"360500","name":"新余市"},{"code":"360600","name":"鹰潭市"},{"code":"360700","name":"赣州市"},{"code":"360800","name":"吉安市"},{"code":"360900","name":"宜春市"},{"code":"361000","name":"抚州市"},{"code":"361100","name":"上饶市"}],[{"code":"370100","name":"济南市"},{"code":"370200","name":"青岛市"},{"code":"370300","name":"淄博市"},{"code":"370400","name":"枣庄市"},{"code":"370500","name":"东营市"},{"code":"370600","name":"烟台市"},{"code":"370700","name":"潍坊市"},{"code":"370800","name":"济宁市"},{"code":"370900","name":"泰安市"},{"code":"371000","name":"威海市"},{"code":"371100","name":"日照市"},{"code":"371200","name":"莱芜市"},{"code":"371300","name":"临沂市"},{"code":"371400","name":"德州市"},{"code":"371500","name":"聊城市"},{"code":"371600","name":"滨州市"},{"code":"371700","name":"菏泽市"}],[{"code":"410100","name":"郑州市"},{"code":"410200","name":"开封市"},{"code":"410300","name":"洛阳市"},{"code":"410400","name":"平顶山市"},{"code":"410500","name":"安阳市"},{"code":"410600","name":"鹤壁市"},{"code":"410700","name":"新乡市"},{"code":"410800","name":"焦作市"},{"code":"410900","name":"濮阳市"},{"code":"411000","name":"许昌市"},{"code":"411100","name":"漯河市"},{"code":"411200","name":"三门峡市"},{"code":"411300","name":"南阳市"},{"code":"411400","name":"商丘市"},{"code":"411500","name":"信阳市"},{"code":"411600","name":"周口市"},{"code":"411700","name":"驻马店市"},{"code":"419000","name":"省直辖县级行政区划"}],[{"code":"420100","name":"武汉市"},{"code":"420200","name":"黄石市"},{"code":"420300","name":"十堰市"},{"code":"420500","name":"宜昌市"},{"code":"420600","name":"襄阳市"},{"code":"420700","name":"鄂州市"},{"code":"420800","name":"荆门市"},{"code":"420900","name":"孝感市"},{"code":"421000","name":"荆州市"},{"code":"421100","name":"黄冈市"},{"code":"421200","name":"咸宁市"},{"code":"421300","name":"随州市"},{"code":"422800","name":"恩施土家族苗族自治州"},{"code":"429000","name":"省直辖县级行政区划"}],[{"code":"430100","name":"长沙市"},{"code":"430200","name":"株洲市"},{"code":"430300","name":"湘潭市"},{"code":"430400","name":"衡阳市"},{"code":"430500","name":"邵阳市"},{"code":"430600","name":"岳阳市"},{"code":"430700","name":"常德市"},{"code":"430800","name":"张家界市"},{"code":"430900","name":"益阳市"},{"code":"431000","name":"郴州市"},{"code":"431100","name":"永州市"},{"code":"431200","name":"怀化市"},{"code":"431300","name":"娄底市"},{"code":"433100","name":"湘西土家族苗族自治州"}],[{"code":"440100","name":"广州市"},{"code":"440200","name":"韶关市"},{"code":"440300","name":"深圳市"},{"code":"440400","name":"珠海市"},{"code":"440500","name":"汕头市"},{"code":"440600","name":"佛山市"},{"code":"440700","name":"江门市"},{"code":"440800","name":"湛江市"},{"code":"440900","name":"茂名市"},{"code":"441200","name":"肇庆市"},{"code":"441300","name":"惠州市"},{"code":"441400","name":"梅州市"},{"code":"441500","name":"汕尾市"},{"code":"441600","name":"河源市"},{"code":"441700","name":"阳江市"},{"code":"441800","name":"清远市"},{"code":"441900","name":"东莞市"},{"code":"442000","name":"中山市"},{"code":"445100","name":"潮州市"},{"code":"445200","name":"揭阳市"},{"code":"445300","name":"云浮市"}],[{"code":"450100","name":"南宁市"},{"code":"450200","name":"柳州市"},{"code":"450300","name":"桂林市"},{"code":"450400","name":"梧州市"},{"code":"450500","name":"北海市"},{"code":"450600","name":"防城港市"},{"code":"450700","name":"钦州市"},{"code":"450800","name":"贵港市"},{"code":"450900","name":"玉林市"},{"code":"451000","name":"百色市"},{"code":"451100","name":"贺州市"},{"code":"451200","name":"河池市"},{"code":"451300","name":"来宾市"},{"code":"451400","name":"崇左市"}],[{"code":"460100","name":"海口市"},{"code":"460200","name":"三亚市"},{"code":"460300","name":"三沙市"},{"code":"460400","name":"儋州市"},{"code":"469000","name":"省直辖县级行政区划"}],[{"code":"500100","name":"重庆市"},{"code":"500200","name":"县"}],[{"code":"510100","name":"成都市"},{"code":"510300","name":"自贡市"},{"code":"510400","name":"攀枝花市"},{"code":"510500","name":"泸州市"},{"code":"510600","name":"德阳市"},{"code":"510700","name":"绵阳市"},{"code":"510800","name":"广元市"},{"code":"510900","name":"遂宁市"},{"code":"511000","name":"内江市"},{"code":"511100","name":"乐山市"},{"code":"511300","name":"南充市"},{"code":"511400","name":"眉山市"},{"code":"511500","name":"宜宾市"},{"code":"511600","name":"广安市"},{"code":"511700","name":"达州市"},{"code":"511800","name":"雅安市"},{"code":"511900","name":"巴中市"},{"code":"512000","name":"资阳市"},{"code":"513200","name":"阿坝藏族羌族自治州"},{"code":"513300","name":"甘孜藏族自治州"},{"code":"513400","name":"凉山彝族自治州"}],[{"code":"520100","name":"贵阳市"},{"code":"520200","name":"六盘水市"},{"code":"520300","name":"遵义市"},{"code":"520400","name":"安顺市"},{"code":"520500","name":"毕节市"},{"code":"520600","name":"铜仁市"},{"code":"522300","name":"黔西南布依族苗族自治州"},{"code":"522600","name":"黔东南苗族侗族自治州"},{"code":"522700","name":"黔南布依族苗族自治州"}],[{"code":"530100","name":"昆明市"},{"code":"530300","name":"曲靖市"},{"code":"530400","name":"玉溪市"},{"code":"530500","name":"保山市"},{"code":"530600","name":"昭通市"},{"code":"530700","name":"丽江市"},{"code":"530800","name":"普洱市"},{"code":"530900","name":"临沧市"},{"code":"532300","name":"楚雄彝族自治州"},{"code":"532500","name":"红河哈尼族彝族自治州"},{"code":"532600","name":"文山壮族苗族自治州"},{"code":"532800","name":"西双版纳傣族自治州"},{"code":"532900","name":"大理白族自治州"},{"code":"533100","name":"德宏傣族景颇族自治州"},{"code":"533300","name":"怒江傈僳族自治州"},{"code":"533400","name":"迪庆藏族自治州"}],[{"code":"540100","name":"拉萨市"},{"code":"540200","name":"日喀则市"},{"code":"540300","name":"昌都市"},{"code":"540400","name":"林芝市"},{"code":"540500","name":"山南市"},{"code":"542400","name":"那曲地区"},{"code":"542500","name":"阿里地区"}],[{"code":"610100","name":"西安市"},{"code":"610200","name":"铜川市"},{"code":"610300","name":"宝鸡市"},{"code":"610400","name":"咸阳市"},{"code":"610500","name":"渭南市"},{"code":"610600","name":"延安市"},{"code":"610700","name":"汉中市"},{"code":"610800","name":"榆林市"},{"code":"610900","name":"安康市"},{"code":"611000","name":"商洛市"}],[{"code":"620100","name":"兰州市"},{"code":"620200","name":"嘉峪关市"},{"code":"620300","name":"金昌市"},{"code":"620400","name":"白银市"},{"code":"620500","name":"天水市"},{"code":"620600","name":"武威市"},{"code":"620700","name":"张掖市"},{"code":"620800","name":"平凉市"},{"code":"620900","name":"酒泉市"},{"code":"621000","name":"庆阳市"},{"code":"621100","name":"定西市"},{"code":"621200","name":"陇南市"},{"code":"622900","name":"临夏回族自治州"},{"code":"623000","name":"甘南藏族自治州"}],[{"code":"630100","name":"西宁市"},{"code":"630200","name":"海东市"},{"code":"632200","name":"海北藏族自治州"},{"code":"632300","name":"黄南藏族自治州"},{"code":"632500","name":"海南藏族自治州"},{"code":"632600","name":"果洛藏族自治州"},{"code":"632700","name":"玉树藏族自治州"},{"code":"632800","name":"海西蒙古族藏族自治州"}],[{"code":"640100","name":"银川市"},{"code":"640200","name":"石嘴山市"},{"code":"640300","name":"吴忠市"},{"code":"640400","name":"固原市"},{"code":"640500","name":"中卫市"}],[{"code":"650100","name":"乌鲁木齐市"},{"code":"650200","name":"克拉玛依市"},{"code":"650400","name":"吐鲁番市"},{"code":"650500","name":"哈密市"},{"code":"652300","name":"昌吉回族自治州"},{"code":"652700","name":"博尔塔拉蒙古自治州"},{"code":"652800","name":"巴音郭楞蒙古自治州"},{"code":"652900","name":"阿克苏地区"},{"code":"653000","name":"克孜勒苏柯尔克孜自治州"},{"code":"653100","name":"喀什地区"},{"code":"653200","name":"和田地区"},{"code":"654000","name":"伊犁哈萨克自治州"},{"code":"654200","name":"塔城地区"},{"code":"654300","name":"阿勒泰地区"},{"code":"659000","name":"自治区直辖县级行政区划"}],[{"code":"710100","name":"台北市"},{"code":"710200","name":"高雄市"},{"code":"710300","name":"台南市"},{"code":"710400","name":"台中市"},{"code":"710600","name":"南投县"},{"code":"710700","name":"基隆市"},{"code":"710800","name":"新竹市"},{"code":"710900","name":"嘉义市"},{"code":"711100","name":"新北市"},{"code":"711200","name":"宜兰县"},{"code":"711300","name":"新竹县"},{"code":"711400","name":"桃园市"},{"code":"711500","name":"苗栗县"},{"code":"711700","name":"彰化县"},{"code":"711900","name":"嘉义县"},{"code":"712100","name":"云林县"},{"code":"712400","name":"屏东县"},{"code":"712500","name":"台东县"},{"code":"712600","name":"花莲县"},{"code":"712700","name":"澎湖县"}],[{"code":"810100","name":"香港特别行政区"}],[{"code":"820100","name":"澳门特别行政区"}]]
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/address/provinces.json b/uni_modules/vk-uview-ui/libs/address/provinces.json
new file mode 100644
index 0000000..1c9db43
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/address/provinces.json
@@ -0,0 +1 @@
+[{"code":"110000","name":"北京市"},{"code":"120000","name":"天津市"},{"code":"130000","name":"河北省"},{"code":"140000","name":"山西省"},{"code":"150000","name":"内蒙古自治区"},{"code":"210000","name":"辽宁省"},{"code":"220000","name":"吉林省"},{"code":"230000","name":"黑龙江省"},{"code":"310000","name":"上海市"},{"code":"320000","name":"江苏省"},{"code":"330000","name":"浙江省"},{"code":"340000","name":"安徽省"},{"code":"350000","name":"福建省"},{"code":"360000","name":"江西省"},{"code":"370000","name":"山东省"},{"code":"410000","name":"河南省"},{"code":"420000","name":"湖北省"},{"code":"430000","name":"湖南省"},{"code":"440000","name":"广东省"},{"code":"450000","name":"广西壮族自治区"},{"code":"460000","name":"海南省"},{"code":"500000","name":"重庆市"},{"code":"510000","name":"四川省"},{"code":"520000","name":"贵州省"},{"code":"530000","name":"云南省"},{"code":"540000","name":"西藏自治区"},{"code":"610000","name":"陕西省"},{"code":"620000","name":"甘肃省"},{"code":"630000","name":"青海省"},{"code":"640000","name":"宁夏回族自治区"},{"code":"650000","name":"新疆维吾尔自治区"},{"code":"710000","name":"台湾省"},{"code":"810000","name":"香港特别行政区"},{"code":"820000","name":"澳门特别行政区"}]
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/config/config.js b/uni_modules/vk-uview-ui/libs/config/config.js
new file mode 100644
index 0000000..2241530
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/config/config.js
@@ -0,0 +1,15 @@
+// 第一版 1.10.1 版本发布于2021-11-18
+let version = '1.10.1';
+
+export default {
+	v: version,
+	version: version,
+	// 主题名称
+	type: [
+		'primary',
+		'success',
+		'info',
+		'error',
+		'warning'
+	]
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/config/zIndex.js b/uni_modules/vk-uview-ui/libs/config/zIndex.js
new file mode 100644
index 0000000..d60e5bd
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/config/zIndex.js
@@ -0,0 +1,20 @@
+// uniapp在H5中各API的z-index值如下：
+/**
+ * actionsheet: 999
+ * modal: 999
+ * navigate: 998
+ * tabbar: 998
+ * toast: 999
+ */
+
+export default {
+	toast: 10090,
+	noNetwork: 10080,
+	// popup包含popup，actionsheet，keyboard，picker的值
+	popup: 10075,
+	mask: 10070,
+	navbar: 980,
+	topTips: 975,
+	sticky: 970,
+	indexListSticky: 965,
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/css/color.scss b/uni_modules/vk-uview-ui/libs/css/color.scss
new file mode 100644
index 0000000..279bc40
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/css/color.scss
@@ -0,0 +1,155 @@
+.u-type-primary-light {
+	color: $u-type-primary-light;
+}
+
+.u-type-warning-light {
+	color: $u-type-warning-light;
+}
+
+.u-type-success-light {
+	color: $u-type-success-light;
+}
+
+.u-type-error-light {
+	color: $u-type-error-light;
+}
+
+.u-type-info-light {
+	color: $u-type-info-light;
+}
+
+.u-type-primary-light-bg {
+	background-color: $u-type-primary-light;
+}
+
+.u-type-warning-light-bg {
+	background-color: $u-type-warning-light;
+}
+
+.u-type-success-light-bg {
+	background-color: $u-type-success-light;
+}
+
+.u-type-error-light-bg {
+	background-color: $u-type-error-light;
+}
+
+.u-type-info-light-bg {
+	background-color: $u-type-info-light;
+}
+
+.u-type-primary-dark {
+	color: $u-type-primary-dark;
+}
+
+.u-type-warning-dark {
+	color: $u-type-warning-dark;
+}
+
+.u-type-success-dark {
+	color: $u-type-success-dark;
+}
+
+.u-type-error-dark {
+	color: $u-type-error-dark;
+}
+
+.u-type-info-dark {
+	color: $u-type-info-dark;
+}
+
+.u-type-primary-dark-bg {
+	background-color: $u-type-primary-dark;
+}
+
+.u-type-warning-dark-bg {
+	background-color: $u-type-warning-dark;
+}
+
+.u-type-success-dark-bg {
+	background-color: $u-type-success-dark;
+}
+
+.u-type-error-dark-bg {
+	background-color: $u-type-error-dark;
+}
+
+.u-type-info-dark-bg {
+	background-color: $u-type-info-dark;
+}
+
+.u-type-primary-disabled {
+	color: $u-type-primary-disabled;
+}
+
+.u-type-warning-disabled {
+	color: $u-type-warning-disabled;
+}
+
+.u-type-success-disabled {
+	color: $u-type-success-disabled;
+}
+
+.u-type-error-disabled {
+	color: $u-type-error-disabled;
+}
+
+.u-type-info-disabled {
+	color: $u-type-info-disabled;
+}
+
+.u-type-primary {
+	color: $u-type-primary;
+}
+
+.u-type-warning {
+	color: $u-type-warning;
+}
+
+.u-type-success {
+	color: $u-type-success;
+}
+
+.u-type-error {
+	color: $u-type-error;
+}
+
+.u-type-info {
+	color: $u-type-info;
+}
+
+.u-type-primary-bg {
+	background-color: $u-type-primary;
+}
+
+.u-type-warning-bg {
+	background-color: $u-type-warning;
+}
+
+.u-type-success-bg {
+	background-color: $u-type-success;
+}
+
+.u-type-error-bg {
+	background-color: $u-type-error;
+}
+
+.u-type-info-bg {
+	background-color: $u-type-info;
+}
+
+.u-main-color {
+	color: $u-main-color;
+}
+
+.u-content-color {
+	color: $u-content-color;
+}
+
+.u-tips-color {
+	color: $u-tips-color;
+}
+
+.u-light-color {
+	color: $u-light-color;
+}
diff --git a/uni_modules/vk-uview-ui/libs/css/common.scss b/uni_modules/vk-uview-ui/libs/css/common.scss
new file mode 100644
index 0000000..29eb7f4
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/css/common.scss
@@ -0,0 +1,176 @@
+.u-relative,
+.u-rela {
+	position: relative;
+}
+
+.u-absolute,
+.u-abso {
+	position: absolute;
+}
+
+// nvue不能用标签命名样式，不能放在微信组件中，否则微信开发工具会报警告，无法使用标签名当做选择器
+/* #ifndef APP-NVUE */
+image {
+	display: inline-block;
+}
+
+// 在weex，也即nvue中，所有元素默认为border-box
+view,
+text {
+	box-sizing: border-box;
+}
+/* #endif */
+
+.u-font-xs {
+	font-size: 22rpx;
+}
+
+.u-font-sm {
+	font-size: 26rpx;
+}
+
+.u-font-md {
+	font-size: 28rpx;
+}
+
+.u-font-lg {
+	font-size: 30rpx;
+}
+
+.u-font-xl {
+	font-size: 34rpx;
+}
+
+.u-flex {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	align-items: center;
+}
+
+.u-flex-wrap {
+	flex-wrap: wrap;
+}
+
+.u-flex-nowrap {
+	flex-wrap: nowrap;
+}
+
+.u-col-center {
+	align-items: center;
+}
+
+.u-col-top {
+	align-items: flex-start;
+}
+
+.u-col-bottom {
+	align-items: flex-end;
+}
+
+.u-row-center {
+	justify-content: center;
+}
+
+.u-row-left {
+	justify-content: flex-start;
+}
+
+.u-row-right {
+	justify-content: flex-end;
+}
+
+.u-row-between {
+	justify-content: space-between;
+}
+
+.u-row-around {
+	justify-content: space-around;
+}
+
+.u-text-left {
+	text-align: left;
+}
+
+.u-text-center {
+	text-align: center;
+}
+
+.u-text-right {
+	text-align: right;
+}
+
+.u-flex-col {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+}
+
+// 定义flex等分
+@for $i from 0 through 12 {
+	.u-flex-#{$i} {
+		flex: $i;
+	}
+}
+
+// 定义字体(px)单位，小于20都为px单位字体
+@for $i from 9 to 20 {
+	.u-font-#{$i} {
+		font-size: $i + px;
+	}
+}
+
+// 定义字体(rpx)单位，大于或等于20的都为rpx单位字体
+@for $i from 20 through 40 {
+	.u-font-#{$i} {
+		font-size: $i + rpx;
+	}
+}
+
+// 定义内外边距，历遍1-80
+@for $i from 0 through 80 {
+	// 只要双数和能被5除尽的数
+	@if $i % 2 == 0 or $i % 5 == 0 {
+		// 得出：u-margin-30或者u-m-30
+		.u-margin-#{$i}, .u-m-#{$i} {
+			margin: $i + rpx!important;
+		}
+		
+		// 得出：u-padding-30或者u-p-30
+		.u-padding-#{$i}, .u-p-#{$i} {
+			padding: $i + rpx!important;
+		}
+		
+		@each $short, $long in l left, t top, r right, b bottom {
+			// 缩写版，结果如： u-m-l-30
+			// 定义外边距
+			.u-m-#{$short}-#{$i} {
+				margin-#{$long}: $i + rpx!important;
+			}
+			
+			// 定义内边距
+			.u-p-#{$short}-#{$i} {
+				padding-#{$long}: $i + rpx!important;
+			}
+			
+			// 完整版，结果如：u-margin-left-30
+			// 定义外边距
+			.u-margin-#{$long}-#{$i} {
+				margin-#{$long}: $i + rpx!important;
+			}
+			
+			// 定义内边距
+			.u-padding-#{$long}-#{$i} {
+				padding-#{$long}: $i + rpx!important;
+			}
+		}
+	}
+}
+
+// 重置nvue的默认关于flex的样式
+.u-reset-nvue {
+	flex-direction: row;
+	align-items: center;
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/css/style.components.scss b/uni_modules/vk-uview-ui/libs/css/style.components.scss
new file mode 100644
index 0000000..6835876
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/css/style.components.scss
@@ -0,0 +1,7 @@
+// 定义混入指令，用于在非nvue环境下的flex定义，因为nvue没有display属性，会报错
+@mixin vue-flex($direction: row) {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	flex-direction: $direction;
+	/* #endif */
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/css/style.h5.scss b/uni_modules/vk-uview-ui/libs/css/style.h5.scss
new file mode 100644
index 0000000..62839eb
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/css/style.h5.scss
@@ -0,0 +1,8 @@
+/* H5的时候，隐藏滚动条 */
+::-webkit-scrollbar {
+	display: none;  
+	width: 0 !important;  
+	height: 0 !important;  
+	-webkit-appearance: none;  
+	background: transparent;  
+}
diff --git a/uni_modules/vk-uview-ui/libs/css/style.mp.scss b/uni_modules/vk-uview-ui/libs/css/style.mp.scss
new file mode 100644
index 0000000..ca1d3e0
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/css/style.mp.scss
@@ -0,0 +1,72 @@
+/* start--微信小程序编译后页面有组件名的元素，特别处理--start */
+/* #ifdef MP-WEIXIN || MP-QQ */
+u-td, u-th {
+	flex: 1;
+	align-self: stretch;
+}
+
+.u-td {
+	height: 100%;
+}
+
+u-icon {
+	display: inline-flex;
+	align-items: center;
+}
+
+// 各家小程序宫格组件外层设置为100%，避免受到父元素display: flex;的影响
+u-grid {
+	width: 100%;
+	flex: 0 0 100%;
+}
+
+// 避免小程序线条组件因为父组件display: flex;而失效
+u-line {
+	flex: 1;
+}
+
+u-switch {
+	display: inline-flex;
+	align-items: center;
+}
+
+u-dropdown {
+	flex: 1;
+}
+/* #endif */
+/* end-微信小程序编译后页面有组件名的元素，特别处理--end */
+
+
+/* #ifdef MP-QQ || MP-TOUTIAO */
+// 需要做这一切额外的兼容，都是因为TX的无能
+u-icon {
+	line-height: 0;
+}
+/* #endif */
+
+/* start--头条小程序编译后页面有组件名的元素，特别处理--start */
+// 由于头条小程序不支持直接组件名形式写样式，目前只能在写组件的时候给组件加上对应的类名
+/* #ifdef MP-TOUTIAO */
+.u-td, .u-th, .u-tr {
+	flex: 1;
+	align-self: stretch;
+}
+
+.u-row, .u-col {
+	flex: 1;
+	align-self: stretch;
+}
+
+// 避免小程序线条组件因为父组件display: flex;而失效
+.u-line {
+	flex: 1;
+}
+
+.u-dropdown {
+	flex: 1;
+}
+/* #endif */
+/* end-头条小程序编译后页面有组件名的元素，特别处理--end */
+
+
+
diff --git a/uni_modules/vk-uview-ui/libs/css/style.nvue.scss b/uni_modules/vk-uview-ui/libs/css/style.nvue.scss
new file mode 100644
index 0000000..4a6192a
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/css/style.nvue.scss
@@ -0,0 +1,3 @@
+.nvue {
+	font-size: 24rpx;
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/css/style.vue.scss b/uni_modules/vk-uview-ui/libs/css/style.vue.scss
new file mode 100644
index 0000000..1ab3707
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/css/style.vue.scss
@@ -0,0 +1,175 @@
+page {
+	color: $u-main-color;
+	font-size: 28rpx;
+}
+
+/* start--去除webkit的默认样式--start */
+.u-fix-ios-appearance {
+	-webkit-appearance:none;
+}
+/* end--去除webkit的默认样式--end */
+
+/* start--icon图标外层套一个view，让其达到更好的垂直居中的效果--start */
+.u-icon-wrap {
+	display: flex;
+	align-items: center;
+}
+/* end-icon图标外层套一个view，让其达到更好的垂直居中的效果--end */
+
+/* start--iPhoneX底部安全区定义--start */
+.safe-area-inset-bottom {
+  padding-bottom: 0;  
+  padding-bottom: constant(safe-area-inset-bottom);  
+  padding-bottom: env(safe-area-inset-bottom);  
+} 
+/* end-iPhoneX底部安全区定义--end */
+
+/* start--各种hover点击反馈相关的类名-start */
+.u-hover-class {
+	// background-color: #f7f8f9!important;
+	opacity: 0.6;
+}
+
+.u-cell-hover {
+	background-color: #f7f8f9!important;
+}
+/* end--各种hover点击反馈相关的类名--end */
+
+/* start--文本行数限制--start */
+.u-line-1 {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+.u-line-2 {
+    -webkit-line-clamp: 2;
+}
+
+.u-line-3 {
+    -webkit-line-clamp: 3;
+}
+
+.u-line-4 {
+    -webkit-line-clamp: 4;
+}
+
+.u-line-5 {
+    -webkit-line-clamp: 5;
+}
+
+.u-line-2, .u-line-3, .u-line-4, .u-line-5 {
+    overflow: hidden;
+	word-break: break-all;
+    text-overflow: ellipsis; 
+    display: -webkit-box; // 弹性伸缩盒
+    -webkit-box-orient: vertical; // 设置伸缩盒子元素排列方式
+}
+
+/* end--文本行数限制--end */
+
+
+/* start--Retina 屏幕下的 1px 边框--start */
+.u-border,
+.u-border-bottom,
+.u-border-left,
+.u-border-right,
+.u-border-top,
+.u-border-top-bottom {
+	position: relative
+}
+
+.u-border-bottom:after,
+.u-border-left:after,
+.u-border-right:after,
+.u-border-top-bottom:after,
+.u-border-top:after,
+.u-border:after {
+	/* #ifndef APP-NVUE */
+	content: ' ';
+	/* #endif */
+	position: absolute;
+	left: 0;
+	top: 0;
+	pointer-events: none;
+	box-sizing: border-box;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	// 多加0.1%，能解决有时候边框缺失的问题
+	width: 199.8%;
+	height: 199.7%;
+	transform: scale(0.5, 0.5);
+	border: 0 solid $u-border-color;
+	z-index: 2;
+}
+
+.u-border-top:after {
+	border-top-width: 1px
+}
+
+.u-border-left:after {
+	border-left-width: 1px
+}
+
+.u-border-right:after {
+	border-right-width: 1px
+}
+
+.u-border-bottom:after {
+	border-bottom-width: 1px
+}
+
+.u-border-top-bottom:after {
+	border-width: 1px 0
+}
+
+.u-border:after {
+	border-width: 1px
+}
+/* end--Retina 屏幕下的 1px 边框--end */
+
+
+/* start--clearfix--start */
+.u-clearfix:after,
+.clearfix:after {
+	/* #ifndef APP-NVUE */
+	content: '';
+	/* #endif */
+	display: table;
+	clear: both
+}
+/* end--clearfix--end */
+
+/* start--高斯模糊tabbar底部处理--start */
+.u-blur-effect-inset {
+	width: 750rpx;  
+	height: var(--window-bottom);   
+	background-color: #FFFFFF;  
+}
+/* end--高斯模糊tabbar底部处理--end */
+
+/* start--提升H5端uni.toast()的层级，避免被uView的modal等遮盖--start */
+/* #ifdef H5 */
+uni-toast {
+    z-index: 10090;
+}
+uni-toast .uni-toast {
+   z-index: 10090;
+}
+/* #endif */
+/* end--提升H5端uni.toast()的层级，避免被uView的modal等遮盖--end */
+
+/* start--去除button的所有默认样式--start */
+.u-reset-button {
+	padding: 0;
+	font-size: inherit;
+	line-height: inherit;
+	background-color: transparent;
+	color: inherit;
+}
+
+.u-reset-button::after {
+   border: none;
+}
+/* end--去除button的所有默认样式--end */
+
diff --git a/uni_modules/vk-uview-ui/libs/function/$parent.js b/uni_modules/vk-uview-ui/libs/function/$parent.js
new file mode 100644
index 0000000..80515c4
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/$parent.js
@@ -0,0 +1,18 @@
+// 获取父组件的参数，因为支付宝小程序不支持provide/inject的写法
+// this.$parent在非H5中，可以准确获取到父组件，但是在H5中，需要多次this.$parent.$parent.xxx
+// 这里默认值等于undefined有它的含义，因为最顶层元素(组件)的$parent就是undefined，意味着不传name
+// 值(默认为undefined)，就是查找最顶层的$parent
+export default function $parent(name = undefined) {
+	let parent = this.$parent;
+	// 通过while历遍，这里主要是为了H5需要多层解析的问题
+	while (parent) {
+		// 父组件
+		if (parent.$options && parent.$options.name !== name) {
+			// 如果组件的name不相等，继续上一级寻找
+			parent = parent.$parent;
+		} else {
+			return parent;
+		}
+	}
+	return false;
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/addUnit.js b/uni_modules/vk-uview-ui/libs/function/addUnit.js
new file mode 100644
index 0000000..247fae2
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/addUnit.js
@@ -0,0 +1,8 @@
+import validation from './test.js';
+
+// 添加单位，如果有rpx，%，px等单位结尾或者值为auto，直接返回，否则加上rpx单位结尾
+export default function addUnit(value = 'auto', unit = 'rpx') {
+    value = String(value);
+	// 用uView内置验证规则中的number判断是否为数值
+    return validation.number(value) ? `${value}${unit}` : value;
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/bem.js b/uni_modules/vk-uview-ui/libs/function/bem.js
new file mode 100644
index 0000000..f3149d7
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/bem.js
@@ -0,0 +1,4 @@
+function bem(name, conf) {
+  
+}
+export default { bem }
diff --git a/uni_modules/vk-uview-ui/libs/function/color.js b/uni_modules/vk-uview-ui/libs/function/color.js
new file mode 100644
index 0000000..dafb8c1
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/color.js
@@ -0,0 +1,37 @@
+// 为了让用户能够自定义主题，会逐步弃用此文件，各颜色通过css提供
+// 为了给某些特殊场景使用和向后兼容，无需删除此文件(2020-06-20)
+let color = {
+	primary: "#2979ff",
+	primaryDark: "#2b85e4",
+	primaryDisabled: "#a0cfff",
+	primaryLight: "#ecf5ff",
+	bgColor: "#f3f4f6",
+	
+	info: "#909399",
+	infoDark: "#82848a",
+	infoDisabled: "#c8c9cc",
+	infoLight: "#f4f4f5",
+	
+	warning: "#ff9900",
+	warningDark: "#f29100",
+	warningDisabled: "#fcbd71",
+	warningLight: "#fdf6ec",
+	
+	error: "#fa3534",
+	errorDark: "#dd6161",
+	errorDisabled: "#fab6b6",
+	errorLight: "#fef0f0",
+	
+	success: "#19be6b",
+	successDark: "#18b566",
+	successDisabled: "#71d5a1",
+	successLight: "#dbf1e1",
+	
+	mainColor: "#303133",
+	contentColor: "#606266",
+	tipsColor: "#909399",
+	lightColor: "#c0c4cc",
+	borderColor: "#e4e7ed"
+}
+
+export default color;
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/colorGradient.js b/uni_modules/vk-uview-ui/libs/function/colorGradient.js
new file mode 100644
index 0000000..eca30a2
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/colorGradient.js
@@ -0,0 +1,134 @@
+/**
+ * 求两个颜色之间的渐变值
+ * @param {string} startColor 开始的颜色
+ * @param {string} endColor 结束的颜色
+ * @param {number} step 颜色等分的份额
+ * */
+function colorGradient(startColor = 'rgb(0, 0, 0)', endColor = 'rgb(255, 255, 255)', step = 10) {
+	let startRGB = hexToRgb(startColor, false); //转换为rgb数组模式
+	let startR = startRGB[0];
+	let startG = startRGB[1];
+	let startB = startRGB[2];
+
+	let endRGB = hexToRgb(endColor, false);
+	let endR = endRGB[0];
+	let endG = endRGB[1];
+	let endB = endRGB[2];
+
+	let sR = (endR - startR) / step; //总差值
+	let sG = (endG - startG) / step;
+	let sB = (endB - startB) / step;
+	let colorArr = [];
+	for (let i = 0; i < step; i++) {
+		//计算每一步的hex值 
+		let hex = rgbToHex('rgb(' + Math.round((sR * i + startR)) + ',' + Math.round((sG * i + startG)) + ',' + Math.round((sB *
+			i + startB)) + ')');
+		colorArr.push(hex);
+	}
+	return colorArr;
+}
+
+// 将hex表示方式转换为rgb表示方式(这里返回rgb数组模式)
+function hexToRgb(sColor, str = true) {
+	let reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
+	sColor = sColor.toLowerCase();
+	if (sColor && reg.test(sColor)) {
+		if (sColor.length === 4) {
+			let sColorNew = "#";
+			for (let i = 1; i < 4; i += 1) {
+				sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1));
+			}
+			sColor = sColorNew;
+		}
+		//处理六位的颜色值
+		let sColorChange = [];
+		for (let i = 1; i < 7; i += 2) {
+			sColorChange.push(parseInt("0x" + sColor.slice(i, i + 2)));
+		}
+		if(!str) {
+			return sColorChange;
+		} else {
+			return `rgb(${sColorChange[0]},${sColorChange[1]},${sColorChange[2]})`;
+		}
+	} else if (/^(rgb|RGB)/.test(sColor)) {
+		let arr = sColor.replace(/(?:\(|\)|rgb|RGB)*/g, "").split(",")
+		return arr.map(val => Number(val));
+	} else {
+		return sColor;
+	}
+};
+
+// 将rgb表示方式转换为hex表示方式
+function rgbToHex(rgb) {
+	let _this = rgb;
+	let reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
+	if (/^(rgb|RGB)/.test(_this)) {
+		let aColor = _this.replace(/(?:\(|\)|rgb|RGB)*/g, "").split(",");
+		let strHex = "#";
+		for (let i = 0; i < aColor.length; i++) {
+			let hex = Number(aColor[i]).toString(16);
+			hex = String(hex).length == 1 ? 0 + '' + hex : hex; // 保证每个rgb的值为2位
+			if (hex === "0") {
+				hex += hex;
+			}
+			strHex += hex;
+		}
+		if (strHex.length !== 7) {
+			strHex = _this;
+		}
+		return strHex;
+	} else if (reg.test(_this)) {
+		let aNum = _this.replace(/#/, "").split("");
+		if (aNum.length === 6) {
+			return _this;
+		} else if (aNum.length === 3) {
+			let numHex = "#";
+			for (let i = 0; i < aNum.length; i += 1) {
+				numHex += (aNum[i] + aNum[i]);
+			}
+			return numHex;
+		}
+	} else {
+		return _this;
+	}
+}
+
+
+/**
+* JS颜色十六进制转换为rgb或rgba,返回的格式为 rgba（255，255，255，0.5）字符串
+* sHex为传入的十六进制的色值
+* alpha为rgba的透明度
+*/
+function colorToRgba(color, alpha = 0.3) {
+	color = rgbToHex(color)
+	// 十六进制颜色值的正则表达式
+	var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
+	/* 16进制颜色转为RGB格式 */
+	let sColor = color.toLowerCase()
+	if (sColor && reg.test(sColor)) {
+		if (sColor.length === 4) {
+			var sColorNew = '#'
+			for (let i = 1; i < 4; i += 1) {
+				sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1))
+			}
+			sColor = sColorNew
+		}
+		// 处理六位的颜色值
+		var sColorChange = []
+		for (let i = 1; i < 7; i += 2) {
+			sColorChange.push(parseInt('0x' + sColor.slice(i, i + 2)))
+		}
+		// return sColorChange.join(',')
+		return 'rgba(' + sColorChange.join(',') + ',' + alpha + ')'
+	} 
+	else {
+		return sColor
+	}
+}
+
+export default {
+	colorGradient,
+	hexToRgb,
+	rgbToHex,
+	colorToRgba
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/debounce.js b/uni_modules/vk-uview-ui/libs/function/debounce.js
new file mode 100644
index 0000000..4f1027b
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/debounce.js
@@ -0,0 +1,29 @@
+let timeout = null;
+
+/**
+ * 防抖原理：一定时间内，只有最后一次操作，再过wait毫秒后才执行函数
+ * 
+ * @param {Function} func 要执行的回调函数 
+ * @param {Number} wait 延时的时间
+ * @param {Boolean} immediate 是否立即执行 
+ * @return null
+ */
+function debounce(func, wait = 500, immediate = false) {
+	// 清除定时器
+	if (timeout !== null) clearTimeout(timeout);
+	// 立即执行，此类情况一般用不到
+	if (immediate) {
+		var callNow = !timeout;
+		timeout = setTimeout(function() {
+			timeout = null;
+		}, wait);
+		if (callNow) typeof func === 'function' && func();
+	} else {
+		// 设置定时器，当最后一次操作后，timeout不会再被清除，所以在延时wait毫秒后执行func回调方法
+		timeout = setTimeout(function() {
+			typeof func === 'function' && func();
+		}, wait);
+	}
+}
+
+export default debounce
diff --git a/uni_modules/vk-uview-ui/libs/function/deepClone.js b/uni_modules/vk-uview-ui/libs/function/deepClone.js
new file mode 100644
index 0000000..3db999a
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/deepClone.js
@@ -0,0 +1,23 @@
+// 判断arr是否为一个数组，返回一个bool值
+function isArray (arr) {
+    return Object.prototype.toString.call(arr) === '[object Array]';
+}
+
+// 深度克隆
+function deepClone (obj) {
+	// 对常见的“非”值，直接返回原来值
+	if([null, undefined, NaN, false].includes(obj)) return obj;
+    if(typeof obj !== "object" && typeof obj !== 'function') {
+		//原始类型直接返回
+        return obj;
+    }
+    var o = isArray(obj) ? [] : {};
+    for(let i in obj) {
+        if(obj.hasOwnProperty(i)){
+            o[i] = typeof obj[i] === "object" ? deepClone(obj[i]) : obj[i];
+        }
+    }
+    return o;
+}
+
+export default deepClone;
diff --git a/uni_modules/vk-uview-ui/libs/function/deepMerge.js b/uni_modules/vk-uview-ui/libs/function/deepMerge.js
new file mode 100644
index 0000000..81d2d18
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/deepMerge.js
@@ -0,0 +1,30 @@
+import deepClone from "./deepClone";
+
+// JS对象深度合并
+function deepMerge(target = {}, source = {}) {
+	target = deepClone(target);
+	if (typeof target !== 'object' || typeof source !== 'object') return false;
+	for (var prop in source) {
+		if (!source.hasOwnProperty(prop)) continue;
+		if (prop in target) {
+			if (typeof target[prop] !== 'object') {
+				target[prop] = source[prop];
+			} else {
+				if (typeof source[prop] !== 'object') {
+					target[prop] = source[prop];
+				} else {
+					if (target[prop].concat && source[prop].concat) {
+						target[prop] = target[prop].concat(source[prop]);
+					} else {
+						target[prop] = deepMerge(target[prop], source[prop]);
+					}
+				}
+			}
+		} else {
+			target[prop] = source[prop];
+		}
+	}
+	return target;
+}
+
+export default deepMerge;
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/getParent.js b/uni_modules/vk-uview-ui/libs/function/getParent.js
new file mode 100644
index 0000000..9cb45c4
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/getParent.js
@@ -0,0 +1,47 @@
+// 获取父组件的参数，因为支付宝小程序不支持provide/inject的写法
+// this.$parent在非H5中，可以准确获取到父组件，但是在H5中，需要多次this.$parent.$parent.xxx
+export default function getParent(name, keys) {
+	let parent = this.$parent;
+	// 通过while历遍，这里主要是为了H5需要多层解析的问题
+	while (parent) {
+		// 父组件
+		if (parent.$options.name !== name) {
+			// 如果组件的name不相等，继续上一级寻找
+			parent = parent.$parent;
+		} else {
+			let data = {};
+			// 判断keys是否数组，如果传过来的是一个数组，那么直接使用数组元素值当做键值去父组件寻找
+			if(Array.isArray(keys)) {
+				keys.map(val => {
+					data[val] = parent[val] ? parent[val] : '';
+				})
+			} else {
+				// 历遍传过来的对象参数
+				for(let i in keys) {
+					// 如果子组件有此值则用，无此值则用父组件的值
+					// 判断是否空数组，如果是，则用父组件的值，否则用子组件的值
+					if(Array.isArray(keys[i])) {
+						if(keys[i].length) {
+							data[i] = keys[i];
+						} else {
+							data[i] = parent[i];
+						}
+					} else if(keys[i].constructor === Object) {
+						// 判断是否对象，如果是对象，且有属性，那么使用子组件的值，否则使用父组件的值
+						if(Object.keys(keys[i]).length) {
+							data[i] = keys[i];
+						} else {
+							data[i] = parent[i];
+						}
+					} else {
+						// 只要子组件有传值，即使是false值，也是“传值”了，也需要覆盖父组件的同名参数
+						data[i] = (keys[i] || keys[i] === false) ? keys[i] : parent[i];
+					}
+				}
+			}
+			return data;
+		}
+	}
+
+	return {};
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/guid.js b/uni_modules/vk-uview-ui/libs/function/guid.js
new file mode 100644
index 0000000..8497664
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/guid.js
@@ -0,0 +1,41 @@
+/**
+ * 本算法来源于简书开源代码，详见：https://www.jianshu.com/p/fdbf293d0a85
+ * 全局唯一标识符（uuid，Globally Unique Identifier）,也称作 uuid(Universally Unique IDentifier) 
+ * 一般用于多个组件之间,给它一个唯一的标识符,或者v-for循环的时候,如果使用数组的index可能会导致更新列表出现问题
+ * 最可能的情况是左滑删除item或者对某条信息流"不喜欢"并去掉它的时候,会导致组件内的数据可能出现错乱
+ * v-for的时候,推荐使用后端返回的id而不是循环的index
+ * @param {Number} len uuid的长度
+ * @param {Boolean} firstU 将返回的首字母置为"u"
+ * @param {Nubmer} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制
+ */
+function guid(len = 32, firstU = true, radix = null) {
+	let chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+	let uuid = [];
+	radix = radix || chars.length;
+
+	if (len) {
+		// 如果指定uuid长度,只是取随机的字符,0|x为位运算,能去掉x的小数位,返回整数位
+		for (let i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
+	} else {
+		let r;
+		// rfc4122标准要求返回的uuid中,某些位为固定的字符
+		uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+		uuid[14] = '4';
+
+		for (let i = 0; i < 36; i++) {
+			if (!uuid[i]) {
+				r = 0 | Math.random() * 16;
+				uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
+			}
+		}
+	}
+	// 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class
+	if (firstU) {
+		uuid.shift();
+		return 'u' + uuid.join('');
+	} else {
+		return uuid.join('');
+	}
+}
+
+export default guid;
diff --git a/uni_modules/vk-uview-ui/libs/function/md5.js b/uni_modules/vk-uview-ui/libs/function/md5.js
new file mode 100644
index 0000000..386b12a
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/md5.js
@@ -0,0 +1,385 @@
+/*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for more info.
+ */
+
+/*
+ * Configurable variables. You may need to tweak these to be compatible with
+ * the server-side, but the defaults work in most cases.
+ */
+var hexcase = 0;   /* hex output format. 0 - lowercase; 1 - uppercase        */
+var b64pad  = "";  /* base-64 pad character. "=" for strict RFC compliance   */
+
+/*
+ * These are the functions you'll usually want to call
+ * They take string arguments and return either hex or base-64 encoded strings
+ */
+function hex_md5(s)    { return rstr2hex(rstr_md5(str2rstr_utf8(s))); }
+function b64_md5(s)    { return rstr2b64(rstr_md5(str2rstr_utf8(s))); }
+function any_md5(s, e) { return rstr2any(rstr_md5(str2rstr_utf8(s)), e); }
+function hex_hmac_md5(k, d)
+  { return rstr2hex(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d))); }
+function b64_hmac_md5(k, d)
+  { return rstr2b64(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d))); }
+function any_hmac_md5(k, d, e)
+  { return rstr2any(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d)), e); }
+
+/*
+ * Perform a simple self-test to see if the VM is working
+ */
+function md5_vm_test()
+{
+  return hex_md5("abc").toLowerCase() == "900150983cd24fb0d6963f7d28e17f72";
+}
+
+/*
+ * Calculate the MD5 of a raw string
+ */
+function rstr_md5(s)
+{
+  return binl2rstr(binl_md5(rstr2binl(s), s.length * 8));
+}
+
+/*
+ * Calculate the HMAC-MD5, of a key and some data (raw strings)
+ */
+function rstr_hmac_md5(key, data)
+{
+  var bkey = rstr2binl(key);
+  if(bkey.length > 16) bkey = binl_md5(bkey, key.length * 8);
+
+  var ipad = Array(16), opad = Array(16);
+  for(var i = 0; i < 16; i++)
+  {
+    ipad[i] = bkey[i] ^ 0x36363636;
+    opad[i] = bkey[i] ^ 0x5C5C5C5C;
+  }
+
+  var hash = binl_md5(ipad.concat(rstr2binl(data)), 512 + data.length * 8);
+  return binl2rstr(binl_md5(opad.concat(hash), 512 + 128));
+}
+
+/*
+ * Convert a raw string to a hex string
+ */
+function rstr2hex(input)
+{
+  try { hexcase } catch(e) { hexcase=0; }
+  var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
+  var output = "";
+  var x;
+  for(var i = 0; i < input.length; i++)
+  {
+    x = input.charCodeAt(i);
+    output += hex_tab.charAt((x >>> 4) & 0x0F)
+           +  hex_tab.charAt( x        & 0x0F);
+  }
+  return output;
+}
+
+/*
+ * Convert a raw string to a base-64 string
+ */
+function rstr2b64(input)
+{
+  try { b64pad } catch(e) { b64pad=''; }
+  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  var output = "";
+  var len = input.length;
+  for(var i = 0; i < len; i += 3)
+  {
+    var triplet = (input.charCodeAt(i) << 16)
+                | (i + 1 < len ? input.charCodeAt(i+1) << 8 : 0)
+                | (i + 2 < len ? input.charCodeAt(i+2)      : 0);
+    for(var j = 0; j < 4; j++)
+    {
+      if(i * 8 + j * 6 > input.length * 8) output += b64pad;
+      else output += tab.charAt((triplet >>> 6*(3-j)) & 0x3F);
+    }
+  }
+  return output;
+}
+
+/*
+ * Convert a raw string to an arbitrary string encoding
+ */
+function rstr2any(input, encoding)
+{
+  var divisor = encoding.length;
+  var i, j, q, x, quotient;
+
+  /* Convert to an array of 16-bit big-endian values, forming the dividend */
+  var dividend = Array(Math.ceil(input.length / 2));
+  for(i = 0; i < dividend.length; i++)
+  {
+    dividend[i] = (input.charCodeAt(i * 2) << 8) | input.charCodeAt(i * 2 + 1);
+  }
+
+  /*
+   * Repeatedly perform a long division. The binary array forms the dividend,
+   * the length of the encoding is the divisor. Once computed, the quotient
+   * forms the dividend for the next step. All remainders are stored for later
+   * use.
+   */
+  var full_length = Math.ceil(input.length * 8 /
+                                    (Math.log(encoding.length) / Math.log(2)));
+  var remainders = Array(full_length);
+  for(j = 0; j < full_length; j++)
+  {
+    quotient = Array();
+    x = 0;
+    for(i = 0; i < dividend.length; i++)
+    {
+      x = (x << 16) + dividend[i];
+      q = Math.floor(x / divisor);
+      x -= q * divisor;
+      if(quotient.length > 0 || q > 0)
+        quotient[quotient.length] = q;
+    }
+    remainders[j] = x;
+    dividend = quotient;
+  }
+
+  /* Convert the remainders to the output string */
+  var output = "";
+  for(i = remainders.length - 1; i >= 0; i--)
+    output += encoding.charAt(remainders[i]);
+
+  return output;
+}
+
+/*
+ * Encode a string as utf-8.
+ * For efficiency, this assumes the input is valid utf-16.
+ */
+function str2rstr_utf8(input)
+{
+  var output = "";
+  var i = -1;
+  var x, y;
+
+  while(++i < input.length)
+  {
+    /* Decode utf-16 surrogate pairs */
+    x = input.charCodeAt(i);
+    y = i + 1 < input.length ? input.charCodeAt(i + 1) : 0;
+    if(0xD800 <= x && x <= 0xDBFF && 0xDC00 <= y && y <= 0xDFFF)
+    {
+      x = 0x10000 + ((x & 0x03FF) << 10) + (y & 0x03FF);
+      i++;
+    }
+
+    /* Encode output as utf-8 */
+    if(x <= 0x7F)
+      output += String.fromCharCode(x);
+    else if(x <= 0x7FF)
+      output += String.fromCharCode(0xC0 | ((x >>> 6 ) & 0x1F),
+                                    0x80 | ( x         & 0x3F));
+    else if(x <= 0xFFFF)
+      output += String.fromCharCode(0xE0 | ((x >>> 12) & 0x0F),
+                                    0x80 | ((x >>> 6 ) & 0x3F),
+                                    0x80 | ( x         & 0x3F));
+    else if(x <= 0x1FFFFF)
+      output += String.fromCharCode(0xF0 | ((x >>> 18) & 0x07),
+                                    0x80 | ((x >>> 12) & 0x3F),
+                                    0x80 | ((x >>> 6 ) & 0x3F),
+                                    0x80 | ( x         & 0x3F));
+  }
+  return output;
+}
+
+/*
+ * Encode a string as utf-16
+ */
+function str2rstr_utf16le(input)
+{
+  var output = "";
+  for(var i = 0; i < input.length; i++)
+    output += String.fromCharCode( input.charCodeAt(i)        & 0xFF,
+                                  (input.charCodeAt(i) >>> 8) & 0xFF);
+  return output;
+}
+
+function str2rstr_utf16be(input)
+{
+  var output = "";
+  for(var i = 0; i < input.length; i++)
+    output += String.fromCharCode((input.charCodeAt(i) >>> 8) & 0xFF,
+                                   input.charCodeAt(i)        & 0xFF);
+  return output;
+}
+
+/*
+ * Convert a raw string to an array of little-endian words
+ * Characters >255 have their high-byte silently ignored.
+ */
+function rstr2binl(input)
+{
+  var output = Array(input.length >> 2);
+  for(var i = 0; i < output.length; i++)
+    output[i] = 0;
+  for(var i = 0; i < input.length * 8; i += 8)
+    output[i>>5] |= (input.charCodeAt(i / 8) & 0xFF) << (i%32);
+  return output;
+}
+
+/*
+ * Convert an array of little-endian words to a string
+ */
+function binl2rstr(input)
+{
+  var output = "";
+  for(var i = 0; i < input.length * 32; i += 8)
+    output += String.fromCharCode((input[i>>5] >>> (i % 32)) & 0xFF);
+  return output;
+}
+
+/*
+ * Calculate the MD5 of an array of little-endian words, and a bit length.
+ */
+function binl_md5(x, len)
+{
+  /* append padding */
+  x[len >> 5] |= 0x80 << ((len) % 32);
+  x[(((len + 64) >>> 9) << 4) + 14] = len;
+
+  var a =  1732584193;
+  var b = -271733879;
+  var c = -1732584194;
+  var d =  271733878;
+
+  for(var i = 0; i < x.length; i += 16)
+  {
+    var olda = a;
+    var oldb = b;
+    var oldc = c;
+    var oldd = d;
+
+    a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936);
+    d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586);
+    c = md5_ff(c, d, a, b, x[i+ 2], 17,  606105819);
+    b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330);
+    a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897);
+    d = md5_ff(d, a, b, c, x[i+ 5], 12,  1200080426);
+    c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341);
+    b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983);
+    a = md5_ff(a, b, c, d, x[i+ 8], 7 ,  1770035416);
+    d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417);
+    c = md5_ff(c, d, a, b, x[i+10], 17, -42063);
+    b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162);
+    a = md5_ff(a, b, c, d, x[i+12], 7 ,  1804603682);
+    d = md5_ff(d, a, b, c, x[i+13], 12, -40341101);
+    c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290);
+    b = md5_ff(b, c, d, a, x[i+15], 22,  1236535329);
+
+    a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510);
+    d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
+    c = md5_gg(c, d, a, b, x[i+11], 14,  643717713);
+    b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302);
+    a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691);
+    d = md5_gg(d, a, b, c, x[i+10], 9 ,  38016083);
+    c = md5_gg(c, d, a, b, x[i+15], 14, -660478335);
+    b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848);
+    a = md5_gg(a, b, c, d, x[i+ 9], 5 ,  568446438);
+    d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690);
+    c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961);
+    b = md5_gg(b, c, d, a, x[i+ 8], 20,  1163531501);
+    a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467);
+    d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784);
+    c = md5_gg(c, d, a, b, x[i+ 7], 14,  1735328473);
+    b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734);
+
+    a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558);
+    d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463);
+    c = md5_hh(c, d, a, b, x[i+11], 16,  1839030562);
+    b = md5_hh(b, c, d, a, x[i+14], 23, -35309556);
+    a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
+    d = md5_hh(d, a, b, c, x[i+ 4], 11,  1272893353);
+    c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632);
+    b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640);
+    a = md5_hh(a, b, c, d, x[i+13], 4 ,  681279174);
+    d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222);
+    c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979);
+    b = md5_hh(b, c, d, a, x[i+ 6], 23,  76029189);
+    a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487);
+    d = md5_hh(d, a, b, c, x[i+12], 11, -421815835);
+    c = md5_hh(c, d, a, b, x[i+15], 16,  530742520);
+    b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651);
+
+    a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844);
+    d = md5_ii(d, a, b, c, x[i+ 7], 10,  1126891415);
+    c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905);
+    b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055);
+    a = md5_ii(a, b, c, d, x[i+12], 6 ,  1700485571);
+    d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606);
+    c = md5_ii(c, d, a, b, x[i+10], 15, -1051523);
+    b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799);
+    a = md5_ii(a, b, c, d, x[i+ 8], 6 ,  1873313359);
+    d = md5_ii(d, a, b, c, x[i+15], 10, -30611744);
+    c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380);
+    b = md5_ii(b, c, d, a, x[i+13], 21,  1309151649);
+    a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070);
+    d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379);
+    c = md5_ii(c, d, a, b, x[i+ 2], 15,  718787259);
+    b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551);
+
+    a = safe_add(a, olda);
+    b = safe_add(b, oldb);
+    c = safe_add(c, oldc);
+    d = safe_add(d, oldd);
+  }
+  return Array(a, b, c, d);
+}
+
+/*
+ * These functions implement the four basic operations the algorithm uses.
+ */
+function md5_cmn(q, a, b, x, s, t)
+{
+  return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b);
+}
+function md5_ff(a, b, c, d, x, s, t)
+{
+  return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
+}
+function md5_gg(a, b, c, d, x, s, t)
+{
+  return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
+}
+function md5_hh(a, b, c, d, x, s, t)
+{
+  return md5_cmn(b ^ c ^ d, a, b, x, s, t);
+}
+function md5_ii(a, b, c, d, x, s, t)
+{
+  return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
+}
+
+/*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+function safe_add(x, y)
+{
+  var lsw = (x & 0xFFFF) + (y & 0xFFFF);
+  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+  return (msw << 16) | (lsw & 0xFFFF);
+}
+
+/*
+ * Bitwise rotate a 32-bit number to the left.
+ */
+function bit_rol(num, cnt)
+{
+  return (num << cnt) | (num >>> (32 - cnt));
+}
+
+export default {
+	md5 : function(str){
+		return hex_md5(str);
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/queryParams.js b/uni_modules/vk-uview-ui/libs/function/queryParams.js
new file mode 100644
index 0000000..81c7e5e
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/queryParams.js
@@ -0,0 +1,58 @@
+/**
+ * 对象转url参数
+ * @param {*} data,对象
+ * @param {*} isPrefix,是否自动加上"?"
+ */
+function queryParams(data = {}, isPrefix = true, arrayFormat = 'brackets') {
+	let prefix = isPrefix ? '?' : ''
+	let _result = []
+	if (['indices', 'brackets', 'repeat', 'comma'].indexOf(arrayFormat) == -1) arrayFormat = 'brackets';
+	for (let key in data) {
+		let value = data[key]
+		// 去掉为空的参数
+		if (['', undefined, null].indexOf(value) >= 0) {
+			continue;
+		}
+		// 如果值为数组，另行处理
+		if (value.constructor === Array) {
+			// e.g. {ids: [1, 2, 3]}
+			switch (arrayFormat) {
+				case 'indices':
+					// 结果: ids[0]=1&ids[1]=2&ids[2]=3
+					for (let i = 0; i < value.length; i++) {
+						_result.push(key + '[' + i + ']=' + value[i])
+					}
+					break;
+				case 'brackets':
+					// 结果: ids[]=1&ids[]=2&ids[]=3
+					value.forEach(_value => {
+						_result.push(key + '[]=' + _value)
+					})
+					break;
+				case 'repeat':
+					// 结果: ids=1&ids=2&ids=3
+					value.forEach(_value => {
+						_result.push(key + '=' + _value)
+					})
+					break;
+				case 'comma':
+					// 结果: ids=1,2,3
+					let commaStr = "";
+					value.forEach(_value => {
+						commaStr += (commaStr ? "," : "") + _value;
+					})
+					_result.push(key + '=' + commaStr)
+					break;
+				default:
+					value.forEach(_value => {
+						_result.push(key + '[]=' + _value)
+					})
+			}
+		} else {
+			_result.push(key + '=' + value)
+		}
+	}
+	return _result.length ? prefix + _result.join('&') : ''
+}
+
+export default queryParams;
diff --git a/uni_modules/vk-uview-ui/libs/function/random.js b/uni_modules/vk-uview-ui/libs/function/random.js
new file mode 100644
index 0000000..e155279
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/random.js
@@ -0,0 +1,10 @@
+function random(min, max) {
+	if (min >= 0 && max > 0 && max >= min) {
+		let gab = max - min + 1;
+		return Math.floor(Math.random() * gab + min);
+	} else {
+		return 0;
+	}
+}
+
+export default random;
diff --git a/uni_modules/vk-uview-ui/libs/function/randomArray.js b/uni_modules/vk-uview-ui/libs/function/randomArray.js
new file mode 100644
index 0000000..590a048
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/randomArray.js
@@ -0,0 +1,7 @@
+// 打乱数组
+function randomArray(array = []) {
+	// 原理是sort排序,Math.random()产生0<= x < 1之间的数,会导致x-0.05大于或者小于0
+	return array.sort(() => Math.random() - 0.5);
+}
+
+export default randomArray
diff --git a/uni_modules/vk-uview-ui/libs/function/route.js b/uni_modules/vk-uview-ui/libs/function/route.js
new file mode 100644
index 0000000..28a81b7
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/route.js
@@ -0,0 +1,122 @@
+/**
+ * 路由跳转方法，该方法相对于直接使用uni.xxx的好处是使用更加简单快捷
+ * 并且带有路由拦截功能
+ */
+
+class Router {
+	constructor() {
+		// 原始属性定义
+		this.config = {
+			type: 'navigateTo',
+			url: '',
+			delta: 1, // navigateBack页面后退时,回退的层数
+			params: {}, // 传递的参数
+			animationType: 'pop-in', // 窗口动画,只在APP有效
+			animationDuration: 300, // 窗口动画持续时间,单位毫秒,只在APP有效
+			intercept: false, // 是否需要拦截
+		}
+		// 因为route方法是需要对外赋值给另外的对象使用，同时route内部有使用this，会导致route失去上下文
+		// 这里在构造函数中进行this绑定
+		this.route = this.route.bind(this)
+	}
+
+	// 判断url前面是否有"/"，如果没有则加上，否则无法跳转
+	addRootPath(url) {
+		return url[0] === '/' ? url : `/${url}`
+	}
+
+	// 整合路由参数
+	mixinParam(url, params) {
+		url = url && this.addRootPath(url)
+		
+		// 使用正则匹配，主要依据是判断是否有"/","?","="等，如“/page/index/index?name=mary"
+		// 如果有url中有get参数，转换后无需带上"?"
+		let query = ''
+		if (/.*\/.*\?.*=.*/.test(url)) {
+			// object对象转为get类型的参数
+			query = uni.$u.queryParams(params, false);
+			// 因为已有get参数,所以后面拼接的参数需要带上"&"隔开
+			return url += "&" + query
+		} else {
+			// 直接拼接参数，因为此处url中没有后面的query参数，也就没有"?/&"之类的符号
+			query = uni.$u.queryParams(params);
+			return url += query
+		}
+	}
+
+	// 对外的方法名称
+	async route(options = {}, params = {}) {
+		// 合并用户的配置和内部的默认配置
+		let mergeConfig = {}
+
+		if (typeof options === 'string') {
+			// 如果options为字符串，则为route(url, params)的形式
+			mergeConfig.url = this.mixinParam(options, params)
+			mergeConfig.type = 'navigateTo'
+		} else {
+			mergeConfig = uni.$u.deepClone(options, this.config)
+			// 否则正常使用mergeConfig中的url和params进行拼接
+			mergeConfig.url = this.mixinParam(options.url, options.params)
+		}
+		
+		if(params.intercept) {
+			this.config.intercept = params.intercept
+		}
+		// params参数也带给拦截器
+		mergeConfig.params = params
+		// 合并内外部参数
+		mergeConfig = uni.$u.deepMerge(this.config, mergeConfig)
+		// 判断用户是否定义了拦截器
+		if (typeof uni.$u.routeIntercept === 'function') {
+			// 定一个promise，根据用户执行resolve(true)或者resolve(false)来决定是否进行路由跳转
+			const isNext = await new Promise((resolve, reject) => {
+				uni.$u.routeIntercept(mergeConfig, resolve)
+			})
+			// 如果isNext为true，则执行路由跳转
+			isNext && this.openPage(mergeConfig)
+		} else {
+			this.openPage(mergeConfig)
+		}
+	}
+
+	// 执行路由跳转
+	openPage(config) {
+		// 解构参数
+		const {
+			url,
+			type,
+			delta,
+			animationType,
+			animationDuration
+		} = config
+		if (config.type == 'navigateTo' || config.type == 'to') {
+			uni.navigateTo({
+				url,
+				animationType,
+				animationDuration
+			});
+		}
+		if (config.type == 'redirectTo' || config.type == 'redirect') {
+			uni.redirectTo({
+				url
+			});
+		}
+		if (config.type == 'switchTab' || config.type == 'tab') {
+			uni.switchTab({
+				url
+			});
+		}
+		if (config.type == 'reLaunch' || config.type == 'launch') {
+			uni.reLaunch({
+				url
+			});
+		}
+		if (config.type == 'navigateBack' || config.type == 'back') {
+			uni.navigateBack({
+				delta
+			});
+		}
+	}
+}
+
+export default (new Router()).route
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/sys.js b/uni_modules/vk-uview-ui/libs/function/sys.js
new file mode 100644
index 0000000..00f6a28
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/sys.js
@@ -0,0 +1,9 @@
+export function os() {
+	return uni.getSystemInfoSync().platform;
+};
+
+export function sys() {
+	return uni.getSystemInfoSync();
+}
+
+
diff --git a/uni_modules/vk-uview-ui/libs/function/test.js b/uni_modules/vk-uview-ui/libs/function/test.js
new file mode 100644
index 0000000..b8418a6
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/test.js
@@ -0,0 +1,232 @@
+/**
+ * 验证电子邮箱格式
+ */
+function email(value) {
+	return /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(value);
+}
+
+/**
+ * 验证手机格式
+ */
+function mobile(value) {
+	return /^1[23456789]\d{9}$/.test(value)
+}
+
+/**
+ * 验证URL格式
+ */
+function url(value) {
+	return /http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w-.\/?%&=]*)?/.test(value)
+}
+
+/**
+ * 验证日期格式
+ */
+function date(value) {
+	return !/Invalid|NaN/.test(new Date(value).toString())
+}
+
+/**
+ * 验证ISO类型的日期格式
+ */
+function dateISO(value) {
+	return /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(value)
+}
+
+/**
+ * 验证十进制数字
+ */
+function number(value) {
+	return /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(value)
+}
+
+/**
+ * 验证整数
+ */
+function digits(value) {
+	return /^\d+$/.test(value)
+}
+
+/**
+ * 验证身份证号码
+ */
+function idCard(value) {
+	return /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
+		value)
+}
+
+/**
+ * 是否车牌号
+ */
+function carNo(value) {
+	// 新能源车牌
+	const xreg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/;
+	// 旧车牌
+	const creg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/;
+	if (value.length === 7) {
+		return creg.test(value);
+	} else if (value.length === 8) {
+		return xreg.test(value);
+	} else {
+		return false;
+	}
+}
+
+/**
+ * 金额,只允许2位小数
+ */
+function amount(value) {
+	//金额，只允许保留两位小数
+	return /^[1-9]\d*(,\d{3})*(\.\d{1,2})?$|^0\.\d{1,2}$/.test(value);
+}
+
+/**
+ * 中文
+ */
+function chinese(value) {
+	let reg = /^[\u4e00-\u9fa5]+$/gi;
+	return reg.test(value);
+}
+
+/**
+ * 只能输入字母
+ */
+function letter(value) {
+	return /^[a-zA-Z]*$/.test(value);
+}
+
+/**
+ * 只能是字母或者数字
+ */
+function enOrNum(value) {
+	//英文或者数字
+	let reg = /^[0-9a-zA-Z]*$/g;
+	return reg.test(value);
+}
+
+/**
+ * 验证是否包含某个值
+ */
+function contains(value, param) {
+	return value.indexOf(param) >= 0
+}
+
+/**
+ * 验证一个值范围[min, max]
+ */
+function range(value, param) {
+	return value >= param[0] && value <= param[1]
+}
+
+/**
+ * 验证一个长度范围[min, max]
+ */
+function rangeLength(value, param) {
+	return value.length >= param[0] && value.length <= param[1]
+}
+
+/**
+ * 是否固定电话
+ */
+function landline(value) {
+	let reg = /^\d{3,4}-\d{7,8}(-\d{3,4})?$/;
+	return reg.test(value);
+}
+
+/**
+ * 判断是否为空
+ */
+function empty(value) {
+	switch (typeof value) {
+		case 'undefined':
+			return true;
+		case 'string':
+			if (value.replace(/(^[ \t\n\r]*)|([ \t\n\r]*$)/g, '').length == 0) return true;
+			break;
+		case 'boolean':
+			if (!value) return true;
+			break;
+		case 'number':
+			if (0 === value || isNaN(value)) return true;
+			break;
+		case 'object':
+			if (null === value || value.length === 0) return true;
+			for (var i in value) {
+				return false;
+			}
+			return true;
+	}
+	return false;
+}
+
+/**
+ * 是否json字符串
+ */
+function jsonString(value) {
+	if (typeof value == 'string') {
+		try {
+			var obj = JSON.parse(value);
+			if (typeof obj == 'object' && obj) {
+				return true;
+			} else {
+				return false;
+			}
+		} catch (e) {
+			return false;
+		}
+	}
+	return false;
+}
+
+
+/**
+ * 是否数组
+ */
+function array(value) {
+	if (typeof Array.isArray === "function") {
+		return Array.isArray(value);
+	} else {
+		return Object.prototype.toString.call(value) === "[object Array]";
+	}
+}
+
+/**
+ * 是否对象
+ */
+function object(value) {
+	return Object.prototype.toString.call(value) === '[object Object]';
+}
+
+/**
+ * 是否短信验证码
+ */
+function code(value, len = 6) {
+	return new RegExp(`^\\d{${len}}$`).test(value);
+}
+
+
+export default {
+	email,
+	mobile,
+	url,
+	date,
+	dateISO,
+	number,
+	digits,
+	idCard,
+	carNo,
+	amount,
+	chinese,
+	letter,
+	enOrNum,
+	contains,
+	range,
+	rangeLength,
+	empty,
+	isEmpty: empty,
+	jsonString,
+	landline,
+	object,
+	array,
+	code
+}
diff --git a/uni_modules/vk-uview-ui/libs/function/throttle.js b/uni_modules/vk-uview-ui/libs/function/throttle.js
new file mode 100644
index 0000000..c5d28e3
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/throttle.js
@@ -0,0 +1,34 @@
+let timeoutArr = [];
+let flagArr = [];
+/**
+ * 节流函数
+ * 节流原理：在一定时间内，只能触发一次
+ * @param {Function} fn 要执行的回调函数 
+ * @param {Number} time 延时的时间
+ * @param {Boolean} isImmediate 是否立即执行
+ * @param {String} timeoutName 定时器ID
+ * @return null
+ */
+function throttle(fn, time = 500, isImmediate = true, timeoutName = "default") {
+	if(!timeoutArr[timeoutName]) timeoutArr[timeoutName] = null;
+	if (isImmediate) {
+		if (!flagArr[timeoutName]) {
+			flagArr[timeoutName] = true;
+			// 如果是立即执行，则在time毫秒内开始时执行
+			if(typeof fn === 'function') fn();
+			timeoutArr[timeoutName] = setTimeout(() => {
+				flagArr[timeoutName] = false;
+			}, time);
+		}
+	} else {
+		if (!flagArr[timeoutName]) {
+			flagArr[timeoutName] = true;
+			// 如果是非立即执行，则在time毫秒内的结束处执行
+			timeoutArr[timeoutName] = setTimeout(() => {
+				flagArr[timeoutName] = false;
+				if(typeof fn === 'function') fn();
+			}, time);
+		}
+	}
+};
+export default throttle
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/timeFormat.js b/uni_modules/vk-uview-ui/libs/function/timeFormat.js
new file mode 100644
index 0000000..0372f2f
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/timeFormat.js
@@ -0,0 +1,51 @@
+// padStart 的 polyfill，因为某些机型或情况，还无法支持es7的padStart，比如电脑版的微信小程序
+// 所以这里做一个兼容polyfill的兼容处理
+if (!String.prototype.padStart) {
+	// 为了方便表示这里 fillString 用了ES6 的默认参数，不影响理解
+	String.prototype.padStart = function(maxLength, fillString = ' ') {
+		if (Object.prototype.toString.call(fillString) !== "[object String]") throw new TypeError(
+			'fillString must be String')
+		let str = this
+		// 返回 String(str) 这里是为了使返回的值是字符串字面量，在控制台中更符合直觉
+		if (str.length >= maxLength) return String(str)
+
+		let fillLength = maxLength - str.length,
+			times = Math.ceil(fillLength / fillString.length)
+		while (times >>= 1) {
+			fillString += fillString
+			if (times === 1) {
+				fillString += fillString
+			}
+		}
+		return fillString.slice(0, fillLength) + str;
+	}
+}
+
+// 其他更多是格式化有如下:
+// yyyy:mm:dd|yyyy:mm|yyyy年mm月dd日|yyyy年mm月dd日 hh时MM分等,可自定义组合
+function timeFormat(dateTime = null, fmt = 'yyyy-mm-dd') {
+	// 如果为null,则格式化当前时间
+	if (!dateTime) dateTime = Number(new Date());
+	// 如果dateTime长度为10或者13，则为秒和毫秒的时间戳，如果超过13位，则为其他的时间格式
+	if (dateTime.toString().length == 10) dateTime *= 1000;
+	let date = new Date(dateTime);
+	let ret;
+	let opt = {
+		"y+": date.getFullYear().toString(), // 年
+		"m+": (date.getMonth() + 1).toString(), // 月
+		"d+": date.getDate().toString(), // 日
+		"h+": date.getHours().toString(), // 时
+		"M+": date.getMinutes().toString(), // 分
+		"s+": date.getSeconds().toString() // 秒
+		// 有其他格式化字符需求可以继续添加，必须转化成字符串
+	};
+	for (let k in opt) {
+		ret = new RegExp("(" + k + ")").exec(fmt);
+		if (ret) {
+			fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+		};
+	};
+	return fmt;
+}
+
+export default timeFormat
diff --git a/uni_modules/vk-uview-ui/libs/function/timeFrom.js b/uni_modules/vk-uview-ui/libs/function/timeFrom.js
new file mode 100644
index 0000000..68cd990
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/timeFrom.js
@@ -0,0 +1,47 @@
+import timeFormat from '../../libs/function/timeFormat.js';
+
+/**
+ * 时间戳转为多久之前
+ * @param String timestamp 时间戳
+ * @param String | Boolean format 如果为时间格式字符串，超出一定时间范围，返回固定的时间格式；
+ * 如果为布尔值false，无论什么时间，都返回多久以前的格式
+ */
+function timeFrom(dateTime = null, format = 'yyyy-mm-dd') {
+	// 如果为null,则格式化当前时间
+	if (!dateTime) dateTime = Number(new Date());
+	// 如果dateTime长度为10或者13，则为秒和毫秒的时间戳，如果超过13位，则为其他的时间格式
+	if (dateTime.toString().length == 10) dateTime *= 1000;
+	let timestamp = + new Date(Number(dateTime));
+
+	let timer = (Number(new Date()) - timestamp) / 1000;
+	// 如果小于5分钟,则返回"刚刚",其他以此类推
+	let tips = '';
+	switch (true) {
+		case timer < 300:
+			tips = '刚刚';
+			break;
+		case timer >= 300 && timer < 3600:
+			tips = parseInt(timer / 60) + '分钟前';
+			break;
+		case timer >= 3600 && timer < 86400:
+			tips = parseInt(timer / 3600) + '小时前';
+			break;
+		case timer >= 86400 && timer < 2592000:
+			tips = parseInt(timer / 86400) + '天前';
+			break;
+		default:
+			// 如果format为false，则无论什么时间戳，都显示xx之前
+			if(format === false) {
+				if(timer >= 2592000 && timer < 365 * 86400) {
+					tips = parseInt(timer / (86400 * 30)) + '个月前';
+				} else {
+					tips = parseInt(timer / (86400 * 365)) + '年前';
+				}
+			} else {
+				tips = timeFormat(timestamp, format);
+			}
+	}
+	return tips;
+}
+
+export default timeFrom;
diff --git a/uni_modules/vk-uview-ui/libs/function/toast.js b/uni_modules/vk-uview-ui/libs/function/toast.js
new file mode 100644
index 0000000..91afa73
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/toast.js
@@ -0,0 +1,9 @@
+function toast(title, duration = 1500) {
+	uni.showToast({
+		title: title,
+		icon: 'none',
+		duration: duration
+	})
+}
+
+export default toast
diff --git a/uni_modules/vk-uview-ui/libs/function/trim.js b/uni_modules/vk-uview-ui/libs/function/trim.js
new file mode 100644
index 0000000..72adc37
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/trim.js
@@ -0,0 +1,15 @@
+function trim(str, pos = 'both') {
+	if (pos == 'both') {
+		return str.replace(/^\s+|\s+$/g, "");
+	} else if (pos == "left") {
+		return str.replace(/^\s*/, '');
+	} else if (pos == 'right') {
+		return str.replace(/(\s*$)/g, "");
+	} else if (pos == 'all') {
+		return str.replace(/\s+/g, "");
+	} else {
+		return str;
+	}
+}
+
+export default trim
diff --git a/uni_modules/vk-uview-ui/libs/function/type2icon.js b/uni_modules/vk-uview-ui/libs/function/type2icon.js
new file mode 100644
index 0000000..23cb40e
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/type2icon.js
@@ -0,0 +1,35 @@
+/**
+ * 根据主题type值,获取对应的图标
+ * @param String type 主题名称,primary|info|error|warning|success
+ * @param String fill 是否使用fill填充实体的图标  
+ */
+function type2icon(type = 'success', fill = false) {
+	// 如果非预置值,默认为success
+	if (['primary', 'info', 'error', 'warning', 'success'].indexOf(type) == -1) type = 'success';
+	let iconName = '';
+	// 目前(2019-12-12),info和primary使用同一个图标
+	switch (type) {
+		case 'primary':
+			iconName = 'info-circle';
+			break;
+		case 'info':
+			iconName = 'info-circle';
+			break;
+		case 'error':
+			iconName = 'close-circle';
+			break;
+		case 'warning':
+			iconName = 'error-circle';
+			break;
+		case 'success':
+			iconName = 'checkmark-circle';
+			break;
+		default:
+			iconName = 'checkmark-circle';
+	}
+	// 是否是实体类型,加上-fill,在icon组件库中,实体的类名是后面加-fill的
+	if (fill) iconName += '-fill';
+	return iconName;
+}
+
+export default type2icon
diff --git a/uni_modules/vk-uview-ui/libs/mixin/mixin.js b/uni_modules/vk-uview-ui/libs/mixin/mixin.js
new file mode 100644
index 0000000..9f97371
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/mixin/mixin.js
@@ -0,0 +1,86 @@
+export default {
+	data() {
+		return {}
+	},
+	onLoad() {
+		// getRect挂载到$u上，因为这方法需要使用in(this)，所以无法把它独立成一个单独的文件导出
+		this.$u.getRect = this.$uGetRect
+	},
+	methods: {
+		// 查询节点信息
+		// 目前此方法在支付宝小程序中无法获取组件跟接点的尺寸，为支付宝的bug(2020-07-21)
+		// 解决办法为在组件根部再套一个没有任何作用的view元素
+		$uGetRect(selector, all) {
+			return new Promise(resolve => {
+				uni.createSelectorQuery().
+				in(this)[all ? 'selectAll' : 'select'](selector)
+					.boundingClientRect(rect => {
+						if (all && Array.isArray(rect) && rect.length) {
+							resolve(rect)
+						}
+						if (!all && rect) {
+							resolve(rect)
+						}
+					})
+					.exec()
+			})
+		},
+		getParentData(parentName = '') {
+			// 避免在created中去定义parent变量
+			if(!this.parent) this.parent = false;
+			// 这里的本质原理是，通过获取父组件实例(也即u-radio-group的this)
+			// 将父组件this中对应的参数，赋值给本组件(u-radio的this)的parentData对象中对应的属性
+			// 之所以需要这么做，是因为所有端中，头条小程序不支持通过this.parent.xxx去监听父组件参数的变化
+			this.parent = this.$u.$parent.call(this, parentName);
+			if(this.parent) {
+				// 历遍parentData中的属性，将parent中的同名属性赋值给parentData
+				Object.keys(this.parentData).map(key => {
+					this.parentData[key] = this.parent[key];
+				});
+				// #ifdef VUE3
+				this.parentData.value = this.parent.modelValue;
+				// #endif
+			}
+		},
+		// 阻止事件冒泡
+		preventEvent(e) {
+			e && e.stopPropagation && e.stopPropagation()
+		}
+	},
+	onReachBottom() {
+		uni.$emit('uOnReachBottom')
+	},
+  // #ifndef VUE3
+  beforeDestroy() {
+    // 判断当前页面是否存在parent和chldren，一般在checkbox和checkbox-group父子联动的场景会有此情况
+    // 组件销毁时，移除子组件在父组件children数组中的实例，释放资源，避免数据混乱
+    if(this.parent && uni.$u.test.array(this.parent.children)) {
+    	// 组件销毁时，移除父组件中的children数组中对应的实例
+    	const childrenList = this.parent.children
+    	childrenList.map((child, index) => {
+    		// 如果相等，则移除
+    		if(child === this) {
+    			childrenList.splice(index, 1)
+    		}
+    	})
+    }
+  },
+  // #endif
+  
+  // #ifdef VUE3
+  beforeUnmount() {
+    // 判断当前页面是否存在parent和chldren，一般在checkbox和checkbox-group父子联动的场景会有此情况
+    // 组件销毁时，移除子组件在父组件children数组中的实例，释放资源，避免数据混乱
+    if(this.parent && uni.$u.test.array(this.parent.children)) {
+    	// 组件销毁时，移除父组件中的children数组中对应的实例
+    	const childrenList = this.parent.children
+    	childrenList.map((child, index) => {
+    		// 如果相等，则移除
+    		if(child === this) {
+    			childrenList.splice(index, 1)
+    		}
+    	})
+    }
+  },
+  // #endif
+}
diff --git a/uni_modules/vk-uview-ui/libs/mixin/mpShare.js b/uni_modules/vk-uview-ui/libs/mixin/mpShare.js
new file mode 100644
index 0000000..aa9c2d7
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/mixin/mpShare.js
@@ -0,0 +1,18 @@
+export default {
+	onLoad() {
+		// 设置默认的转发参数
+		this.$u.mpShare = {
+			title: '', // 默认为小程序名称
+			path: '', // 默认为当前页面路径
+			imageUrl: '' // 默认为当前页面的截图
+		}
+	},
+	onShareAppMessage() {
+		return this.$u.mpShare
+	},
+	// #ifdef MP-WEIXIN
+	onShareTimeline() {
+		return this.$u.mpShare
+	}
+	// #endif
+}
diff --git a/uni_modules/vk-uview-ui/libs/request/index.js b/uni_modules/vk-uview-ui/libs/request/index.js
new file mode 100644
index 0000000..1f5f471
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/request/index.js
@@ -0,0 +1,169 @@
+import deepMerge from "../function/deepMerge";
+import validate from "../function/test";
+class Request {
+	// 设置全局默认配置
+	setConfig(customConfig) {
+		// 深度合并对象，否则会造成对象深层属性丢失
+		this.config = deepMerge(this.config, customConfig);
+	}
+
+	// 主要请求部分
+	request(options = {}) {
+		// 检查请求拦截
+		if (this.interceptor.request && typeof this.interceptor.request === 'function') {
+			let tmpConfig = {};
+			let interceptorRequest = this.interceptor.request(options);
+			if (interceptorRequest === false) {
+				// 返回一个处于pending状态中的Promise，来取消原promise，避免进入then()回调
+				return new Promise(()=>{});
+			}
+			this.options = interceptorRequest;
+		}
+		options.dataType = options.dataType || this.config.dataType;
+		options.responseType = options.responseType || this.config.responseType;
+		options.url = options.url || '';
+		options.params = options.params || {};
+		options.header = Object.assign({}, this.config.header, options.header);
+		options.method = options.method || this.config.method;
+
+		return new Promise((resolve, reject) => {
+			options.complete = (response) => {
+				// 请求返回后，隐藏loading(如果请求返回快的话，可能会没有loading)
+				uni.hideLoading();
+				// 清除定时器，如果请求回来了，就无需loading
+				clearTimeout(this.config.timer);
+				this.config.timer = null;
+				// 判断用户对拦截返回数据的要求，如果originalData为true，返回所有的数据(response)到拦截器，否则只返回response.data
+				if(this.config.originalData) {
+					// 判断是否存在拦截器
+					if (this.interceptor.response && typeof this.interceptor.response === 'function') {
+						let resInterceptors = this.interceptor.response(response);
+						// 如果拦截器不返回false，就将拦截器返回的内容给this.$u.post的then回调
+						if (resInterceptors !== false) {
+							resolve(resInterceptors);
+						} else {
+							// 如果拦截器返回false，意味着拦截器定义者认为返回有问题，直接接入catch回调
+							reject(response);
+						}
+					} else {
+						// 如果要求返回原始数据，就算没有拦截器，也返回最原始的数据
+						resolve(response);
+					}
+				} else {
+					if (response.statusCode == 200) {
+						if (this.interceptor.response && typeof this.interceptor.response === 'function') {
+							let resInterceptors = this.interceptor.response(response.data);
+							if (resInterceptors !== false) {
+								resolve(resInterceptors);
+							} else {
+								reject(response.data);
+							}
+						} else {
+							// 如果不是返回原始数据(originalData=false)，且没有拦截器的情况下，返回纯数据给then回调
+							resolve(response.data);
+						}
+					} else {
+						// 不返回原始数据的情况下，服务器状态码不为200，modal弹框提示
+						// if(response.errMsg) {
+						// 	uni.showModal({
+						// 		title: response.errMsg
+						// 	});
+						// }
+						reject(response)
+					}
+				}
+			}
+
+			// 判断用户传递的URL是否/开头,如果不是,加上/，这里使用了uView的test.js验证库的url()方法
+			options.url = validate.url(options.url) ? options.url : (this.config.baseUrl + (options.url.indexOf('/') == 0 ?
+				options.url : '/' + options.url));
+			
+			// 是否显示loading
+			// 加一个是否已有timer定时器的判断，否则有两个同时请求的时候，后者会清除前者的定时器id
+			// 而没有清除前者的定时器，导致前者超时，一直显示loading
+			if(this.config.showLoading && !this.config.timer) {
+				this.config.timer = setTimeout(() => {
+					uni.showLoading({
+						title: this.config.loadingText,
+						mask: this.config.loadingMask
+					})
+					this.config.timer = null;
+				}, this.config.loadingTime);
+			}
+			uni.request(options);
+		})
+		// .catch(res => {
+		// 	// 如果返回reject()，不让其进入this.$u.post().then().catch()后面的catct()
+		// 	// 因为很多人都会忘了写后面的catch()，导致报错捕获不到catch
+		// 	return new Promise(()=>{});
+		// })
+	}
+
+	constructor() {
+		this.config = {
+			baseUrl: '', // 请求的根域名
+			// 默认的请求头
+			header: {},
+			method: 'POST',
+			// 设置为json，返回后uni.request会对数据进行一次JSON.parse
+			dataType: 'json',
+			// 此参数无需处理，因为5+和支付宝小程序不支持，默认为text即可
+			responseType: 'text',
+			showLoading: true, // 是否显示请求中的loading
+			loadingText: '请求中...',
+			loadingTime: 800, // 在此时间内，请求还没回来的话，就显示加载中动画，单位ms
+			timer: null, // 定时器
+			originalData: false, // 是否在拦截器中返回服务端的原始数据，见文档说明
+			loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透
+		}
+	
+		// 拦截器
+		this.interceptor = {
+			// 请求前的拦截
+			request: null,
+			// 请求后的拦截
+			response: null
+		}
+
+		// get请求
+		this.get = (url, data = {}, header = {}) => {
+			return this.request({
+				method: 'GET',
+				url,
+				header,
+				data
+			})
+		}
+
+		// post请求
+		this.post = (url, data = {}, header = {}) => {
+			return this.request({
+				url,
+				method: 'POST',
+				header,
+				data
+			})
+		}
+		
+		// put请求，不支持支付宝小程序(HX2.6.15)
+		this.put = (url, data = {}, header = {}) => {
+			return this.request({
+				url,
+				method: 'PUT',
+				header,
+				data
+			})
+		}
+		
+		// delete请求，不支持支付宝和头条小程序(HX2.6.15)
+		this.delete = (url, data = {}, header = {}) => {
+			return this.request({
+				url,
+				method: 'DELETE',
+				header,
+				data
+			})
+		}
+	}
+}
+export default new Request
diff --git a/uni_modules/vk-uview-ui/libs/store/index.js b/uni_modules/vk-uview-ui/libs/store/index.js
new file mode 100644
index 0000000..a5927b3
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/store/index.js
@@ -0,0 +1,19 @@
+// 暂时不用vuex模块方式实现，将该方法直接放入到/store/index.js中
+const module = {
+	actions: {
+		$uStore({rootState}, params) {
+			let nameArr = params.name.split('.');
+			if(nameArr.length >= 2) {
+				let obj = rootState[nameArr[0]];
+				for(let i = 1; i < nameArr.length - 1; i ++) {
+					obj = obj[nameArr[i]];
+				}
+				obj[nameArr[nameArr.length - 1]] = params.value;
+			} else {
+				rootState[params.name] = params.value;
+			}
+		}
+	}
+}
+
+export default module
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/util/async-validator.js b/uni_modules/vk-uview-ui/libs/util/async-validator.js
new file mode 100644
index 0000000..d7215b9
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/util/async-validator.js
@@ -0,0 +1,1356 @@
+function _extends() {
+	_extends = Object.assign || function(target) {
+		for (var i = 1; i < arguments.length; i++) {
+			var source = arguments[i];
+
+			for (var key in source) {
+				if (Object.prototype.hasOwnProperty.call(source, key)) {
+					target[key] = source[key];
+				}
+			}
+		}
+
+		return target;
+	};
+
+	return _extends.apply(this, arguments);
+}
+
+/* eslint no-console:0 */
+var formatRegExp = /%[sdj%]/g;
+var warning = function warning() {}; // don't print warning message when in production env or node runtime
+
+if (typeof process !== 'undefined' && process.env && process.env.NODE_ENV !== 'production' && typeof window !==
+	'undefined' && typeof document !== 'undefined') {
+	warning = function warning(type, errors) {
+		if (typeof console !== 'undefined' && console.warn) {
+			if (errors.every(function(e) {
+					return typeof e === 'string';
+				})) {
+				console.warn(type, errors);
+			}
+		}
+	};
+}
+
+function convertFieldsError(errors) {
+	if (!errors || !errors.length) return null;
+	var fields = {};
+	errors.forEach(function(error) {
+		var field = error.field;
+		fields[field] = fields[field] || [];
+		fields[field].push(error);
+	});
+	return fields;
+}
+
+function format() {
+	for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+		args[_key] = arguments[_key];
+	}
+
+	var i = 1;
+	var f = args[0];
+	var len = args.length;
+
+	if (typeof f === 'function') {
+		return f.apply(null, args.slice(1));
+	}
+
+	if (typeof f === 'string') {
+		var str = String(f).replace(formatRegExp, function(x) {
+			if (x === '%%') {
+				return '%';
+			}
+
+			if (i >= len) {
+				return x;
+			}
+
+			switch (x) {
+				case '%s':
+					return String(args[i++]);
+
+				case '%d':
+					return Number(args[i++]);
+
+				case '%j':
+					try {
+						return JSON.stringify(args[i++]);
+					} catch (_) {
+						return '[Circular]';
+					}
+
+					break;
+
+				default:
+					return x;
+			}
+		});
+
+		for (var arg = args[i]; i < len; arg = args[++i]) {
+			str += " " + arg;
+		}
+
+		return str;
+	}
+
+	return f;
+}
+
+function isNativeStringType(type) {
+	return type === 'string' || type === 'url' || type === 'hex' || type === 'email' || type === 'pattern';
+}
+
+function isEmptyValue(value, type) {
+	if (value === undefined || value === null) {
+		return true;
+	}
+
+	if (type === 'array' && Array.isArray(value) && !value.length) {
+		return true;
+	}
+
+	if (isNativeStringType(type) && typeof value === 'string' && !value) {
+		return true;
+	}
+
+	return false;
+}
+
+function asyncParallelArray(arr, func, callback) {
+	var results = [];
+	var total = 0;
+	var arrLength = arr.length;
+
+	function count(errors) {
+		results.push.apply(results, errors);
+		total++;
+
+		if (total === arrLength) {
+			callback(results);
+		}
+	}
+
+	arr.forEach(function(a) {
+		func(a, count);
+	});
+}
+
+function asyncSerialArray(arr, func, callback) {
+	var index = 0;
+	var arrLength = arr.length;
+
+	function next(errors) {
+		if (errors && errors.length) {
+			callback(errors);
+			return;
+		}
+
+		var original = index;
+		index = index + 1;
+
+		if (original < arrLength) {
+			func(arr[original], next);
+		} else {
+			callback([]);
+		}
+	}
+
+	next([]);
+}
+
+function flattenObjArr(objArr) {
+	var ret = [];
+	Object.keys(objArr).forEach(function(k) {
+		ret.push.apply(ret, objArr[k]);
+	});
+	return ret;
+}
+
+function asyncMap(objArr, option, func, callback) {
+	if (option.first) {
+		var _pending = new Promise(function(resolve, reject) {
+			var next = function next(errors) {
+				callback(errors);
+				return errors.length ? reject({
+					errors: errors,
+					fields: convertFieldsError(errors)
+				}) : resolve();
+			};
+
+			var flattenArr = flattenObjArr(objArr);
+			asyncSerialArray(flattenArr, func, next);
+		});
+
+		_pending["catch"](function(e) {
+			return e;
+		});
+
+		return _pending;
+	}
+
+	var firstFields = option.firstFields || [];
+
+	if (firstFields === true) {
+		firstFields = Object.keys(objArr);
+	}
+
+	var objArrKeys = Object.keys(objArr);
+	var objArrLength = objArrKeys.length;
+	var total = 0;
+	var results = [];
+	var pending = new Promise(function(resolve, reject) {
+		var next = function next(errors) {
+			results.push.apply(results, errors);
+			total++;
+
+			if (total === objArrLength) {
+				callback(results);
+				return results.length ? reject({
+					errors: results,
+					fields: convertFieldsError(results)
+				}) : resolve();
+			}
+		};
+
+		if (!objArrKeys.length) {
+			callback(results);
+			resolve();
+		}
+
+		objArrKeys.forEach(function(key) {
+			var arr = objArr[key];
+
+			if (firstFields.indexOf(key) !== -1) {
+				asyncSerialArray(arr, func, next);
+			} else {
+				asyncParallelArray(arr, func, next);
+			}
+		});
+	});
+	pending["catch"](function(e) {
+		return e;
+	});
+	return pending;
+}
+
+function complementError(rule) {
+	return function(oe) {
+		if (oe && oe.message) {
+			oe.field = oe.field || rule.fullField;
+			return oe;
+		}
+
+		return {
+			message: typeof oe === 'function' ? oe() : oe,
+			field: oe.field || rule.fullField
+		};
+	};
+}
+
+function deepMerge(target, source) {
+	if (source) {
+		for (var s in source) {
+			if (source.hasOwnProperty(s)) {
+				var value = source[s];
+
+				if (typeof value === 'object' && typeof target[s] === 'object') {
+					target[s] = _extends({}, target[s], {}, value);
+				} else {
+					target[s] = value;
+				}
+			}
+		}
+	}
+
+	return target;
+}
+
+/**
+ *  Rule for validating required fields.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function required(rule, value, source, errors, options, type) {
+	if (rule.required && (!source.hasOwnProperty(rule.field) || isEmptyValue(value, type || rule.type))) {
+		errors.push(format(options.messages.required, rule.fullField));
+	}
+}
+
+/**
+ *  Rule for validating whitespace.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function whitespace(rule, value, source, errors, options) {
+	if (/^\s+$/.test(value) || value === '') {
+		errors.push(format(options.messages.whitespace, rule.fullField));
+	}
+}
+
+/* eslint max-len:0 */
+
+var pattern = {
+	// http://emailregex.com/
+	email: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
+	url: new RegExp(
+		"^(?!mailto:)(?:(?:http|https|ftp)://|//)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$",
+		'i'),
+	hex: /^#?([a-f0-9]{6}|[a-f0-9]{3})$/i
+};
+var types = {
+	integer: function integer(value) {
+		return types.number(value) && parseInt(value, 10) === value;
+	},
+	"float": function float(value) {
+		return types.number(value) && !types.integer(value);
+	},
+	array: function array(value) {
+		return Array.isArray(value);
+	},
+	regexp: function regexp(value) {
+		if (value instanceof RegExp) {
+			return true;
+		}
+
+		try {
+			return !!new RegExp(value);
+		} catch (e) {
+			return false;
+		}
+	},
+	date: function date(value) {
+		return typeof value.getTime === 'function' && typeof value.getMonth === 'function' && typeof value.getYear ===
+			'function';
+	},
+	number: function number(value) {
+		if (isNaN(value)) {
+			return false;
+		}
+
+		// 修改源码，将字符串数值先转为数值
+		return typeof +value === 'number';
+	},
+	object: function object(value) {
+		return typeof value === 'object' && !types.array(value);
+	},
+	method: function method(value) {
+		return typeof value === 'function';
+	},
+	email: function email(value) {
+		return typeof value === 'string' && !!value.match(pattern.email) && value.length < 255;
+	},
+	url: function url(value) {
+		return typeof value === 'string' && !!value.match(pattern.url);
+	},
+	hex: function hex(value) {
+		return typeof value === 'string' && !!value.match(pattern.hex);
+	}
+};
+/**
+ *  Rule for validating the type of a value.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function type(rule, value, source, errors, options) {
+	if (rule.required && value === undefined) {
+		required(rule, value, source, errors, options);
+		return;
+	}
+
+	var custom = ['integer', 'float', 'array', 'regexp', 'object', 'method', 'email', 'number', 'date', 'url', 'hex'];
+	var ruleType = rule.type;
+
+	if (custom.indexOf(ruleType) > -1) {
+		if (!types[ruleType](value)) {
+			errors.push(format(options.messages.types[ruleType], rule.fullField, rule.type));
+		} // straight typeof check
+
+	} else if (ruleType && typeof value !== rule.type) {
+		errors.push(format(options.messages.types[ruleType], rule.fullField, rule.type));
+	}
+}
+
+/**
+ *  Rule for validating minimum and maximum allowed values.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function range(rule, value, source, errors, options) {
+	var len = typeof rule.len === 'number';
+	var min = typeof rule.min === 'number';
+	var max = typeof rule.max === 'number'; // 正则匹配码点范围从U+010000一直到U+10FFFF的文字（补充平面Supplementary Plane）
+
+	var spRegexp = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g;
+	var val = value;
+	var key = null;
+	var num = typeof value === 'number';
+	var str = typeof value === 'string';
+	var arr = Array.isArray(value);
+
+	if (num) {
+		key = 'number';
+	} else if (str) {
+		key = 'string';
+	} else if (arr) {
+		key = 'array';
+	} // if the value is not of a supported type for range validation
+	// the validation rule rule should use the
+	// type property to also test for a particular type
+
+
+	if (!key) {
+		return false;
+	}
+
+	if (arr) {
+		val = value.length;
+	}
+
+	if (str) {
+		// 处理码点大于U+010000的文字length属性不准确的bug，如"𠮷𠮷𠮷".lenght !== 3
+		val = value.replace(spRegexp, '_').length;
+	}
+
+	if (len) {
+		if (val !== rule.len) {
+			errors.push(format(options.messages[key].len, rule.fullField, rule.len));
+		}
+	} else if (min && !max && val < rule.min) {
+		errors.push(format(options.messages[key].min, rule.fullField, rule.min));
+	} else if (max && !min && val > rule.max) {
+		errors.push(format(options.messages[key].max, rule.fullField, rule.max));
+	} else if (min && max && (val < rule.min || val > rule.max)) {
+		errors.push(format(options.messages[key].range, rule.fullField, rule.min, rule.max));
+	}
+}
+
+var ENUM = 'enum';
+/**
+ *  Rule for validating a value exists in an enumerable list.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function enumerable(rule, value, source, errors, options) {
+	rule[ENUM] = Array.isArray(rule[ENUM]) ? rule[ENUM] : [];
+
+	if (rule[ENUM].indexOf(value) === -1) {
+		errors.push(format(options.messages[ENUM], rule.fullField, rule[ENUM].join(', ')));
+	}
+}
+
+/**
+ *  Rule for validating a regular expression pattern.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function pattern$1(rule, value, source, errors, options) {
+	if (rule.pattern) {
+		if (rule.pattern instanceof RegExp) {
+			// if a RegExp instance is passed, reset `lastIndex` in case its `global`
+			// flag is accidentally set to `true`, which in a validation scenario
+			// is not necessary and the result might be misleading
+			rule.pattern.lastIndex = 0;
+
+			if (!rule.pattern.test(value)) {
+				errors.push(format(options.messages.pattern.mismatch, rule.fullField, value, rule.pattern));
+			}
+		} else if (typeof rule.pattern === 'string') {
+			var _pattern = new RegExp(rule.pattern);
+
+			if (!_pattern.test(value)) {
+				errors.push(format(options.messages.pattern.mismatch, rule.fullField, value, rule.pattern));
+			}
+		}
+	}
+}
+
+var rules = {
+	required: required,
+	whitespace: whitespace,
+	type: type,
+	range: range,
+	"enum": enumerable,
+	pattern: pattern$1
+};
+
+/**
+ *  Performs validation for string types.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function string(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value, 'string') && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options, 'string');
+
+		if (!isEmptyValue(value, 'string')) {
+			rules.type(rule, value, source, errors, options);
+			rules.range(rule, value, source, errors, options);
+			rules.pattern(rule, value, source, errors, options);
+
+			if (rule.whitespace === true) {
+				rules.whitespace(rule, value, source, errors, options);
+			}
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a function.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function method(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a number.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function number(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (value === '') {
+			value = undefined;
+		}
+
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+			rules.range(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a boolean.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function _boolean(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates the regular expression type.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function regexp(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (!isEmptyValue(value)) {
+			rules.type(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a number is an integer.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function integer(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+			rules.range(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a number is a floating point number.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function floatFn(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+			rules.range(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates an array.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function array(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value, 'array') && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options, 'array');
+
+		if (!isEmptyValue(value, 'array')) {
+			rules.type(rule, value, source, errors, options);
+			rules.range(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates an object.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function object(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+var ENUM$1 = 'enum';
+/**
+ *  Validates an enumerable list.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function enumerable$1(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules[ENUM$1](rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a regular expression pattern.
+ *
+ *  Performs validation when a rule only contains
+ *  a pattern property but is not declared as a string type.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function pattern$2(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value, 'string') && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (!isEmptyValue(value, 'string')) {
+			rules.pattern(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+function date(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field); 
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (!isEmptyValue(value)) {
+			var dateObject;
+
+			if (typeof value === 'number') {
+				dateObject = new Date(value);
+			} else {
+				dateObject = value;
+			}
+
+			rules.type(rule, dateObject, source, errors, options);
+
+			if (dateObject) {
+				rules.range(rule, dateObject.getTime(), source, errors, options);
+			}
+		}
+	}
+
+	callback(errors);
+}
+
+function required$1(rule, value, callback, source, options) {
+	var errors = [];
+	var type = Array.isArray(value) ? 'array' : typeof value;
+	rules.required(rule, value, source, errors, options, type);
+	callback(errors);
+}
+
+function type$1(rule, value, callback, source, options) {
+	var ruleType = rule.type;
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value, ruleType) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options, ruleType);
+
+		if (!isEmptyValue(value, ruleType)) {
+			rules.type(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Performs validation for any type.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function any(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+	}
+
+	callback(errors);
+}
+
+var validators = {
+	string: string,
+	method: method,
+	number: number,
+	"boolean": _boolean,
+	regexp: regexp,
+	integer: integer,
+	"float": floatFn,
+	array: array,
+	object: object,
+	"enum": enumerable$1,
+	pattern: pattern$2,
+	date: date,
+	url: type$1,
+	hex: type$1,
+	email: type$1,
+	required: required$1,
+	any: any
+};
+
+function newMessages() {
+	return {
+		"default": 'Validation error on field %s',
+		required: '%s is required',
+		"enum": '%s must be one of %s',
+		whitespace: '%s cannot be empty',
+		date: {
+			format: '%s date %s is invalid for format %s',
+			parse: '%s date could not be parsed, %s is invalid ',
+			invalid: '%s date %s is invalid'
+		},
+		types: {
+			string: '%s is not a %s',
+			method: '%s is not a %s (function)',
+			array: '%s is not an %s',
+			object: '%s is not an %s',
+			number: '%s is not a %s',
+			date: '%s is not a %s',
+			"boolean": '%s is not a %s',
+			integer: '%s is not an %s',
+			"float": '%s is not a %s',
+			regexp: '%s is not a valid %s',
+			email: '%s is not a valid %s',
+			url: '%s is not a valid %s',
+			hex: '%s is not a valid %s'
+		},
+		string: {
+			len: '%s must be exactly %s characters',
+			min: '%s must be at least %s characters',
+			max: '%s cannot be longer than %s characters',
+			range: '%s must be between %s and %s characters'
+		},
+		number: {
+			len: '%s must equal %s',
+			min: '%s cannot be less than %s',
+			max: '%s cannot be greater than %s',
+			range: '%s must be between %s and %s'
+		},
+		array: {
+			len: '%s must be exactly %s in length',
+			min: '%s cannot be less than %s in length',
+			max: '%s cannot be greater than %s in length',
+			range: '%s must be between %s and %s in length'
+		},
+		pattern: {
+			mismatch: '%s value %s does not match pattern %s'
+		},
+		clone: function clone() {
+			var cloned = JSON.parse(JSON.stringify(this));
+			cloned.clone = this.clone;
+			return cloned;
+		}
+	};
+}
+var messages = newMessages();
+
+/**
+ *  Encapsulates a validation schema.
+ *
+ *  @param descriptor An object declaring validation rules
+ *  for this schema.
+ */
+
+function Schema(descriptor) {
+	this.rules = null;
+	this._messages = messages;
+	this.define(descriptor);
+}
+
+Schema.prototype = {
+	messages: function messages(_messages) {
+		if (_messages) {
+			this._messages = deepMerge(newMessages(), _messages);
+		}
+
+		return this._messages;
+	},
+	define: function define(rules) {
+		if (!rules) {
+			throw new Error('Cannot configure a schema with no rules');
+		}
+
+		if (typeof rules !== 'object' || Array.isArray(rules)) {
+			throw new Error('Rules must be an object');
+		}
+
+		this.rules = {};
+		var z;
+		var item;
+
+		for (z in rules) {
+			if (rules.hasOwnProperty(z)) {
+				item = rules[z];
+				this.rules[z] = Array.isArray(item) ? item : [item];
+			}
+		}
+	},
+	validate: function validate(source_, o, oc) {
+		var _this = this;
+
+		if (o === void 0) {
+			o = {};
+		}
+
+		if (oc === void 0) {
+			oc = function oc() {};
+		}
+
+		var source = source_;
+		var options = o;
+		var callback = oc;
+
+		if (typeof options === 'function') {
+			callback = options;
+			options = {};
+		}
+
+		if (!this.rules || Object.keys(this.rules).length === 0) {
+			if (callback) {
+				callback();
+			}
+
+			return Promise.resolve();
+		}
+
+		function complete(results) {
+			var i;
+			var errors = [];
+			var fields = {};
+
+			function add(e) {
+				if (Array.isArray(e)) {
+					var _errors;
+
+					errors = (_errors = errors).concat.apply(_errors, e);
+				} else {
+					errors.push(e);
+				}
+			}
+
+			for (i = 0; i < results.length; i++) {
+				add(results[i]);
+			}
+
+			if (!errors.length) {
+				errors = null;
+				fields = null;
+			} else {
+				fields = convertFieldsError(errors);
+			}
+
+			callback(errors, fields);
+		}
+
+		if (options.messages) {
+			var messages$1 = this.messages();
+
+			if (messages$1 === messages) {
+				messages$1 = newMessages();
+			}
+
+			deepMerge(messages$1, options.messages);
+			options.messages = messages$1;
+		} else {
+			options.messages = this.messages();
+		}
+
+		var arr;
+		var value;
+		var series = {};
+		var keys = options.keys || Object.keys(this.rules);
+		keys.forEach(function(z) {
+			arr = _this.rules[z];
+			value = source[z];
+			arr.forEach(function(r) {
+				var rule = r;
+
+				if (typeof rule.transform === 'function') {
+					if (source === source_) {
+						source = _extends({}, source);
+					}
+
+					value = source[z] = rule.transform(value);
+				}
+
+				if (typeof rule === 'function') {
+					rule = {
+						validator: rule
+					};
+				} else {
+					rule = _extends({}, rule);
+				}
+
+				rule.validator = _this.getValidationMethod(rule);
+				rule.field = z;
+				rule.fullField = rule.fullField || z;
+				rule.type = _this.getType(rule);
+
+				if (!rule.validator) {
+					return;
+				}
+
+				series[z] = series[z] || [];
+				series[z].push({
+					rule: rule,
+					value: value,
+					source: source,
+					field: z
+				});
+			});
+		});
+		var errorFields = {};
+		return asyncMap(series, options, function(data, doIt) {
+			var rule = data.rule;
+			var deep = (rule.type === 'object' || rule.type === 'array') && (typeof rule.fields === 'object' || typeof rule.defaultField ===
+				'object');
+			deep = deep && (rule.required || !rule.required && data.value);
+			rule.field = data.field;
+
+			function addFullfield(key, schema) {
+				return _extends({}, schema, {
+					fullField: rule.fullField + "." + key
+				});
+			}
+
+			function cb(e) {
+				if (e === void 0) {
+					e = [];
+				}
+
+				var errors = e;
+
+				if (!Array.isArray(errors)) {
+					errors = [errors];
+				}
+
+				if (!options.suppressWarning && errors.length) {
+					Schema.warning('async-validator:', errors);
+				}
+
+				if (errors.length && rule.message) {
+					errors = [].concat(rule.message);
+				}
+
+				errors = errors.map(complementError(rule));
+
+				if (options.first && errors.length) {
+					errorFields[rule.field] = 1;
+					return doIt(errors);
+				}
+
+				if (!deep) {
+					doIt(errors);
+				} else {
+					// if rule is required but the target object
+					// does not exist fail at the rule level and don't
+					// go deeper
+					if (rule.required && !data.value) {
+						if (rule.message) {
+							errors = [].concat(rule.message).map(complementError(rule));
+						} else if (options.error) {
+							errors = [options.error(rule, format(options.messages.required, rule.field))];
+						} else {
+							errors = [];
+						}
+
+						return doIt(errors);
+					}
+
+					var fieldsSchema = {};
+
+					if (rule.defaultField) {
+						for (var k in data.value) {
+							if (data.value.hasOwnProperty(k)) {
+								fieldsSchema[k] = rule.defaultField;
+							}
+						}
+					}
+
+					fieldsSchema = _extends({}, fieldsSchema, {}, data.rule.fields);
+
+					for (var f in fieldsSchema) {
+						if (fieldsSchema.hasOwnProperty(f)) {
+							var fieldSchema = Array.isArray(fieldsSchema[f]) ? fieldsSchema[f] : [fieldsSchema[f]];
+							fieldsSchema[f] = fieldSchema.map(addFullfield.bind(null, f));
+						}
+					}
+
+					var schema = new Schema(fieldsSchema);
+					schema.messages(options.messages);
+
+					if (data.rule.options) {
+						data.rule.options.messages = options.messages;
+						data.rule.options.error = options.error;
+					}
+
+					schema.validate(data.value, data.rule.options || options, function(errs) {
+						var finalErrors = [];
+
+						if (errors && errors.length) {
+							finalErrors.push.apply(finalErrors, errors);
+						}
+
+						if (errs && errs.length) {
+							finalErrors.push.apply(finalErrors, errs);
+						}
+
+						doIt(finalErrors.length ? finalErrors : null);
+					});
+				}
+			}
+
+			var res;
+
+			if (rule.asyncValidator) {
+				res = rule.asyncValidator(rule, data.value, cb, data.source, options);
+			} else if (rule.validator) {
+				res = rule.validator(rule, data.value, cb, data.source, options);
+
+				if (res === true) {
+					cb();
+				} else if (res === false) {
+					cb(rule.message || rule.field + " fails");
+				} else if (res instanceof Array) {
+					cb(res);
+				} else if (res instanceof Error) {
+					cb(res.message);
+				}
+			}
+
+			if (res && res.then) {
+				res.then(function() {
+					return cb();
+				}, function(e) {
+					return cb(e);
+				});
+			}
+		}, function(results) {
+			complete(results);
+		});
+	},
+	getType: function getType(rule) {
+		if (rule.type === undefined && rule.pattern instanceof RegExp) {
+			rule.type = 'pattern';
+		}
+
+		if (typeof rule.validator !== 'function' && rule.type && !validators.hasOwnProperty(rule.type)) {
+			throw new Error(format('Unknown rule type %s', rule.type));
+		}
+
+		return rule.type || 'string';
+	},
+	getValidationMethod: function getValidationMethod(rule) {
+		if (typeof rule.validator === 'function') {
+			return rule.validator;
+		}
+
+		var keys = Object.keys(rule);
+		var messageIndex = keys.indexOf('message');
+
+		if (messageIndex !== -1) {
+			keys.splice(messageIndex, 1);
+		}
+
+		if (keys.length === 1 && keys[0] === 'required') {
+			return validators.required;
+		}
+
+		return validators[this.getType(rule)] || false;
+	}
+};
+
+Schema.register = function register(type, validator) {
+	if (typeof validator !== 'function') {
+		throw new Error('Cannot register a validator by type, validator is not a function');
+	}
+
+	validators[type] = validator;
+};
+
+Schema.warning = warning;
+Schema.messages = messages;
+
+export default Schema;
+//# sourceMappingURL=index.js.map
diff --git a/uni_modules/vk-uview-ui/libs/util/emitter.js b/uni_modules/vk-uview-ui/libs/util/emitter.js
new file mode 100644
index 0000000..41f236a
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/util/emitter.js
@@ -0,0 +1,64 @@
+/**
+ * 递归使用 call 方式this指向
+ * @param componentName // 需要找的组件的名称
+ * @param eventName // 事件名称
+ * @param params // 需要传递的参数
+ */
+function broadcast(componentName, eventName, params) {
+    // 循环子节点找到名称一样的子节点 否则 递归 当前子节点
+    var $children;
+    // #ifndef VUE3
+    $children = this.$children;
+    $children.map(child=>{
+      if (componentName===child.$options.name) {
+          child.$emit.apply(child,[eventName].concat(params))
+      }else {
+          broadcast.apply(child,[componentName,eventName].concat(params))
+      }
+    })
+    // #endif
+    // #ifdef VUE3
+    //$children = this.uForm.fields;
+    // #endif
+}
+export default {
+    methods: {
+        /**
+         * 派发 (向上查找) (一个)
+         * @param componentName // 需要找的组件的名称
+         * @param eventName // 事件名称
+         * @param params // 需要传递的参数
+         */
+        dispatch(componentName, eventName, params) {
+            let parent = this.$parent || this.$root;//$parent 找到最近的父节点 $root 根节点
+            let name = parent.$options.name; // 获取当前组件实例的name
+            // 如果当前有节点 && 当前没名称 且 当前名称等于需要传进来的名称的时候就去查找当前的节点
+            // 循环出当前名称的一样的组件实例
+            while (parent && (!name||name!==componentName)) {
+                parent = parent.$parent;
+                if (parent) {
+                    name = parent.$options.name;
+                }
+            }
+            // 有节点表示当前找到了name一样的实例
+            if (parent) {
+              // #ifndef VUE3
+              parent.$emit.apply(parent,[eventName].concat(params))
+              // #endif
+              
+              // #ifdef VUE3
+              parent[eventName](params)
+              // #endif
+            }
+        },
+        /**
+         * 广播 (向下查找) (广播多个)
+         * @param componentName // 需要找的组件的名称
+         * @param eventName // 事件名称
+         * @param params // 需要传递的参数
+         */
+        broadcast(componentName, eventName, params) {
+            broadcast.call(this,componentName, eventName, params)
+        }
+    }
+}
diff --git a/uni_modules/vk-uview-ui/package.json b/uni_modules/vk-uview-ui/package.json
new file mode 100644
index 0000000..14f0e6c
--- /dev/null
+++ b/uni_modules/vk-uview-ui/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "vk-uview-ui",
+	"name": "vk-uview-ui",
+  "displayName": "【开箱即用】uView Vue3 横空出世，继承uView1意志，再战江湖，风云再起！",
+  "version": "1.4.5",
+  "description": "同时支持 Vue3.0 和 Vue2.0，你没看错，现在 uView 支持 Vue3.0 了！（不支持nvue，此版本为uView1.0的分支）",
+  "keywords": [
+    "vk-uview-ui",
+    "vk云开发",
+    "vue3.0",
+    "uniapp",
+    "uview"
+],
+  "repository": "https://gitee.com/vk-uni/vk-uview-ui.git",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": "https://vkuviewdoc.fsq.pub",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "u",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/readme.md b/uni_modules/vk-uview-ui/readme.md
new file mode 100644
index 0000000..8f6f890
--- /dev/null
+++ b/uni_modules/vk-uview-ui/readme.md
@@ -0,0 +1,125 @@
+# vk-uview-ui
+
+> 插件市场地址： [点击前往](https://ext.dcloud.net.cn/plugin?name=vk-uview-ui)
+
+## `vk-uview-ui` 与 `uview-ui` 的关系？
+
+`vk-uview-ui` 是 `VK` 基于 `uview-ui 1.8.3` 版本改造而来，其本质依然还是 `uview-ui`，是 `VK` 的珍藏版，由 `VK` 维护。
+
+`uview-ui` 是 `vk-unicloud 快速开发框架` 之 `client端框架` 中推荐的UI，很多 `VK框架` 用户都在用  `uview-ui`
+
+由于 `uview-ui` 作者目前重心全在 `uView 2.0` 的 `nvue` 版本上，故没有精力维护 `uView 1.0`，因此作者贡献出了自己珍藏的 `vk-uview-ui` 版本。
+ 
+> 在这里，也感谢 `uview-ui` 作者的开源奉献，再次为开源点赞。 同时 `vk-uview-ui` 也是无条件开源。
+
+## `vk-uview-ui` 与 `uview-ui 1.8.3` 功能上有什么区别？
+
+* 1、最大的亮点：同时支持 `Vue3.0` 和 `Vue2.0`，你没看错，现在 `uview-ui` 支持 `Vue3.0` 了（这应该是目前为数不多的 `uniapp Vue3.0` 组件库）（2021-11-18）
+* 2、以 `uni_modules` 模块形式发布，方便一键更新（同时组件会自动按需加载，无需手动写 `easycom` 规则（注意，你需要把之前写的 `easycom` 规则删除，在项目根目录的 `pages.json` 中删除）
+* 3、对部分组件进行了微调，其中大部分调整不会影响你之前的代码运行（如车牌号键盘点击1次中文后会自动切英文+数字键盘），但有以下调整可能会影响你代码运行，请看完后再考虑是否有必要使用。
+
+* * 3.1、`u-picker` 的选择省市区的静态数据源使用 unicloud 中 `opendb-city-china` 表内的数据生成（这样前后端地址数据源保持了一致），但由于数据源变动了，可能会对你有些影响。同时该组件还新增了 `addressDiscern` 方法 可用于智能识别收货信息,如在 `张三 13888888888 上海市嘉定区希望路1333弄是啊我庭12号楼1203` 中识别姓名、手机号、地址（支持多种格式）
+* * 3.2、删除了 `uview-ui` 内置的 `国际化语言` 功能，（改造成 `Vue3` 比较麻烦，故作者干脆直接删除了）
+* * 3.3、还有其他一些细微变动（这个版本是几个月前就已经改造完的，在 uniapp 刚出Vue3的时候就开始了，但是由于当时的 uniapp Vue3 bug真的太多，当时并没有发布，可以想象一下作者当时碰到bug满天飞的场景）
+* * 3.4、Vue3.0中， uniapp 的 Vue3 版本在H5 APP（非nvue）微信小程序 中兼容性尚可，其他小程序目前还不行。
+
+> [vk-uview-ui文档](https://vkuviewdoc.fsq.pub/components/icon.html)
+
+___目前大的问题应该没有了，作者自己的项目也是用此组件库开发，因此你无需担心后期无人维护。___
+
+如果你了解了以上须知，那么请继续阅读快速上手。
+
+> 如有问题，可加Q群反馈：22466457，只要是因本插件引起的问题，你在群里一定可以得到解决。
+
+## 快速上手之Vue2.0
+
+即使是 `Vue2` 版本，同样比原版 `uView1.0` 做了一些优化，如（车牌号键盘点击1次中文后会自动切英文，倒计时支持毫秒等等）
+
+支持：H5、App(vue)、微信小程序、支付宝小程序（其他小程序未测试）
+
+* 1、main.js 引入 vk-uview-ui 
+
+```js
+import uView from './uni_modules/vk-uview-ui';
+Vue.use(uView);
+```
+
+* 2、App.vue 引入基础样式（注意style标签需声明scss属性支持）
+
+```html
+<style lang="scss">
+	@import "./uni_modules/vk-uview-ui/index.scss";
+</style>
+```
+
+* 3、uni.scss 引入全局 scss 变量文件
+
+```css
+@import "@/uni_modules/vk-uview-ui/theme.scss";
+```
+
+## 快速上手之Vue3.0
+
+不建议把老项目 升级到 Vue3.0 (升级非常麻烦，建议新项目才考虑是否使用Vue3.0)
+
+支持：H5、App(vue)、微信小程序（其他小程序未测试）
+
+目前 发现Vue3 H5版本一个重大bug（与此UI框架无关），调试开发没问题，发布到前端托管时样式会错乱，已确定是HBX的问题，等待HBX修复此问题。（hbx3.3.0版本已修复此问题）
+
+* 1、前置步骤：修改 `manifest.json` 内的 `vue` 版本为 `vue3`
+* 2、项目根目录新增 `index.html` 文件，文件代码为
+```html
+<!DOCTYPE html>
+<html lang="zh-CN">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
+		<title></title>
+		<!--preload-links-->
+		<!--app-context-->
+		<!-- 配置H5的 web图标static/logo.png -->
+		<link rel="icon" href="./static/logo.png" />
+	</head>
+	<body>
+		<div id="app">
+			<!--app-html-->
+		</div>
+		<script type="module" src="/main.js"></script>
+	</body>
+</html>
+```
+
+* 3、main.js 引入 vk-uview-ui 
+
+```js
+// 引入 uView UI
+import uView from './uni_modules/vk-uview-ui';
+
+import { createSSRApp } from 'vue'
+
+export function createApp() {
+  const app  = createSSRApp(App)
+  
+  // 使用 uView UI
+  app.use(uView)
+  
+  return { app }
+}
+
+```
+
+* 4、App.vue 引入基础样式（注意style标签需声明scss属性支持）
+
+```html
+<style lang="scss">
+	@import "./uni_modules/vk-uview-ui/index.scss";
+</style>
+```
+
+* 5、uni.scss 引入全局 scss 变量文件
+
+```css
+@import "@/uni_modules/vk-uview-ui/theme.scss";
+```
+
+
diff --git a/uni_modules/vk-uview-ui/theme.scss b/uni_modules/vk-uview-ui/theme.scss
new file mode 100644
index 0000000..f3bb36d
--- /dev/null
+++ b/uni_modules/vk-uview-ui/theme.scss
@@ -0,0 +1,38 @@
+// 此文件为uView的主题变量，这些变量目前只能通过uni.scss引入才有效，另外由于
+// uni.scss中引入的样式会同时混入到全局样式文件和单独每一个页面的样式中，造成微信程序包太大，
+// 故uni.scss只建议放scss变量名相关样式，其他的样式可以通过main.js或者App.vue引入
+
+$u-main-color: #303133;
+$u-content-color: #606266;
+$u-tips-color: #909399;
+$u-light-color: #c0c4cc;
+$u-border-color: #e4e7ed;
+$u-bg-color: #f3f4f6;
+
+$u-type-primary: #2979ff;
+$u-type-primary-light: #ecf5ff;
+$u-type-primary-disabled: #a0cfff;
+$u-type-primary-dark: #2b85e4;
+
+$u-type-warning: #ff9900;
+$u-type-warning-disabled: #fcbd71;
+$u-type-warning-dark: #f29100;
+$u-type-warning-light: #fdf6ec;
+
+$u-type-success: #19be6b;
+$u-type-success-disabled: #71d5a1;
+$u-type-success-dark: #18b566;
+$u-type-success-light: #dbf1e1;
+
+$u-type-error: #fa3534;
+$u-type-error-disabled: #fab6b6;
+$u-type-error-dark: #dd6161;
+$u-type-error-light: #fef0f0;
+
+$u-type-info: #909399;
+$u-type-info-disabled: #c8c9cc;
+$u-type-info-dark: #82848a;
+$u-type-info-light: #f4f4f5;
+
+$u-form-item-height: 70rpx;
+$u-form-item-border-color: #dcdfe6;
diff --git a/uni_modules/z-paging/changelog.md b/uni_modules/z-paging/changelog.md
new file mode 100644
index 0000000..82c637b
--- /dev/null
+++ b/uni_modules/z-paging/changelog.md
@@ -0,0 +1,6 @@
+## 2.6.0（2023-10-17）
+1.`修复` 在安卓中突然滚动到顶部可能出现的无法下拉刷新问题。  
+2.`修复` 在安卓中可能出现的列表卡住和无法下拉的问题。  
+3.`修复` 在安卓6.0以下系统中列表为空的问题。  
+4.`优化` 列表滚动-下拉刷新状态过渡细节。  
+
diff --git a/uni_modules/z-paging/components/z-paging-cell/z-paging-cell.vue b/uni_modules/z-paging/components/z-paging-cell/z-paging-cell.vue
new file mode 100644
index 0000000..e9aca70
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging-cell/z-paging-cell.vue
@@ -0,0 +1,34 @@
+<!-- z-paging -->
+<!-- github地址:https://github.com/SmileZXLee/uni-z-paging -->
+<!-- dcloud地址:https://ext.dcloud.net.cn/plugin?id=3935 -->
+<!-- 反馈QQ群：790460711 -->
+
+<!-- z-paging-cell，用于在nvue中使用cell包裹，vue中使用view包裹 -->
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<cell :style="[cellStyle]">
+		<slot />
+	</cell>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<view :style="[cellStyle]">
+		<slot />
+	</view>
+	<!-- #endif -->
+</template>
+
+<script>
+	export default {
+		name: "z-paging-cell",
+		props: {
+			//cellStyle
+			cellStyle: {
+				type: Object,
+				default: function() {
+                    return {}
+                }
+			}
+		}
+	}
+</script>
+
diff --git a/uni_modules/z-paging/components/z-paging-empty-view/z-paging-empty-view.vue b/uni_modules/z-paging/components/z-paging-empty-view/z-paging-empty-view.vue
new file mode 100644
index 0000000..18ee4ee
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging-empty-view/z-paging-empty-view.vue
@@ -0,0 +1,162 @@
+<!-- z-paging -->
+<!-- github地址:https://github.com/SmileZXLee/uni-z-paging -->
+<!-- dcloud地址:https://ext.dcloud.net.cn/plugin?id=3935 -->
+<!-- 反馈QQ群：790460711 -->
+
+<!-- 空数据占位view，此组件支持easycom规范，可以在项目中直接引用 -->
+<template>
+	<view :class="{'zp-container':true,'zp-container-fixed':emptyViewFixed}" :style="[finalEmptyViewStyle]" @click="emptyViewClick">
+		<view class="zp-main">
+			<image v-if="!emptyViewImg.length" class="zp-main-image" :style="[emptyViewImgStyle]" :src="emptyImg" />
+			<image v-else class="zp-main-image" mode="aspectFit" :style="[emptyViewImgStyle]" :src="emptyViewImg" />
+			<text class="zp-main-title" :style="[emptyViewTitleStyle]">{{emptyViewText}}</text>
+			<text v-if="showEmptyViewReload" class="zp-main-error-btn" :style="[emptyViewReloadStyle]" @click.stop="reloadClick">{{emptyViewReloadText}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import zStatic from '../z-paging/js/z-paging-static'
+	export default {
+		name: "z-paging-empty-view",
+		data() {
+			return {
+				
+			};
+		},
+		props: {
+			//空数据描述文字
+			emptyViewText: {
+				type: String,
+				default: '没有数据哦~'
+			},
+			//空数据图片
+			emptyViewImg: {
+				type: String,
+				default: ''
+			},
+			//是否显示空数据图重新加载按钮
+			showEmptyViewReload: {
+				type: Boolean,
+				default: false
+			},
+			//空数据点击重新加载文字
+			emptyViewReloadText: {
+				type: String,
+				default: '重新加载'
+			},
+			//是否是加载失败
+			isLoadFailed: {
+				type: Boolean,
+				default: false
+			},
+			//空数据图样式
+			emptyViewStyle: {
+				type: Object,
+				default: function() {
+                    return {}
+                }
+			},
+			//空数据图img样式
+			emptyViewImgStyle: {
+				type: Object,
+				default: function() {
+				    return {}
+				}
+			},
+			//空数据图描述文字样式
+			emptyViewTitleStyle: {
+				type: Object,
+				default: function() {
+				    return {}
+				}
+			},
+			//空数据图重新加载按钮样式
+			emptyViewReloadStyle: {
+				type: Object,
+				default: function() {
+				    return {}
+				}
+			},
+			//空数据图z-index
+			emptyViewZIndex: {
+				type: Number,
+				default: 9
+			},
+			//空数据图片是否使用fixed布局并铺满z-paging
+			emptyViewFixed: {
+				type: Boolean,
+				default: true
+			}
+		},
+		computed: {
+			emptyImg() {
+                return this.isLoadFailed ? zStatic.base64Error : zStatic.base64Empty;
+			},
+			finalEmptyViewStyle(){
+				this.emptyViewStyle['z-index'] = this.emptyViewZIndex;
+				return this.emptyViewStyle;
+			}
+		},
+		methods: {
+			reloadClick() {
+				this.$emit('reload');
+			},
+			emptyViewClick() {
+				this.$emit('viewClick');
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.zp-container{
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		justify-content: center;
+	}
+	.zp-container-fixed {
+		/* #ifndef APP-NVUE */
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+	}
+
+	.zp-main{
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+        padding: 50rpx 0rpx;
+	}
+
+	.zp-main-image {
+		width: 200rpx;
+		height: 200rpx;
+	}
+
+	.zp-main-title {
+		font-size: 26rpx;
+		color: #aaaaaa;
+		text-align: center;
+		margin-top: 10rpx;
+	}
+
+	.zp-main-error-btn {
+		font-size: 26rpx;
+		padding: 8rpx 24rpx;
+		border: solid 1px #dddddd;
+		border-radius: 6rpx;
+		color: #aaaaaa;
+		margin-top: 50rpx;
+	}
+</style>
diff --git a/uni_modules/z-paging/components/z-paging-swiper-item/z-paging-swiper-item.vue b/uni_modules/z-paging/components/z-paging-swiper-item/z-paging-swiper-item.vue
new file mode 100644
index 0000000..0501457
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging-swiper-item/z-paging-swiper-item.vue
@@ -0,0 +1,143 @@
+<!-- z-paging -->
+<!-- github地址:https://github.com/SmileZXLee/uni-z-paging -->
+<!-- dcloud地址:https://ext.dcloud.net.cn/plugin?id=3935 -->
+<!-- 反馈QQ群：790460711 -->
+
+<!-- 滑动切换选项卡swiper-item，此组件支持easycom规范，可以在项目中直接引用 -->
+<template>
+	<view class="zp-swiper-item-container">
+		<z-paging ref="paging" :fixed="false" 
+			:auto="false" :useVirtualList="useVirtualList" :useInnerList="useInnerList" :cellKeyName="cellKeyName" :innerListStyle="innerListStyle" 
+			:preloadPage="preloadPage" :cellHeightMode="cellHeightMode" :virtualScrollFps="virtualScrollFps" :virtualListCol="virtualListCol"
+			@query="_queryList" @listChange="_updateList" style="height: 100%;">
+			<slot />
+			<template #header>
+				<slot name="header"/>
+			</template>
+			<template #cell="{item,index}">
+				<slot name="cell" :item="item" :index="index"/>
+			</template>
+			<template #footer>
+				<slot name="footer"/>
+			</template>
+		</z-paging>
+	</view>
+</template>
+
+<script>
+	import zPaging from '../z-paging/z-paging'
+	export default {
+		name: "z-paging-swiper-item",
+		components: { zPaging },
+		data() {
+			return {
+				firstLoaded: false
+			}
+		},
+		props: {
+			//当前组件的index，也就是当前组件是swiper中的第几个
+			tabIndex: {
+				type: Number,
+				default: function() {
+					return 0
+				}
+			},
+			//当前swiper切换到第几个index
+			currentIndex: {
+				type: Number,
+				default: function() {
+					return 0
+				}
+			},
+			//是否使用虚拟列表，默认为否
+			useVirtualList: {
+				type: Boolean,
+				default: false
+			},
+			//是否在z-paging内部循环渲染列表(内置列表)，默认为否。若use-virtual-list为true，则此项恒为true
+			useInnerList: {
+				type: Boolean,
+				default: false
+			},
+			//内置列表cell的key名称，仅nvue有效，在nvue中开启use-inner-list时必须填此项
+			cellKeyName: {
+				type: String,
+				default: ''
+			},
+			//innerList样式
+			innerListStyle: {
+				type: Object,
+				default: function() {
+					return {};
+				}
+			},
+			//预加载的列表可视范围(列表高度)页数，默认为12，即预加载当前页及上下各12页的cell。此数值越大，则虚拟列表中加载的dom越多，内存消耗越大(会维持在一个稳定值)，但增加预加载页面数量可缓解快速滚动短暂白屏问题
+			preloadPage: {
+				type: [Number, String],
+				default: 12
+			},
+			//虚拟列表cell高度模式，默认为fixed，也就是每个cell高度完全相同，将以第一个cell高度为准进行计算。可选值【dynamic】，即代表高度是动态非固定的，【dynamic】性能低于【fixed】。
+			cellHeightMode: {
+				type: String,
+				default: 'fixed'
+			},
+			//虚拟列表列数，默认为1。常用于每行有多列的情况，例如每行有2列数据，需要将此值设置为2
+			virtualListCol: {
+				type: [Number, String],
+				default: 1
+			},
+			//虚拟列表scroll取样帧率，默认为60，过高可能出现卡顿等问题
+			virtualScrollFps: {
+				type: [Number, String],
+				default: 60
+			},
+		},
+		watch: {
+			currentIndex: {
+				handler(newVal, oldVal) {
+					if (newVal === this.tabIndex) {
+						//懒加载，当滑动到当前的item时，才去加载
+						if (!this.firstLoaded) {
+							this.$nextTick(()=>{
+								let delay = 5;
+								// #ifdef MP-TOUTIAO
+								delay = 100;
+								// #endif
+								setTimeout(() => {
+									this.$refs.paging.reload().catch(() => {});
+								}, delay);
+							})
+						}
+					}
+				},
+				immediate: true
+			}
+		},
+		methods: {
+			reload(data) {
+				return this.$refs.paging.reload(data);
+			},
+			complete(data) {
+				this.firstLoaded = true;
+				return this.$refs.paging.complete(data);
+			},
+			_queryList(pageNo, pageSize, from) {
+				this.$emit('query', pageNo, pageSize, from);
+			},
+			_updateList(list) {
+				this.$emit('updateList', list);
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.zp-swiper-item-container {
+		/* #ifndef APP-NVUE */
+		height: 100%;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/z-paging/components/z-paging-swiper/z-paging-swiper.vue b/uni_modules/z-paging/components/z-paging-swiper/z-paging-swiper.vue
new file mode 100644
index 0000000..27cdb8e
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging-swiper/z-paging-swiper.vue
@@ -0,0 +1,170 @@
+<!-- z-paging -->
+<!-- github地址:https://github.com/SmileZXLee/uni-z-paging -->
+<!-- dcloud地址:https://ext.dcloud.net.cn/plugin?id=3935 -->
+<!-- 反馈QQ群：790460711 -->
+
+<!-- 滑动切换选项卡swiper容器，此组件支持easycom规范，可以在项目中直接引用 -->
+<template>
+	<view :class="fixed?'zp-swiper-container zp-swiper-container-fixed':'zp-swiper-container'" :style="[finalSwiperStyle]">
+		<!-- #ifndef APP-PLUS -->
+		<view v-if="cssSafeAreaInsetBottom===-1" class="zp-safe-area-inset-bottom"></view>
+		<!-- #endif -->
+		<slot v-if="zSlots.top" name="top" />
+		<view class="zp-swiper-super">
+			<view v-if="zSlots.left" :class="{'zp-swiper-left':true,'zp-absoulte':isOldWebView}">
+				<slot name="left" />
+			</view>
+			<view :class="{'zp-swiper':true,'zp-absoulte':isOldWebView}" :style="[swiperContentStyle]">
+				<slot />
+			</view>
+			<view v-if="zSlots.right" :class="{'zp-swiper-right':true,'zp-absoulte zp-right':isOldWebView}">
+				<slot name="right" />
+			</view>
+		</view>
+		<slot v-if="zSlots.bottom" name="bottom" />
+	</view>
+</template>
+
+<script>
+	import commonLayoutModule from '../z-paging/js/modules/common-layout'
+	
+	export default {
+		name: "z-paging-swiper",
+		mixins: [commonLayoutModule],
+		data() {
+			return {
+				swiperContentStyle: {}
+			};
+		},
+		props: {
+			//是否使用fixed布局，默认为是
+			fixed: {
+				type: Boolean,
+				default: true
+			},
+			//是否开启底部安全区域适配
+			safeAreaInsetBottom: {
+				type: Boolean,
+				default: false
+			},
+			//z-paging-swiper样式
+			swiperStyle: {
+				type: Object,
+				default: function() {
+					return {};
+				},
+			}
+		},
+		mounted() {
+			this.$nextTick(() => {
+				this.systemInfo = uni.getSystemInfoSync();
+			})
+			// #ifndef APP-PLUS
+			this._getCssSafeAreaInsetBottom();
+			// #endif
+			this.updateLeftAndRightWidth();
+
+			this.swiperContentStyle = { 'flex': '1' };
+			// #ifndef APP-NVUE
+			this.swiperContentStyle = { width: '100%',height: '100%' };
+			// #endif
+		},
+		computed: {
+			finalSwiperStyle() {
+				const swiperStyle = this.swiperStyle;
+				if (!this.systemInfo) return swiperStyle;
+				const windowTop = this.windowTop;
+				const windowBottom = this.systemInfo.windowBottom;
+				if (this.fixed) {
+					if (windowTop && !swiperStyle.top) {
+						swiperStyle.top = windowTop + 'px';
+					}
+					if (!swiperStyle.bottom) {
+						let bottom = windowBottom || 0;
+						bottom += this.safeAreaInsetBottom ? this.safeAreaBottom : 0;
+						if (bottom > 0) {
+							swiperStyle.bottom = bottom + 'px';
+						}
+					}
+				}
+				return swiperStyle;
+			}
+		},
+		methods: {
+			//更新slot="left"和slot="right"宽度，当slot="left"或slot="right"宽度动态改变时调用
+			updateLeftAndRightWidth() {
+				if (!this.isOldWebView) return;
+				this.$nextTick(() => this._updateLeftAndRightWidth(this.swiperContentStyle, 'zp-swiper'));
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.zp-swiper-container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		flex: 1;
+	}
+
+	.zp-swiper-container-fixed {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		height: auto;
+		width: auto;
+		/* #endif */
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+	}
+	
+	.zp-safe-area-inset-bottom {
+		position: absolute;
+		/* #ifndef APP-PLUS */
+		height: env(safe-area-inset-bottom);
+		/* #endif */
+	}
+
+	.zp-swiper-super {
+		flex: 1;
+		overflow: hidden;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+	
+	.zp-swiper-left,.zp-swiper-right{
+		/* #ifndef APP-NVUE */
+		height: 100%;
+		/* #endif */
+	}
+
+	.zp-swiper {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		height: 100%;
+		width: 100%;
+		/* #endif */
+	}
+	
+	.zp-absoulte {
+		/* #ifndef APP-NVUE */
+		position: absolute;
+		top: 0;
+		width: auto;
+		/* #endif */
+	}
+	
+	.zp-right{
+		right: 0;
+	}
+	
+	.zp-swiper-item {
+		height: 100%;
+	}
+</style>
diff --git a/uni_modules/z-paging/components/z-paging/components/z-paging-load-more.vue b/uni_modules/z-paging/components/z-paging/components/z-paging-load-more.vue
new file mode 100644
index 0000000..f3ef931
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/components/z-paging-load-more.vue
@@ -0,0 +1,141 @@
+<!-- [z-paging]上拉加载更多view -->
+<template>
+	<view class="zp-l-container" :style="[c.customStyle]" @click="doClick">
+		<template v-if="!c.hideContent">
+			<text v-if="c.showNoMoreLine&&finalStatus===M.NoMore" class="zp-l-line" :style="[{backgroundColor:zTheme.line[ts]},c.noMoreLineCustomStyle]" />
+			<!-- #ifndef APP-NVUE -->
+			<image v-if="finalStatus===M.Loading&&!!c.loadingIconCustomImage"
+				:src="c.loadingIconCustomImage" :style="[c.iconCustomStyle]" :class="{'zp-l-line-loading-custom-image':true,'zp-l-line-loading-custom-image-animated':c.loadingAnimated}" />
+			<image v-if="finalStatus===M.Loading&&finalLoadingIconType==='flower'&&!c.loadingIconCustomImage.length"
+				class="zp-line-loading-image" :style="[c.iconCustomStyle]" :src="zTheme.flower[ts]" />
+			<!-- #endif -->
+			<!-- #ifdef APP-NVUE -->
+			<view>
+				<loading-indicator v-if="finalStatus===M.Loading&&finalLoadingIconType!=='circle'" class="zp-line-loading-image" :style="[{color:zTheme.indicator[ts]}]" :animating="true" />
+			</view>
+			<!-- #endif -->
+			<text v-if="finalStatus===M.Loading&&finalLoadingIconType==='circle'&&!c.loadingIconCustomImage.length"
+				class="zp-l-circle-loading-view" :style="[{borderColor:zTheme.circleBorder[ts],borderTopColor:zTheme.circleBorderTop[ts]},c.iconCustomStyle]" />
+			<text class="zp-l-text" :style="[{color:zTheme.title[ts]},c.titleCustomStyle]">{{ownLoadingMoreText}}</text>
+			<text v-if="c.showNoMoreLine&&finalStatus===M.NoMore" class="zp-l-line" :style="[{backgroundColor:zTheme.line[ts]},c.noMoreLineCustomStyle]" />
+		</template>
+	</view>
+</template>
+<script>
+	import zStatic from '../js/z-paging-static'
+	import Enum from '../js/z-paging-enum'
+	export default {
+		name: 'z-paging-load-more',
+		data() {
+			return {
+				M: Enum.More,
+				zTheme: {
+					title: { white: '#efefef', black: '#a4a4a4' },
+					line: { white: '#efefef', black: '#eeeeee' },
+					circleBorder: { white: '#aaaaaa', black: '#c8c8c8' },
+					circleBorderTop: { white: '#ffffff', black: '#444444' },
+					flower: { white: zStatic.base64FlowerWhite, black: zStatic.base64Flower },
+					indicator: { white: '#eeeeee', black: '#777777' }
+				}
+			};
+		},
+		props: ['zConfig'],
+		computed: {
+			ts() {
+				return this.c.defaultThemeStyle;
+			},
+			c() {
+				return this.zConfig || {};
+			},
+			ownLoadingMoreText() {
+				const statusTextArr = [this.c.defaultText,this.c.loadingText,this.c.noMoreText,this.c.failText];
+				return statusTextArr[this.finalStatus];
+			},
+			finalStatus() {
+				if (this.c.defaultAsLoading && this.c.status === this.M.Default) return this.M.Loading;
+				return this.c.status;
+			},
+			finalLoadingIconType() {
+				// #ifdef APP-NVUE
+				return 'flower';
+				// #endif
+				return this.c.loadingIconType;
+			}
+		},
+		methods: {
+			doClick() {
+				this.$emit('doClick');
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	@import "../css/z-paging-static.css";
+
+	.zp-l-container {
+		height: 80rpx;
+		font-size: 27rpx;
+		/* #ifndef APP-NVUE */
+		clear: both;
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.zp-l-line-loading-custom-image {
+		color: #a4a4a4;
+		margin-right: 8rpx;
+		width: 28rpx;
+		height: 28rpx;
+	}
+	
+	.zp-l-line-loading-custom-image-animated{
+		/* #ifndef APP-NVUE */
+		animation: loading-circle 1s linear infinite;
+		/* #endif */
+	}
+
+	.zp-l-circle-loading-view {
+		margin-right: 8rpx;
+		width: 23rpx;
+		height: 23rpx;
+		border: 3rpx solid #dddddd;
+		border-radius: 50%;
+		/* #ifndef APP-NVUE */
+		animation: loading-circle 1s linear infinite;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 30rpx;
+		height: 30rpx;
+		/* #endif */
+	}
+
+	.zp-l-text {
+		/* #ifdef APP-NVUE */
+		font-size: 30rpx;
+		margin: 0rpx 10rpx;
+		/* #endif */
+	}
+
+	.zp-l-line {
+		height: 1px;
+		width: 100rpx;
+		margin: 0rpx 10rpx;
+	}
+
+	/* #ifndef APP-NVUE */
+	@keyframes loading-circle {
+		0% {
+			-webkit-transform: rotate(0deg);
+			transform: rotate(0deg);
+		}
+		100% {
+			-webkit-transform: rotate(360deg);
+			transform: rotate(360deg);
+		}
+	}
+	/* #endif */
+</style>
diff --git a/uni_modules/z-paging/components/z-paging/components/z-paging-refresh.vue b/uni_modules/z-paging/components/z-paging/components/z-paging-refresh.vue
new file mode 100644
index 0000000..12ac9db
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/components/z-paging-refresh.vue
@@ -0,0 +1,182 @@
+<!-- [z-paging]下拉刷新view -->
+<template>
+	<view style="height: 100%;">
+		<view :class="showUpdateTime?'zp-r-container zp-r-container-padding':'zp-r-container'">
+			<view class="zp-r-left">
+				<image v-if="status!==R.Loading" :class="leftImageClass" :style="[leftImageStyle,imgStyle]" :src="leftImageSrc" />
+				<!-- #ifndef APP-NVUE -->
+				<image v-else :class="{'zp-line-loading-image':refreshingAnimated,'zp-r-left-image':true}" :style="[leftImageStyle,imgStyle]" :src="leftImageSrc" />
+				<!-- #endif -->
+				<!-- #ifdef APP-NVUE -->
+				<view v-else :style="[{'margin-right':showUpdateTime?'18rpx':'12rpx'}]">
+					<loading-indicator :class="isIos?'zp-loading-image-ios':'zp-loading-image-android'" 
+					:style="[{color:zTheme.indicator[ts]},imgStyle]" :animating="true" />
+				</view>
+				<!-- #endif -->
+			</view>
+			<view class="zp-r-right">
+				<text class="zp-r-right-text" :style="[rightTextStyle,titleStyle]">{{currentTitle}}</text>
+				<text v-if="showUpdateTime&&refresherTimeText.length" class="zp-r-right-text zp-r-right-time-text" :style="[rightTextStyle,updateTimeStyle]">
+					{{refresherTimeText}}
+				</text>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import zStatic from '../js/z-paging-static'
+	import u from '../js/z-paging-utils'
+	import Enum from '../js/z-paging-enum'
+	
+	export default {
+		name: 'z-paging-refresh',
+		data() {
+			return {
+				R: Enum.Refresher,
+				isIos: uni.getSystemInfoSync().platform === 'ios',
+				refresherTimeText: '',
+				zTheme: {
+					title: { white: '#efefef', black: '#555555' },
+					arrow: { white: zStatic.base64ArrowWhite, black: zStatic.base64Arrow },
+					flower: { white: zStatic.base64FlowerWhite, black: zStatic.base64Flower },
+					success: { white: zStatic.base64SuccessWhite, black: zStatic.base64Success },
+					indicator: { white: '#eeeeee', black: '#777777' }
+				}
+			};
+		},
+		props: ['status', 'defaultThemeStyle', 'defaultText', 'pullingText', 'refreshingText', 'completeText', 'defaultImg', 'pullingImg', 
+			'refreshingImg', 'completeImg', 'refreshingAnimated', 'showUpdateTime', 'updateTimeKey', 'imgStyle', 'titleStyle', 'updateTimeStyle', 'updateTimeTextMap'
+		],
+		computed: {
+			ts() {
+				return this.defaultThemeStyle;
+			},
+			statusTextArr() {
+				this.updateTime();
+				return [this.defaultText,this.pullingText,this.refreshingText,this.completeText];
+			},
+			currentTitle() {
+				return this.statusTextArr[this.status] || this.defaultText;
+			},
+			leftImageClass() {
+				if (this.status === this.R.Complete) return 'zp-r-left-image-pre-size';
+				return `zp-r-left-image zp-r-left-image-pre-size ${this.status === this.R.Default ? 'zp-r-arrow-down' : 'zp-r-arrow-top'}`;
+			},
+			leftImageStyle() {
+				const showUpdateTime = this.showUpdateTime;
+				const size = showUpdateTime ? '36rpx' : '30rpx';
+				return {width: size,height: size,'margin-right': showUpdateTime ? '20rpx' : '9rpx'};
+			},
+			leftImageSrc() {
+				const R = this.R;
+				const status = this.status;
+				if (status === R.Default) {
+					if (!!this.defaultImg) return this.defaultImg;
+					return this.zTheme.arrow[this.ts];
+				} else if (status  === R.ReleaseToRefresh) {
+					if (!!this.pullingImg) return this.pullingImg;
+					if (!!this.defaultImg) return this.defaultImg;
+					return this.zTheme.arrow[this.ts];
+				} else if (status  === R.Loading) {
+					if (!!this.refreshingImg) return this.refreshingImg;
+					return this.zTheme.flower[this.ts];;
+				} else if (status  === R.Complete) {
+					if (!!this.completeImg) return this.completeImg;
+					return this.zTheme.success[this.ts];;
+				}
+				return '';
+			},
+			rightTextStyle() {
+				let stl = {};
+				// #ifdef APP-NVUE
+				const textHeight = this.showUpdateTime ? '40rpx' : '80rpx';
+				stl = {'height': textHeight, 'line-height': textHeight}
+				// #endif
+				stl['color'] = this.zTheme.title[this.ts];
+				return stl;
+			}
+		},
+		methods: {
+			updateTime() {
+				if (this.showUpdateTime) {
+					this.refresherTimeText = u.getRefesrherFormatTimeByKey(this.updateTimeKey, this.updateTimeTextMap);
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	@import "../css/z-paging-static.css";
+
+	.zp-r-container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		height: 100%;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.zp-r-container-padding {
+		/* #ifdef APP-NVUE */
+		padding: 15rpx 0rpx;
+		/* #endif */
+	}
+
+	.zp-r-left {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		overflow: hidden;
+		/* #ifdef MP-ALIPAY */
+		margin-top: -4rpx;
+		/* #endif */
+	}
+
+	.zp-r-left-image {
+		transition-duration: .2s;
+		transition-property: transform;
+		color: #666666;
+	}
+	
+	.zp-r-left-image-pre-size{
+		/* #ifndef APP-NVUE */
+		width: 30rpx;
+		height: 30rpx;
+		overflow: hidden;
+		/* #endif */
+	}
+
+	.zp-r-arrow-top {
+		transform: rotate(0deg);
+	}
+
+	.zp-r-arrow-down {
+		transform: rotate(180deg);
+	}
+
+	.zp-r-right {
+		font-size: 27rpx;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.zp-r-right-text {
+		/* #ifdef APP-NVUE */
+		font-size: 28rpx;
+		/* #endif */
+	}
+
+	.zp-r-right-time-text {
+		margin-top: 10rpx;
+		font-size: 24rpx;
+	}
+</style>
diff --git a/uni_modules/z-paging/components/z-paging/config/index.js b/uni_modules/z-paging/components/z-paging/config/index.js
new file mode 100644
index 0000000..15a37e2
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/config/index.js
@@ -0,0 +1,3 @@
+// z-paging全局配置文件，注意避免更新时此文件被覆盖，若被覆盖，可在此文件中右键->点击本地历史记录，找回覆盖前的配置
+
+export default {}
\ No newline at end of file
diff --git a/uni_modules/z-paging/components/z-paging/css/z-paging-main.css b/uni_modules/z-paging/components/z-paging/css/z-paging-main.css
new file mode 100644
index 0000000..5c84196
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/css/z-paging-main.css
@@ -0,0 +1,228 @@
+/* [z-paging]公共css*/
+
+.z-paging-content {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+	/* #endif */
+	flex-direction: column;
+}
+
+.z-paging-content-fixed, .zp-loading-fixed {
+	position: fixed;
+	/* #ifndef APP-NVUE */
+	height: auto;
+	width: auto;
+	/* #endif */
+	top: 0;
+	left: 0;
+	bottom: 0;
+	right: 0;
+}
+
+.zp-page-top,.zp-page-bottom {
+	/* #ifndef APP-NVUE */
+	width: auto;
+	/* #endif */
+	position: fixed;
+	left: 0;
+	right: 0;
+	z-index: 999;
+}
+
+.zp-page-left,.zp-page-right{
+	/* #ifndef APP-NVUE */
+	height: 100%;
+	/* #endif */
+}
+
+.zp-scroll-view-super {
+	flex: 1;
+	overflow: hidden;
+	position: relative;
+}
+
+.zp-view-super{
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+}
+
+.zp-custom-refresher-container {
+	overflow: hidden;
+}
+
+.zp-scroll-view-container,.zp-scroll-view {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	height: 100%;
+	width: 100%;
+	/* #endif */
+}
+
+.zp-absoulte{
+	/* #ifndef APP-NVUE */
+	position: absolute;
+	top: 0;
+	width: auto;
+	/* #endif */
+}
+
+.zp-right{
+	right: 0;
+}
+
+.zp-scroll-view-absolute {
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+
+/* #ifndef APP-NVUE */
+.zp-scroll-view-hide-scrollbar ::-webkit-scrollbar {
+	display: none;
+	-webkit-appearance: none;
+	width: 0 !important;
+	height: 0 !important;
+	background: transparent;
+}
+/* #endif */
+
+.zp-paging-touch-view {
+	width: 100%;
+	height: 100%;
+	position: relative;
+}
+
+.zp-fixed-bac-view {
+	position: absolute;
+	width: 100%;
+	top: 0;
+	left: 0;
+	height: 200px;
+}
+
+.zp-paging-main {
+	height: 100%;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+}
+
+.zp-paging-container {
+	flex: 1;
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+}
+
+.zp-chat-record-loading-container {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	width: 100%;
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	width: 750rpx;
+	/* #endif */
+	align-items: center;
+	justify-content: center;
+	height: 60rpx;
+	font-size: 26rpx;
+}
+
+.zp-chat-record-loading-custom-image {
+	width: 35rpx;
+	height: 35rpx;
+	/* #ifndef APP-NVUE */
+	animation: loading-flower 1s linear infinite;
+	/* #endif */
+}
+
+.zp-custom-refresher-container {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+}
+
+.zp-back-to-top {
+	width: 76rpx;
+	height: 76rpx;
+	z-index: 999;
+	position: absolute;
+	bottom: 0rpx;
+	right: 25rpx;
+	transition-duration: .3s;
+	transition-property: opacity;
+}
+
+.zp-back-to-top-show {
+	opacity: 1;
+}
+
+.zp-back-to-top-hide {
+	opacity: 0;
+}
+
+.zp-back-to-top-img {
+	/* #ifndef APP-NVUE */
+	width: 100%;
+	height: 100%;
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	flex: 1;
+	/* #endif */
+	z-index: 999;
+}
+
+.zp-empty-view {
+	/* #ifdef APP-NVUE */
+	height: 100%;
+	/* #endif */
+	flex: 1;
+}
+
+.zp-empty-view-center {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+
+.zp-loading-fixed {
+	z-index: 9999;
+}
+
+.zp-safe-area-inset-bottom {
+	position: absolute;
+	/* #ifndef APP-PLUS */
+	height: env(safe-area-inset-bottom);
+	/* #endif */
+}
+
+.zp-n-refresh-container {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	justify-content: center;
+	width: 750rpx;
+}
+
+.zp-n-list-container{
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	flex: 1;
+}
diff --git a/uni_modules/z-paging/components/z-paging/css/z-paging-static.css b/uni_modules/z-paging/components/z-paging/css/z-paging-static.css
new file mode 100644
index 0000000..eaad977
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/css/z-paging-static.css
@@ -0,0 +1,35 @@
+/* [z-paging]公用的静态css资源 */
+
+.zp-line-loading-image {
+	margin-right: 8rpx;
+	width: 28rpx;
+	height: 28rpx;
+	/* #ifndef APP-NVUE */
+	animation: loading-flower 1s steps(12) infinite;
+	/* #endif */
+	color: #666666;
+}
+
+.zp-loading-image-ios{
+	width: 20px;
+	height: 20px;
+}
+
+.zp-loading-image-android{
+	width: 32rpx;
+	height: 32rpx;
+}
+
+/* #ifndef APP-NVUE */
+@keyframes loading-flower {
+	0% {
+		-webkit-transform: rotate(0deg);
+		transform: rotate(0deg);
+	}
+	to {
+		-webkit-transform: rotate(1turn);
+		transform: rotate(1turn);
+	}
+}
+/* #endif */
+
diff --git a/uni_modules/z-paging/components/z-paging/i18n/en.json b/uni_modules/z-paging/components/z-paging/i18n/en.json
new file mode 100644
index 0000000..d93430f
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/i18n/en.json
@@ -0,0 +1,22 @@
+{	
+	"zp.refresher.default": "Pull down to refresh",
+	"zp.refresher.pulling": "Release to refresh",
+	"zp.refresher.refreshing": "Refreshing...",
+	"zp.refresher.complete": "Refresh succeeded",
+	
+	"zp.loadingMore.default": "Click to load more",
+	"zp.loadingMore.loading": "Loading...",
+	"zp.loadingMore.noMore": "No more data",
+	"zp.loadingMore.fail": "Load failed,click to reload",
+	
+	"zp.emptyView.title": "No data",
+	"zp.emptyView.reload": "Reload",
+	"zp.emptyView.error": "Sorry,load failed",
+	
+	"zp.refresherUpdateTime.title": "Last update: ",
+	"zp.refresherUpdateTime.none": "None",
+	"zp.refresherUpdateTime.today": "Today",
+	"zp.refresherUpdateTime.yesterday": "Yesterday",
+	
+	"zp.systemLoading.title": "Loading..."
+}
diff --git a/uni_modules/z-paging/components/z-paging/i18n/index.js b/uni_modules/z-paging/components/z-paging/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/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/z-paging/components/z-paging/i18n/zh-Hans.json b/uni_modules/z-paging/components/z-paging/i18n/zh-Hans.json
new file mode 100644
index 0000000..f2cc3c8
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/i18n/zh-Hans.json
@@ -0,0 +1,22 @@
+{	
+	"zp.refresher.default": "继续下拉刷新",
+	"zp.refresher.pulling": "松开立即刷新",
+	"zp.refresher.refreshing": "正在刷新...",
+	"zp.refresher.complete": "刷新成功",
+	
+	"zp.loadingMore.default": "点击加载更多",
+	"zp.loadingMore.loading": "正在加载...",
+	"zp.loadingMore.noMore": "没有更多了",
+	"zp.loadingMore.fail": "加载失败，点击重新加载",
+	
+	"zp.emptyView.title": "没有数据哦~",
+	"zp.emptyView.reload": "重新加载",
+	"zp.emptyView.error": "很抱歉，加载失败",
+	
+	"zp.refresherUpdateTime.title": "最后更新：",
+	"zp.refresherUpdateTime.none": "无",
+	"zp.refresherUpdateTime.today": "今天",
+	"zp.refresherUpdateTime.yesterday": "昨天",
+	
+	"zp.systemLoading.title": "加载中..."
+}
diff --git a/uni_modules/z-paging/components/z-paging/i18n/zh-Hant.json b/uni_modules/z-paging/components/z-paging/i18n/zh-Hant.json
new file mode 100644
index 0000000..e9c80cf
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/i18n/zh-Hant.json
@@ -0,0 +1,22 @@
+{	
+	"zp.refresher.default": "繼續下拉重繪",
+	"zp.refresher.pulling": "鬆開立即重繪",
+	"zp.refresher.refreshing": "正在重繪...",
+	"zp.refresher.complete": "重繪成功",
+	
+	"zp.loadingMore.default": "點擊加載更多",
+	"zp.loadingMore.loading": "正在加載...",
+	"zp.loadingMore.noMore": "沒有更多了",
+	"zp.loadingMore.fail": "加載失敗，點擊重新加載",
+	
+	"zp.emptyView.title": "沒有數據哦~",
+	"zp.emptyView.reload": "重新加載",
+	"zp.emptyView.error": "很抱歉，加載失敗",
+	
+	"zp.refresherUpdateTime.title": "最後更新：",
+	"zp.refresherUpdateTime.none": "無",
+	"zp.refresherUpdateTime.today": "今天",
+	"zp.refresherUpdateTime.yesterday": "昨天",
+	
+	"zp.systemLoading.title": "加載中..."
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/hooks/useZPaging.js b/uni_modules/z-paging/components/z-paging/js/hooks/useZPaging.js
new file mode 100644
index 0000000..a6c62f4
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/hooks/useZPaging.js
@@ -0,0 +1,25 @@
+// [z-paging]useZPaging hooks
+
+import { onPageScroll, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app';
+
+function useZPaging(paging) {
+	const cPaging = !!paging ? paging.value || paging : null;
+	
+	onPullDownRefresh(() => {
+		if (!cPaging) return;
+		cPaging.value.reload().catch(() => {});
+	})
+	
+	onPageScroll(e => {
+		if (!cPaging) return;
+		cPaging.value.updatePageScrollTop(e.scrollTop);
+		e.scrollTop < 10 && cPaging.value.doChatRecordLoadMore();
+	})
+	
+	onReachBottom(() => {
+		if (!cPaging) return;
+		cPaging.value.pageReachBottom();
+	})
+}
+
+export default useZPaging
\ No newline at end of file
diff --git a/uni_modules/z-paging/components/z-paging/js/hooks/useZPagingComp.js b/uni_modules/z-paging/components/z-paging/js/hooks/useZPagingComp.js
new file mode 100644
index 0000000..afed9f5
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/hooks/useZPagingComp.js
@@ -0,0 +1,26 @@
+// [z-paging]useZPagingComp hooks
+
+function useZPagingComp(paging) {
+	
+	const cPaging = !!paging ? paging.value || paging : null;
+	
+	const reload = () => {
+		if (!cPaging) return;
+		cPaging.value.reload().catch(() => {});
+	}
+	const updatePageScrollTop = scrollTop => {
+		if (!cPaging) return;
+		cPaging.value.updatePageScrollTop(scrollTop);
+	}
+	const doChatRecordLoadMore = () => {
+		if (!cPaging) return;
+		cPaging.value.doChatRecordLoadMore();
+	}
+	const pageReachBottom = () => {
+		if (!cPaging) return;
+		cPaging.value.pageReachBottom();
+	}
+	return { reload, updatePageScrollTop, doChatRecordLoadMore, pageReachBottom };
+}
+
+export default useZPagingComp
\ No newline at end of file
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/back-to-top.js b/uni_modules/z-paging/components/z-paging/js/modules/back-to-top.js
new file mode 100644
index 0000000..a490911
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/back-to-top.js
@@ -0,0 +1,100 @@
+// [z-paging]点击返回顶部view模块
+import u from '.././z-paging-utils'
+
+export default {
+	props: {
+		//自动显示点击返回顶部按钮，默认为否
+		autoShowBackToTop: {
+			type: Boolean,
+			default: u.gc('autoShowBackToTop', false)
+		},
+		//点击返回顶部按钮显示/隐藏的阈值(滚动距离)，单位为px，默认为400rpx
+		backToTopThreshold: {
+			type: [Number, String],
+			default: u.gc('backToTopThreshold', '400rpx')
+		},
+		//点击返回顶部按钮的自定义图片地址，默认使用z-paging内置的图片
+		backToTopImg: {
+			type: String,
+			default: u.gc('backToTopImg', '')
+		},
+		//点击返回顶部按钮返回到顶部时是否展示过渡动画，默认为是
+		backToTopWithAnimate: {
+			type: Boolean,
+			default: u.gc('backToTopWithAnimate', true)
+		},
+		//点击返回顶部按钮与底部的距离，注意添加单位px或rpx，默认为160rpx
+		backToTopBottom: {
+			type: [Number, String],
+			default: u.gc('backToTopBottom', '160rpx')
+		},
+		//点击返回顶部按钮的自定义样式
+		backToTopStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('backToTopStyle', {});
+			},
+		},
+		//iOS点击顶部状态栏、安卓双击标题栏时，滚动条返回顶部，只支持竖向，默认为是
+		enableBackToTop: {
+			type: Boolean,
+			default: u.gc('enableBackToTop', true)
+		},
+	},
+	data() {
+		return {
+			backToTopClass: 'zp-back-to-top zp-back-to-top-hide',
+			lastBackToTopShowTime: 0,
+			showBackToTopClass: false,
+		}
+	},
+	computed: {
+		finalEnableBackToTop() {
+			return this.usePageScroll ? false : this.enableBackToTop;
+		},
+		finalBackToTopThreshold() {
+			return u.convertToPx(this.backToTopThreshold);
+		},
+		finalBackToTopStyle() {
+			const backToTopStyle = this.backToTopStyle;
+			if (!backToTopStyle.bottom) {
+				backToTopStyle.bottom = this.windowBottom + u.convertToPx(this.backToTopBottom) + 'px';
+			}
+			if(!backToTopStyle.position){
+				backToTopStyle.position = this.usePageScroll ? 'fixed': 'absolute';
+			}
+			return backToTopStyle;
+		},
+	},
+	methods: {
+		//点击返回顶部
+		_backToTopClick() {
+			!this.backToTopWithAnimate && this._checkShouldShowBackToTop(0);
+			this.scrollToTop(this.backToTopWithAnimate);
+		},
+		//判断是否要显示返回顶部按钮
+		_checkShouldShowBackToTop(scrollTop) {
+			if (!this.autoShowBackToTop) {
+				this.showBackToTopClass = false;
+				return;
+			}
+			if (scrollTop > this.finalBackToTopThreshold) {
+				if (!this.showBackToTopClass) {
+					this.showBackToTopClass = true;
+					this.lastBackToTopShowTime = new Date().getTime();
+					u.delay(() => {
+						this.backToTopClass = 'zp-back-to-top zp-back-to-top-show';
+					}, 300)
+				}
+			} else {
+				if (this.showBackToTopClass) {
+					this.backToTopClass = 'zp-back-to-top zp-back-to-top-hide';
+					u.delay(() => {
+						this.showBackToTopClass = false;
+					}, new Date().getTime() - this.lastBackToTopShowTime < 500 ? 0 : 300)
+				}
+			}
+		},
+	}
+}
+
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/common-layout.js b/uni_modules/z-paging/components/z-paging/js/modules/common-layout.js
new file mode 100644
index 0000000..249d7aa
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/common-layout.js
@@ -0,0 +1,116 @@
+// [z-paging]通用布局相关模块
+
+// #ifdef APP-NVUE
+const weexDom = weex.requireModule('dom');
+// #endif
+
+export default {
+	data() {
+		return {
+			systemInfo: null,
+			cssSafeAreaInsetBottom: -1,
+		}
+	},
+	computed: {
+		windowTop() {
+			if (!this.systemInfo) return 0;
+			//暂时修复vue3中隐藏系统导航栏后windowTop获取不正确的问题，具体bug详见https://ask.dcloud.net.cn/question/141634
+			//感谢litangyu！！https://github.com/SmileZXLee/uni-z-paging/issues/25
+			// #ifdef VUE3 && H5
+			const pageHeadNode = document.getElementsByTagName("uni-page-head");
+			if (!pageHeadNode.length) return 0;
+			// #endif
+			return this.systemInfo.windowTop || 0;
+		},
+		safeAreaBottom() {
+			if (!this.systemInfo) return 0;
+			let safeAreaBottom = 0;
+			// #ifdef APP-PLUS
+			safeAreaBottom = this.systemInfo.safeAreaInsets.bottom || 0 ;
+			// #endif
+			// #ifndef APP-PLUS
+			safeAreaBottom = Math.max(this.cssSafeAreaInsetBottom, 0);
+			// #endif
+			return safeAreaBottom;
+		},
+		isOldWebView() {
+			// #ifndef APP-NVUE || MP-KUAISHOU
+			try {
+				const systemInfos = uni.getSystemInfoSync().system.split(' ');
+				const deviceType = systemInfos[0];
+				const version = parseInt(systemInfos[1]);
+				if ((deviceType === 'iOS' && version <= 10) || (deviceType === 'Android' && version <= 6)) {
+					return true;
+				}
+			} catch(e) {
+				return false;
+			}
+			// #endif
+			return false;
+		},
+		zSlots() {
+			// #ifdef VUE2
+			
+			// #ifdef MP-ALIPAY
+			return this.$slots;
+			// #endif
+			
+			return this.$scopedSlots || this.$slots;
+			// #endif
+			
+			return this.$slots;
+		}
+	},
+	methods: {
+		//获取节点尺寸
+		_getNodeClientRect(select, inDom = true, scrollOffset = false) {
+			// #ifdef APP-NVUE
+			select = select.replace(/[.|#]/g, '');
+			const ref = this.$refs[select];
+			return new Promise((resolve, reject) => {
+				if (ref) {
+					weexDom.getComponentRect(ref, option => {
+						resolve(option && option.result ? [option.size] : false);
+					})
+				} else {
+					resolve(false);
+				}
+			});
+			return;
+			// #endif
+			//#ifdef MP-ALIPAY
+			inDom = false;
+			//#endif
+			let res = !!inDom ? uni.createSelectorQuery().in(inDom === true ? this : inDom) : uni.createSelectorQuery();
+			scrollOffset ? res.select(select).scrollOffset() : res.select(select).boundingClientRect();
+			return new Promise((resolve, reject) => {
+				res.exec(data => {
+					resolve((data && data != '' && data != undefined && data.length) ? data : false);
+				});
+			});
+		},
+		//获取slot="left"和slot="right"宽度并且更新布局
+		_updateLeftAndRightWidth(targetStyle, parentNodePrefix) {
+			this.$nextTick(() => {
+				let delayTime = 0;
+				// #ifdef MP-BAIDU
+				delayTime = 10;
+				// #endif
+				setTimeout(() => {
+					['left','right'].map(position => {
+						this._getNodeClientRect(`.${parentNodePrefix}-${position}`).then(res => {
+							this.$set(targetStyle, position, res ? res[0].width + 'px' : '0px');
+						});
+					})
+				}, delayTime)
+			})
+		},
+		//通过获取css设置的底部安全区域占位view高度设置bottom距离
+		_getCssSafeAreaInsetBottom(success) {
+			this._getNodeClientRect('.zp-safe-area-inset-bottom').then(res => {
+				this.cssSafeAreaInsetBottom = res ? res[0].height : -1;
+				res && success && success();
+			});
+		}
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/data-handle.js b/uni_modules/z-paging/components/z-paging/js/modules/data-handle.js
new file mode 100644
index 0000000..f917e53
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/data-handle.js
@@ -0,0 +1,741 @@
+// [z-paging]数据处理模块
+import u from '.././z-paging-utils'
+import c from '.././z-paging-constant'
+import Enum from '.././z-paging-enum'
+import interceptor from '../z-paging-interceptor'
+
+export default {
+	props: {
+		//自定义初始的pageNo，默认为1
+		defaultPageNo: {
+			type: [Number, String],
+			default: u.gc('defaultPageNo', 1),
+			observer: function(newVal) {
+				this.pageNo = newVal;
+			},
+		},
+		//自定义pageSize，默认为10
+		defaultPageSize: {
+			type: [Number, String],
+			default: u.gc('defaultPageSize', 10),
+			validator: (value) => {
+				if (value <= 0) u.consoleErr('default-page-size必须大于0！');
+				return value > 0;
+			}
+		},
+		//为保证数据一致，设置当前tab切换时的标识key，并在complete中传递相同key，若二者不一致，则complete将不会生效
+		dataKey: {
+			type: [Number, String, Object],
+			default: function() {
+				return u.gc('dataKey', null);
+			},
+		},
+		//使用缓存，若开启将自动缓存第一页的数据，默认为否。请注意，因考虑到切换tab时不同tab数据不同的情况，默认仅会缓存组件首次加载时第一次请求到的数据，后续的下拉刷新操作不会更新缓存。
+		useCache: {
+			type: Boolean,
+			default: u.gc('useCache', false)
+		},
+		//使用缓存时缓存的key，用于区分不同列表的缓存数据，useCache为true时必须设置，否则缓存无效
+		cacheKey: {
+			type: String,
+			default: u.gc('cacheKey', null)
+		},
+		//缓存模式，默认仅会缓存组件首次加载时第一次请求到的数据，可设置为always，即代表总是缓存，每次列表刷新(下拉刷新、调用reload等)都会更新缓存
+		cacheMode: {
+			type: String,
+			default: u.gc('cacheMode', Enum.CacheMode.Default)
+		},
+		//自动注入的list名，可自动修改父view(包含ref="paging")中对应name的list值
+		autowireListName: {
+			type: String,
+			default: u.gc('autowireListName', '')
+		},
+		//自动注入的query名，可自动调用父view(包含ref="paging")中的query方法
+		autowireQueryName: {
+			type: String,
+			default: u.gc('autowireQueryName', '')
+		},
+		//z-paging mounted后自动调用reload方法(mounted后自动调用接口)，默认为是
+		auto: {
+			type: Boolean,
+			default: u.gc('auto', true)
+		},
+		//用户下拉刷新时是否触发reload方法，默认为是
+		reloadWhenRefresh: {
+			type: Boolean,
+			default: u.gc('reloadWhenRefresh', true)
+		},
+		//reload时自动滚动到顶部，默认为是
+		autoScrollToTopWhenReload: {
+			type: Boolean,
+			default: u.gc('autoScrollToTopWhenReload', true)
+		},
+		//reload时立即自动清空原list，默认为是，若立即自动清空，则在reload之后、请求回调之前页面是空白的
+		autoCleanListWhenReload: {
+			type: Boolean,
+			default: u.gc('autoCleanListWhenReload', true)
+		},
+		//列表刷新时自动显示下拉刷新view，默认为否
+		showRefresherWhenReload: {
+			type: Boolean,
+			default: u.gc('showRefresherWhenReload', false)
+		},
+		//列表刷新时自动显示加载更多view，且为加载中状态，默认为否
+		showLoadingMoreWhenReload: {
+			type: Boolean,
+			default: u.gc('showLoadingMoreWhenReload', false)
+		},
+		//组件created时立即触发reload(可解决一些情况下先看到页面再看到loading的问题)，auto为true时有效。为否时将在mounted+nextTick后触发reload，默认为否
+		createdReload: {
+			type: Boolean,
+			default: u.gc('createdReload', false)
+		},
+		//本地分页时上拉加载更多延迟时间，单位为毫秒，默认200毫秒
+		localPagingLoadingTime: {
+			type: [Number, String],
+			default: u.gc('localPagingLoadingTime', 200)
+		},
+		//使用聊天记录模式，默认为否
+		useChatRecordMode: {
+			type: Boolean,
+			default: u.gc('useChatRecordMode', false)
+		},
+		//使用聊天记录模式时是否自动隐藏键盘：在用户触摸列表时候自动隐藏键盘，默认为是
+		autoHideKeyboardWhenChat: {
+			type: Boolean,
+			default: u.gc('autoHideKeyboardWhenChat', true)
+		},
+		//自动拼接complete中传过来的数组(使用聊天记录模式时无效)
+		concat: {
+			type: Boolean,
+			default: u.gc('concat', true)
+		},
+		//父组件v-model所绑定的list的值
+		value: {
+			type: Array,
+			default: function() {
+				return [];
+			}
+		},
+		// #ifdef VUE3
+		modelValue: {
+			type: Array,
+			default: function() {
+				return [];
+			}
+		}
+		// #endif
+	},
+	data (){
+		return {
+			currentData: [],
+			totalData: [],
+			realTotalData: [],
+			totalLocalPagingList: [],
+			dataPromiseResultMap: {
+				reload: null,
+				complete: null,
+				localPaging: null
+			},
+			isSettingCacheList: false,
+			pageNo: 1,
+			currentRefreshPageSize: 0,
+			isLocalPaging: false,
+			isAddedData: false,
+			isTotalChangeFromAddData: false,
+			privateConcat: true,
+			myParentQuery: -1,
+			firstPageLoaded: false,
+			pagingLoaded: false,
+			loaded: false,
+			isUserReload: true,
+			fromEmptyViewReload: false,
+			queryFrom: '',
+			listRendering: false,
+			isHandlingRefreshToPage: false
+		}
+	},
+	computed: {
+		pageSize() {
+			return this.defaultPageSize;
+		},
+		finalConcat() {
+			return this.concat && this.privateConcat;
+		},
+		finalUseCache() {
+			if (this.useCache && !this.cacheKey) {
+				u.consoleErr('use-cache为true时，必须设置cache-key，否则缓存无效！');
+			}
+			return this.useCache && !!this.cacheKey;
+		},
+		finalCacheKey() {
+			return this.cacheKey ? `${c.cachePrefixKey}-${this.cacheKey}` : null; 
+		},
+		isFirstPage() {
+			return this.pageNo === this.defaultPageNo;
+		}
+	},
+	watch: {
+		totalData(newVal, oldVal) {
+			this._totalDataChange(newVal, oldVal);
+		},
+		currentData(newVal, oldVal) {
+			this._currentDataChange(newVal, oldVal);
+		},
+		useChatRecordMode(newVal, oldVal) {
+			if (newVal) {
+				this.nLoadingMoreFixedHeight = false;
+			}
+		},
+		value: {
+			handler(newVal) {
+				this.realTotalData = newVal;
+			},
+			immediate: true
+		},
+		// #ifdef VUE3
+		modelValue: {
+			handler(newVal) {
+				this.realTotalData = newVal;
+			},
+			immediate: true
+		}
+		// #endif
+	},
+	methods: {
+		//请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging处理，第一个参数为请求结果数组，第二个参数为是否成功(默认是是）
+		complete(data, success = true) {
+			this.customNoMore = -1;
+			return this.addData(data, success);
+		},
+		//【保证数据一致】请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging处理，第一个参数为请求结果数组，第二个参数为dataKey，需与:data-key绑定的一致，第三个参数为是否成功(默认为是）
+		completeByKey(data, dataKey = null, success = true) {
+			if (dataKey !== null && this.dataKey !== null && dataKey !== this.dataKey) {
+				this.isFirstPage && this.endRefresh();
+				return new Promise(resolve => resolve());
+			}
+			this.customNoMore = -1;
+			return this.addData(data, success);
+		},
+		//【通过total判断是否有更多数据】请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging处理，第一个参数为请求结果数组，第二个参数为total(列表总数)，第三个参数为是否成功(默认为是）
+		completeByTotal(data, total, success = true) {
+			if (total == 'undefined') {
+				this.customNoMore = -1;
+			} else {
+				const dataTypeRes = this._checkDataType(data, success, false);
+				data = dataTypeRes.data;
+				success = dataTypeRes.success;
+				if (total >= 0 && success) {
+					return new Promise((resolve, reject) => {
+						this.$nextTick(() => {
+							let nomore = false;
+							const realTotalDataCount = this.pageNo == this.defaultPageNo ? 0 : this.realTotalData.length;
+							const dataLength = this.privateConcat ? data.length : 0;
+							let exceedCount = realTotalDataCount + dataLength - total;
+							if (exceedCount >= 0) {
+								nomore = true;
+								exceedCount = this.defaultPageSize - exceedCount;
+								if (this.privateConcat && exceedCount > 0 && exceedCount < data.length) {
+									data = data.splice(0, exceedCount);
+								}
+							}
+							this.completeByNoMore(data, nomore, success).then(res => resolve(res)).catch(() => reject());
+						})
+					});
+				}
+			}
+			return this.addData(data, success);
+		},
+		//【自行判断是否有更多数据】请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging处理，第一个参数为请求结果数组，第二个参数为是否有更多数据，第三个参数为是否成功(默认是是）
+		completeByNoMore(data, nomore, success = true) {
+			if (nomore != 'undefined') {
+				this.customNoMore = nomore == true ? 1 : 0;
+			}
+			return this.addData(data, success);
+		},
+		//与上方complete方法功能一致，新版本中设置服务端回调数组请使用complete方法
+		addData(data, success = true) {
+			if (!this.fromCompleteEmit) {
+				this.disabledCompleteEmit = true;
+				this.fromCompleteEmit = false;
+			}
+			const currentTimeStamp = u.getTime();
+			const disTime = currentTimeStamp - this.requestTimeStamp;
+			let minDelay = this.minDelay;
+			if (this.isFirstPage && this.finalShowRefresherWhenReload) {
+				minDelay = Math.max(400, minDelay);
+			}
+			const addDataDalay = (this.requestTimeStamp > 0 && disTime < minDelay) ? minDelay - disTime : 0;
+			this.$nextTick(() => {
+				u.delay(() => {
+					this._addData(data, success, false);
+				}, this.delay > 0 ? this.delay : addDataDalay)
+			})
+			
+			return new Promise((resolve, reject) => {
+				this.dataPromiseResultMap.complete = { resolve, reject };
+			});
+		},
+		//从顶部添加数据，不会影响分页的pageNo和pageSize
+		addDataFromTop(data, toTop = true, toTopWithAnimate = true) {
+			data = Object.prototype.toString.call(data) !== '[object Array]' ? [data] : data.reverse();
+			// #ifndef APP-NVUE
+			this.finalUseVirtualList && this._setCellIndex(data, 'top')
+			// #endif
+			this.totalData = [...data, ...this.totalData];
+			if (toTop) {
+				u.delay(() => this._scrollToTop(toTopWithAnimate));
+			}
+		},
+		//重新设置列表数据，调用此方法不会影响pageNo和pageSize，也不会触发请求。适用场景：当需要删除列表中某一项时，将删除对应项后的数组通过此方法传递给z-paging。(当出现类似的需要修改列表数组的场景时，请使用此方法，请勿直接修改page中:list.sync绑定的数组)
+		resetTotalData(data) {
+			this.isTotalChangeFromAddData = true;
+			data = Object.prototype.toString.call(data) !== '[object Array]' ? [data] : data;
+			this.totalData = data;
+		},
+		//添加聊天记录
+		addChatRecordData(data, toBottom = true, toBottomWithAnimate = true) {
+			data = Object.prototype.toString.call(data) !== '[object Array]' ? [data] : data;
+			if (!this.useChatRecordMode) return;
+			this.isTotalChangeFromAddData = true;
+			//#ifndef APP-NVUE
+			this.totalData = [...this.totalData, ...data];
+			//#endif
+			//#ifdef APP-NVUE
+			this.totalData = this.nIsFirstPageAndNoMore ? [...this.totalData, ...data] : [...data, ...this.totalData];
+			//#endif
+			if (toBottom) {
+				u.delay(() => {
+					//#ifndef APP-NVUE
+					this._scrollToBottom(toBottomWithAnimate);
+					//#endif
+					//#ifdef APP-NVUE
+					this.nIsFirstPageAndNoMore ? this._scrollToBottom(toBottomWithAnimate) : this._scrollToTop(toBottomWithAnimate);
+					//#endif
+				})
+			}
+		},
+		//设置本地分页数据，请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging作分页处理（若调用了此方法，则上拉加载更多时内部会自动分页，不会触发@query所绑定的事件）
+		setLocalPaging(data, success = true) {
+			this.isLocalPaging = true;
+			this.$nextTick(() => {
+				this._addData(data, success, true);
+			})
+			return new Promise((resolve, reject) => {
+				this.dataPromiseResultMap.localPaging = { resolve, reject };
+			});
+		},
+		//重新加载分页数据，pageNo会恢复为默认值，相当于下拉刷新的效果(animate为true时会展示下拉刷新动画，默认为false)
+		reload(animate = this.showRefresherWhenReload) {
+			if (animate) {
+				this.privateShowRefresherWhenReload = animate;
+				this.isUserPullDown = true;
+			}
+			if (!this.showLoadingMoreWhenReload) {
+				this.listRendering = true;
+			}
+			this.$nextTick(() => {
+				this._preReload(animate, false);
+			})
+			return new Promise((resolve, reject) => {
+				this.dataPromiseResultMap.reload = { resolve, reject };
+			});
+		},
+		//刷新列表数据，pageNo和pageSize不会重置，列表数据会重新从服务端获取。必须保证@query绑定的方法中的pageNo和pageSize和传给服务端的一致
+		refresh() {
+			return this._handleRefreshWithDisPageNo(this.pageNo - this.defaultPageNo + 1);
+		},
+		//刷新列表数据至指定页，例如pageNo=5时则代表刷新列表至第5页，此时pageNo会变为5，列表会展示前5页的数据。必须保证@query绑定的方法中的pageNo和pageSize和传给服务端的一致
+		refreshToPage(pageNo) {
+			this.isHandlingRefreshToPage = true;
+			return this._handleRefreshWithDisPageNo(pageNo + this.defaultPageNo - 1);
+		},
+		//手动更新列表缓存数据，将自动截取v-model绑定的list中的前pageSize条覆盖缓存，请确保在list数据更新到预期结果后再调用此方法
+		updateCache() {
+			if (this.finalUseCache && this.totalData.length) {
+				this._saveLocalCache(this.totalData.slice(0, Math.min(this.totalData.length, this.pageSize)));
+			}
+		},
+		//清空分页数据
+		clean() {
+			this._reload(true);
+			this._addData([], true, false);
+		},
+		//清空分页数据
+		clear() {
+			this.clean();
+		},
+		//手动触发滚动到顶部加载更多，聊天记录模式时有效
+		doChatRecordLoadMore() {
+			this.useChatRecordMode && this._onLoadingMore('click');
+		},
+		//reload之前的一些处理
+		_preReload(animate = this.showRefresherWhenReload, isFromMounted = true) {
+			const showRefresher = this.finalRefresherEnabled && this.useCustomRefresher;
+			// #ifndef APP-NVUE
+			if (this.customRefresherHeight === -1 && showRefresher) {
+				u.delay(() => this._preReload(animate, isFromMounted), c.delayTime / 2);
+				return;
+			}
+			// #endif
+			this.isUserReload = true;
+			this.loadingType = Enum.LoadingType.Refresher;
+			if (animate) {
+				this.privateShowRefresherWhenReload = animate;
+				// #ifndef APP-NVUE
+				if (this.useCustomRefresher) {
+					this._doRefresherRefreshAnimate();
+				} else {
+					this.refresherTriggered = true;
+				}
+				// #endif
+				// #ifdef APP-NVUE
+				this.refresherStatus = Enum.Refresher.Loading;
+				this.refresherRevealStackCount ++;
+				u.delay(() => {
+					this._getNodeClientRect('zp-n-refresh-container', false).then((node) => {
+						if (node) {
+							let nodeHeight = node[0].height;
+							this.nShowRefresherReveal = true;
+							this.nShowRefresherRevealHeight = nodeHeight;
+							u.delay(() => {
+								this._nDoRefresherEndAnimation(0, -nodeHeight, false, false);
+								u.delay(() => {
+									this._nDoRefresherEndAnimation(nodeHeight, 0);
+								}, 10)
+							}, 10)
+						}
+						this._reload(false, isFromMounted);
+						this._doRefresherLoad(false);
+					});
+				}, this.pagingLoaded ? 10 : 100)
+				return;
+				// #endif
+			} else {
+				this._refresherEnd(false, false, false, false);
+			}
+			this._reload(false, isFromMounted);
+		},
+		//重新加载分页数据
+		_reload(isClean = false, isFromMounted = false, isUserPullDown = false) {
+			this.isAddedData = false;
+			this.insideOfPaging = -1;
+			this.cacheScrollNodeHeight = -1;
+			this.pageNo = this.defaultPageNo;
+			this._cleanRefresherEndTimeout();
+			!this.privateShowRefresherWhenReload && !isClean && this._startLoading(true);
+			this.firstPageLoaded = true;
+			this.isTotalChangeFromAddData = false;
+			if (!this.isSettingCacheList) {
+				this.totalData = [];
+			}
+			if (!isClean) {
+				this._emitQuery(this.pageNo, this.defaultPageSize, isUserPullDown ? Enum.QueryFrom.UserPullDown : Enum.QueryFrom.Reload);
+				let delay = 0;
+				// #ifdef MP-TOUTIAO
+				delay = 5;
+				// #endif
+				u.delay(this._callMyParentQuery, delay);
+				if (!isFromMounted && this.autoScrollToTopWhenReload) {
+					let checkedNRefresherLoading = true;
+					// #ifdef APP-NVUE
+					checkedNRefresherLoading = !this.nRefresherLoading;
+					// #endif
+					checkedNRefresherLoading && this._scrollToTop(false);
+				}
+			}
+			// #ifdef APP-NVUE
+			this.$nextTick(() => {
+				this.nShowBottom = this.realTotalData.length > 0;
+			})
+			// #endif
+		},
+		//处理服务端返回的数组
+		_addData(data, success, isLocal) {
+			this.isAddedData = true;
+			this.fromEmptyViewReload = false;
+			this.isTotalChangeFromAddData = true;
+			this.refresherTriggered = false;
+			this._endSystemLoadingAndRefresh();
+			const tempIsUserPullDown = this.isUserPullDown;
+			if (this.showRefresherUpdateTime && this.isFirstPage) {
+				u.setRefesrherTime(u.getTime(), this.refresherUpdateTimeKey);
+				this.$refs.refresh && this.$refs.refresh.updateTime();
+			}
+			if (!isLocal && tempIsUserPullDown && this.isFirstPage) {
+				this.isUserPullDown = false;
+			}
+			if (!this.isFirstPage) {
+				this.listRendering = true;
+				this.$nextTick(() => {
+					u.delay(() => this.listRendering = false);
+				})
+			} else {
+				this.listRendering = false;
+			}
+			let dataTypeRes = this._checkDataType(data, success, isLocal);
+			data = dataTypeRes.data;
+			success = dataTypeRes.success;
+			let delayTime = c.delayTime;
+			// #ifdef APP-NVUE
+			if (this.useChatRecordMode) delayTime = 0;
+			// #endif
+			this.loadingForNow = false;
+			u.delay(() => {
+				this.pagingLoaded = true;
+				this.$nextTick(()=>{
+					!isLocal && this._refresherEnd(delayTime > 0, true, tempIsUserPullDown);
+				})
+			})
+			if (this.isFirstPage) {
+				this.isLoadFailed = !success;
+				this.$emit('isLoadFailedChange', this.isLoadFailed);
+				if (this.finalUseCache && success && (this.cacheMode === Enum.CacheMode.Always ? true : this.isSettingCacheList)) {
+					this._saveLocalCache(data);
+				}
+			}
+			this.isSettingCacheList = false;
+			if (success) {
+				if (!(this.privateConcat === false && this.loadingStatus === Enum.More.NoMore)) {
+					this.loadingStatus = Enum.More.Default;
+				}
+				if (isLocal) {
+					this.totalLocalPagingList = data;
+					const localPageNo = this.defaultPageNo;
+					const localPageSize = this.queryFrom !== Enum.QueryFrom.Refresh ? this.defaultPageSize : this.currentRefreshPageSize;
+					this._localPagingQueryList(localPageNo, localPageSize, 0, res => {
+						this.completeByTotal(res, this.totalLocalPagingList.length);
+					})
+				} else {
+					let dataChangeDelayTime = 0;
+					// #ifdef APP-NVUE
+					if (this.privateShowRefresherWhenReload && this.finalNvueListIs === 'waterfall') {
+						dataChangeDelayTime = 150;
+					}
+					// #endif
+					u.delay(() => {
+						this._currentDataChange(data, this.currentData);
+						this._callDataPromise(true, this.totalData);
+					}, dataChangeDelayTime)
+				}
+				if (this.isHandlingRefreshToPage) {
+					this.isHandlingRefreshToPage = false;
+					this.pageNo = this.defaultPageNo + Math.ceil(data.length / this.pageSize) - 1;
+					if (data.length % this.pageSize !== 0) {
+						this.customNoMore = 1;
+					}
+				}
+			} else {
+				this._currentDataChange(data, this.currentData);
+				this._callDataPromise(false);
+				this.loadingStatus = Enum.More.Fail;
+				this.isHandlingRefreshToPage = false;
+				if (this.loadingType === Enum.LoadingType.LoadingMore) {
+					this.pageNo --;
+				}
+			}
+		},
+		//所有数据改变时调用
+		_totalDataChange(newVal, oldVal, eventThrow=true) {
+			if ((!this.isUserReload || !this.autoCleanListWhenReload) && this.firstPageLoaded && !newVal.length && oldVal.length) {
+				return;
+			}
+			this._doCheckScrollViewShouldFullHeight(newVal);
+			if(!this.realTotalData.length && !newVal.length){
+				eventThrow = false;
+			}
+			this.realTotalData = newVal;
+			if (eventThrow) {
+				this.$emit('input', newVal);
+				// #ifdef VUE3
+				this.$emit('update:modelValue', newVal);
+				// #endif
+				this.$emit('update:list', newVal);
+				this.$emit('listChange', newVal);
+				this._callMyParentList(newVal);
+			}
+			this.firstPageLoaded = false;
+			this.isTotalChangeFromAddData = false;
+			this.$nextTick(() => {
+				u.delay(()=>{
+					this._getNodeClientRect('.zp-paging-container-content').then(res => {
+						res && this.$emit('contentHeightChanged', res[0].height);
+					});
+				}, c.delayTime * (this.isIos ? 1 : 3))
+				// #ifdef APP-NVUE
+				if (this.useChatRecordMode && this.nIsFirstPageAndNoMore && this.isFirstPage && !this.nFirstPageAndNoMoreChecked) {
+					this.nFirstPageAndNoMoreChecked = true;
+					this._scrollToBottom(false);
+				}
+				u.delay(() => {
+					this.nShowBottom = true;
+				}, c.delayTime * 6, 'nShowBottomDelay');
+				// #endif
+			})
+		},
+		//当前数据改变时调用
+		_currentDataChange(newVal, oldVal) {
+			newVal = [...newVal];
+			// #ifndef APP-NVUE
+			this.finalUseVirtualList && this._setCellIndex(newVal, 'bottom');
+			this.useChatRecordMode && newVal.reverse();
+			// #endif
+			if (this.isFirstPage && this.finalConcat) {
+				this.totalData = [];
+			}
+			if (this.customNoMore !== -1) {
+				if (this.customNoMore === 1 || !newVal.length) {
+					this.loadingStatus = Enum.More.NoMore;
+				}
+			} else {
+				if (!newVal.length || (newVal.length && newVal.length < this.defaultPageSize)) {
+					this.loadingStatus = Enum.More.NoMore;
+				}
+			}
+			if (!this.totalData.length) {
+				if (this.finalConcat) {
+					// #ifdef APP-NVUE
+					if (this.useChatRecordMode && this.isFirstPage && this.loadingStatus === Enum.More.NoMore) {
+						newVal.reverse();
+					}
+					// #endif
+					this.totalData = newVal;
+				}
+				if (this.useChatRecordMode) {
+					// #ifndef APP-NVUE
+					this.$nextTick(() => {
+						this._scrollToBottom(false);
+					})
+					// #endif
+				}
+			} else {
+				if (this.useChatRecordMode) {
+					// #ifdef APP-NVUE
+					this.totalData = [...this.totalData, ...newVal];
+					// #endif
+					//#ifndef APP-NVUE
+					const idIndex = newVal.length;
+					let idIndexStr = `z-paging-${idIndex}`;
+					this.totalData = [...newVal, ...this.totalData];
+					if (this.pageNo !== this.defaultPageNo) {
+						this.privateScrollWithAnimation = 0;
+						this.$emit('update:chatIndex', idIndex);
+						this.$nextTick(() => {
+							this._scrollIntoView(idIndexStr, 30 + Math.max(0, this.cacheTopHeight), false, () => {
+								this.$emit('update:chatIndex', 0);
+							});
+						})
+					} else {
+						this.$nextTick(() => {
+							this._scrollToBottom(false);
+						})
+					}
+					//#endif
+		
+				} else {
+					if (this.finalConcat) {
+						const currentScrollTop = this.oldScrollTop;
+						this.totalData = [...this.totalData, ...newVal];
+						// #ifdef MP-WEIXIN
+						if (!this.isIos && !this.refresherOnly && !this.usePageScroll && newVal.length) {
+							this.loadingMoreTimeStamp = u.getTime();
+							this.$nextTick(() => {
+								this.scrollToY(currentScrollTop);
+							})
+						}
+						// #endif
+					} else {
+						this.totalData = newVal;
+					}
+				}
+			}
+			this.privateConcat = true;
+		},
+		//根据pageNo处理refresh操作
+		_handleRefreshWithDisPageNo(pageNo) {
+			if (!this.realTotalData.length) return this.reload();
+			if (pageNo >= 1) {
+				this.loading = true;
+				this.privateConcat = false;
+				const totalPageSize = pageNo * this.pageSize;
+				this.currentRefreshPageSize = totalPageSize;
+				this._emitQuery(this.defaultPageNo, totalPageSize, Enum.QueryFrom.Refresh);
+				this._callMyParentQuery(this.defaultPageNo, totalPageSize);
+			}
+			return new Promise((resolve, reject) => {
+				this.dataPromiseResultMap.reload = { resolve, reject };
+			});
+		},
+		//本地分页请求
+		_localPagingQueryList(pageNo, pageSize, localPagingLoadingTime, callback) {
+			pageNo = Math.max(1, pageNo);
+			pageSize = Math.max(1, pageSize);
+			const totalPagingList = [...this.totalLocalPagingList];
+			const pageNoIndex = (pageNo - 1) * pageSize;
+			const finalPageNoIndex = Math.min(totalPagingList.length, pageNoIndex + pageSize);
+			const resultPagingList = totalPagingList.splice(pageNoIndex, finalPageNoIndex - pageNoIndex);
+			u.delay(() => callback(resultPagingList), localPagingLoadingTime)
+		},
+		//存储列表缓存数据
+		_saveLocalCache(data) {
+			uni.setStorageSync(this.finalCacheKey, data);
+		},
+		//通过缓存数据填充列表数据
+		_setListByLocalCache() {
+			this.totalData = uni.getStorageSync(this.finalCacheKey) || [];
+			this.isSettingCacheList = true;
+		},
+		//修改父view的list
+		_callMyParentList(newVal) {
+			if (this.autowireListName.length) {
+				const myParent = u.getParent(this.$parent);
+				if (myParent && myParent[this.autowireListName]) {
+					myParent[this.autowireListName] = newVal;
+				}
+			}
+		},
+		//调用父view的query
+		_callMyParentQuery(customPageNo = 0, customPageSize = 0) {
+			if (this.autowireQueryName) {
+				if (this.myParentQuery === -1) {
+					const myParent = u.getParent(this.$parent);
+					if (myParent && myParent[this.autowireQueryName]) {
+						this.myParentQuery = myParent[this.autowireQueryName];
+					}
+				} 
+				if (this.myParentQuery !== -1) {
+					customPageSize > 0 ? this.myParentQuery(customPageNo, customPageSize) : this.myParentQuery(this.pageNo, this.defaultPageSize);
+				}
+			}
+		},
+		//emit query事件
+		_emitQuery(pageNo, pageSize, from){
+			this.queryFrom = from;
+			this.requestTimeStamp = u.getTime();
+			const [lastItem] = this.realTotalData.slice(-1);
+			this.$emit('query', ...interceptor._handleQuery(pageNo, pageSize, from, lastItem || null));
+		},
+		//触发数据改变promise
+		_callDataPromise(success, totalList) {
+			for (const key in this.dataPromiseResultMap) {
+				const obj = this.dataPromiseResultMap[key];
+				if (!obj) break;
+				success ? obj.resolve({ totalList, noMore: this.loadingStatus === Enum.More.NoMore }) : obj.reject(`z-paging-${key}-error`);
+			}
+		},
+		//检查complete data的类型
+		_checkDataType(data, success, isLocal) {
+			const dataType = Object.prototype.toString.call(data);
+			if (dataType === '[object Boolean]') {
+				success = data;
+				data = [];
+			} else if (dataType !== '[object Array]') {
+				data = [];
+				if (dataType !== '[object Undefined]' && dataType !== '[object Null]') {
+					u.consoleErr(`${isLocal ? 'setLocalPaging' : 'complete'}参数类型不正确，第一个参数类型必须为Array!`);
+				}
+			}
+			return { data, success };
+		},
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/empty.js b/uni_modules/z-paging/components/z-paging/js/modules/empty.js
new file mode 100644
index 0000000..fdf7be0
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/empty.js
@@ -0,0 +1,147 @@
+// [z-paging]空数据图view模块
+import u from '.././z-paging-utils'
+
+export default {
+	props: {
+		//是否强制隐藏空数据图，默认为否
+		hideEmptyView: {
+			type: Boolean,
+			default: u.gc('hideEmptyView', false)
+		},
+		//空数据图描述文字，默认为“没有数据哦~”
+		emptyViewText: {
+			type: [String, Object],
+			default: u.gc('emptyViewText', null)
+		},
+		//是否显示空数据图重新加载按钮(无数据时)，默认为否
+		showEmptyViewReload: {
+			type: Boolean,
+			default: u.gc('showEmptyViewReload', false)
+		},
+		//加载失败时是否显示空数据图重新加载按钮，默认为是
+		showEmptyViewReloadWhenError: {
+			type: Boolean,
+			default: u.gc('showEmptyViewReloadWhenError', true)
+		},
+		//空数据图点击重新加载文字，默认为“重新加载”
+		emptyViewReloadText: {
+			type: [String, Object],
+			default: u.gc('emptyViewReloadText', null)
+		},
+		//空数据图图片，默认使用z-paging内置的图片
+		emptyViewImg: {
+			type: String,
+			default: u.gc('emptyViewImg', '')
+		},
+		//空数据图“加载失败”描述文字，默认为“很抱歉，加载失败”
+		emptyViewErrorText: {
+			type: [String, Object],
+			default: u.gc('emptyViewErrorText', null)
+		},
+		//空数据图“加载失败”图片，默认使用z-paging内置的图片
+		emptyViewErrorImg: {
+			type: String,
+			default: u.gc('emptyViewErrorImg', '')
+		},
+		//空数据图样式
+		emptyViewStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('emptyViewStyle', {});
+			}
+		},
+		//空数据图容器样式
+		emptyViewSuperStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('emptyViewSuperStyle', {});
+			}
+		},
+		//空数据图img样式
+		emptyViewImgStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('emptyViewImgStyle', {});
+			}
+		},
+		//空数据图描述文字样式
+		emptyViewTitleStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('emptyViewTitleStyle', {});
+			}
+		},
+		//空数据图重新加载按钮样式
+		emptyViewReloadStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('emptyViewReloadStyle', {});
+			}
+		},
+		//空数据图片是否铺满z-paging，默认为否，即填充满z-paging内列表(滚动区域)部分。若设置为否，则为填铺满整个z-paging
+		emptyViewFixed: {
+			type: Boolean,
+			default: u.gc('emptyViewFixed', false)
+		},
+		//空数据图片是否垂直居中，默认为是，若设置为否即为从空数据容器顶部开始显示。emptyViewFixed为false时有效
+		emptyViewCenter: {
+			type: Boolean,
+			default: u.gc('emptyViewCenter', true)
+		},
+		//加载中时是否自动隐藏空数据图，默认为是
+		autoHideEmptyViewWhenLoading: {
+			type: Boolean,
+			default: u.gc('autoHideEmptyViewWhenLoading', true)
+		},
+		//用户下拉列表触发下拉刷新加载中时是否自动隐藏空数据图，默认为是
+		autoHideEmptyViewWhenPull: {
+			type: Boolean,
+			default: u.gc('autoHideEmptyViewWhenPull', true)
+		},
+		//空数据view的z-index，默认为9
+		emptyViewZIndex: {
+			type: Number,
+			default: u.gc('emptyViewZIndex', 9)
+		},
+	},
+	computed: {
+		finalEmptyViewImg() {
+			return this.isLoadFailed ? this.emptyViewErrorImg : this.emptyViewImg;
+		},
+		finalShowEmptyViewReload() {
+			return this.isLoadFailed ? this.showEmptyViewReloadWhenError : this.showEmptyViewReload;
+		},
+		showEmpty() {
+			if (this.refresherOnly || this.hideEmptyView || this.realTotalData.length) return false;
+			if (this.autoHideEmptyViewWhenLoading) {
+				if (this.isAddedData && !this.firstPageLoaded && !this.loading) return true;
+			} else {
+				return true;
+			}
+			return !this.autoHideEmptyViewWhenPull && !this.isUserReload;
+		},
+	},
+	methods: {
+		//点击了空数据view重新加载按钮
+		_emptyViewReload() {
+			let callbacked = false;
+			this.$emit('emptyViewReload', reload => {
+				if (reload === undefined || reload === true) {
+					this.fromEmptyViewReload = true;
+					this.reload().catch(() => {});
+				}
+				callbacked = true;
+			});
+			this.$nextTick(() => {
+				if (!callbacked) {
+					this.fromEmptyViewReload = true;
+					this.reload().catch(() => {});
+				}
+			})
+		},
+		//点击了空数据view
+		_emptyViewClick() {
+			this.$emit('emptyViewClick');
+		},
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/i18n.js b/uni_modules/z-paging/components/z-paging/js/modules/i18n.js
new file mode 100644
index 0000000..6502df9
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/i18n.js
@@ -0,0 +1,101 @@
+// [z-paging]i18n模块
+import { initVueI18n } from '@dcloudio/uni-i18n'
+import messages from '../../i18n/index.js'
+const { t } = initVueI18n(messages)
+
+import u from '.././z-paging-utils'
+import c from '.././z-paging-constant'
+import interceptor from '../z-paging-interceptor'
+
+const language = uni.getSystemInfoSync().language;
+export default {
+	data() {
+		return {
+			language
+		}
+	},
+	computed: {
+		finalLanguage() {
+			try {
+				const local = uni.getLocale();
+				const language = this.language;
+				return local === 'auto' ? interceptor._handleLanguage2Local(language, this._language2Local(language)) : local;
+			} catch (e) {
+				return 'zh-Hans';
+			}
+		},
+		finalRefresherDefaultText() {
+			return this._getI18nText('zp.refresher.default', this.refresherDefaultText);
+		},
+		finalRefresherPullingText() {
+			return this._getI18nText('zp.refresher.pulling', this.refresherPullingText);
+		},
+		finalRefresherRefreshingText() {
+			return this._getI18nText('zp.refresher.refreshing', this.refresherRefreshingText);
+		},
+		finalRefresherCompleteText() {
+			return this._getI18nText('zp.refresher.complete', this.refresherCompleteText);
+		},
+		finalRefresherUpdateTimeTextMap() {
+			return {
+				title: t('zp.refresherUpdateTime.title'),
+				none: t('zp.refresherUpdateTime.none'),
+				today: t('zp.refresherUpdateTime.today'),
+				yesterday: t('zp.refresherUpdateTime.yesterday')
+			};
+		},
+		finalLoadingMoreDefaultText() {
+			return this._getI18nText('zp.loadingMore.default', this.loadingMoreDefaultText);
+		},
+		finalLoadingMoreLoadingText() {
+			return this._getI18nText('zp.loadingMore.loading', this.loadingMoreLoadingText);
+		},
+		finalLoadingMoreNoMoreText() {
+			return this._getI18nText('zp.loadingMore.noMore', this.loadingMoreNoMoreText);
+		},
+		finalLoadingMoreFailText() {
+			return this._getI18nText('zp.loadingMore.fail', this.loadingMoreFailText);
+		},
+		finalEmptyViewText() {
+			return this.isLoadFailed ? this.finalEmptyViewErrorText : this._getI18nText('zp.emptyView.title', this.emptyViewText);
+		},
+		finalEmptyViewReloadText() {
+			return this._getI18nText('zp.emptyView.reload', this.emptyViewReloadText);
+		},
+		finalEmptyViewErrorText() {
+			return this._getI18nText('zp.emptyView.error', this.emptyViewErrorText);
+		},
+		finalSystemLoadingText() {
+			return this._getI18nText('zp.systemLoading.title', this.systemLoadingText);
+		},
+	},
+	methods: {
+		//获取当前z-paging的语言
+		getLanguage() {
+			return this.finalLanguage;
+		},
+		//获取国际化转换后的文本
+		_getI18nText(key, value) {
+			const dataType = Object.prototype.toString.call(value);
+			if (dataType === '[object Object]') {
+				const nextValue = value[this.finalLanguage];
+				if (nextValue) return nextValue;
+			} else if (dataType === '[object String]') {
+				return value;
+			}
+			return t(key);
+		},
+		//系统language转i18n local
+		_language2Local(language) {
+			const formatedLanguage = language.toLowerCase().replace(new RegExp('_', ''), '-');
+			if (formatedLanguage.indexOf('zh') !== -1) {
+				if (formatedLanguage === 'zh' || formatedLanguage === 'zh-cn' || formatedLanguage.indexOf('zh-hans') !== -1) {
+					return 'zh-Hans';
+				}
+				return 'zh-Hant';
+			}
+			if (formatedLanguage.indexOf('en') !== -1) return 'en';
+			return language;
+		}
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/load-more.js b/uni_modules/z-paging/components/z-paging/js/modules/load-more.js
new file mode 100644
index 0000000..950531c
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/load-more.js
@@ -0,0 +1,315 @@
+// [z-paging]滚动到底部加载更多模块
+import u from '.././z-paging-utils'
+import Enum from '.././z-paging-enum'
+
+export default {
+	props: {
+		//自定义底部加载更多样式
+		loadingMoreCustomStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('loadingMoreCustomStyle', {});
+			}
+		},
+		//自定义底部加载更多文字样式
+		loadingMoreTitleCustomStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('loadingMoreTitleCustomStyle', {});
+			}
+		},
+		//自定义底部加载更多加载中动画样式
+		loadingMoreLoadingIconCustomStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('loadingMoreLoadingIconCustomStyle', {});
+			}
+		},
+		//自定义底部加载更多加载中动画图标类型，可选flower或circle，默认为flower
+		loadingMoreLoadingIconType: {
+			type: String,
+			default: u.gc('loadingMoreLoadingIconType', 'flower')
+		},
+		//自定义底部加载更多加载中动画图标图片
+		loadingMoreLoadingIconCustomImage: {
+			type: String,
+			default: u.gc('loadingMoreLoadingIconCustomImage', '')
+		},
+		//底部加载更多加载中view是否展示旋转动画，默认为是
+		loadingMoreLoadingAnimated: {
+			type: Boolean,
+			default: u.gc('loadingMoreLoadingAnimated', true)
+		},
+		//是否启用加载更多数据(含滑动到底部加载更多数据和点击加载更多数据)，默认为是
+		loadingMoreEnabled: {
+			type: Boolean,
+			default: u.gc('loadingMoreEnabled', true)
+		},
+		//是否启用滑动到底部加载更多数据，默认为是
+		toBottomLoadingMoreEnabled: {
+			type: Boolean,
+			default: u.gc('toBottomLoadingMoreEnabled', true)
+		},
+		//滑动到底部状态为默认状态时，以加载中的状态展示，默认为否。若设置为是，可避免滚动到底部看到默认状态然后立刻变为加载中状态的问题，但分页数量未超过一屏时，不会显示【点击加载更多】
+		loadingMoreDefaultAsLoading: {
+			type: [Boolean],
+			default: u.gc('loadingMoreDefaultAsLoading', false)
+		},
+		//滑动到底部"默认"文字，默认为【点击加载更多】
+		loadingMoreDefaultText: {
+			type: [String, Object],
+			default: u.gc('loadingMoreDefaultText', null)
+		},
+		//滑动到底部"加载中"文字，默认为【正在加载...】
+		loadingMoreLoadingText: {
+			type: [String, Object],
+			default: u.gc('loadingMoreLoadingText', null)
+		},
+		//滑动到底部"没有更多"文字，默认为【没有更多了】
+		loadingMoreNoMoreText: {
+			type: [String, Object],
+			default: u.gc('loadingMoreNoMoreText', null)
+		},
+		//滑动到底部"加载失败"文字，默认为【加载失败，点击重新加载】
+		loadingMoreFailText: {
+			type: [String, Object],
+			default: u.gc('loadingMoreFailText', null)
+		},
+		//当没有更多数据且分页内容未超出z-paging时是否隐藏没有更多数据的view，默认为否
+		hideNoMoreInside: {
+			type: Boolean,
+			default: u.gc('hideNoMoreInside', false)
+		},
+		//当没有更多数据且分页数组长度少于这个值时，隐藏没有更多数据的view，默认为0，代表不限制。
+		hideNoMoreByLimit: {
+			type: Number,
+			default: u.gc('hideNoMoreByLimit', 0)
+		},
+		//是否显示默认的加载更多text，默认为是
+		showDefaultLoadingMoreText: {
+			type: Boolean,
+			default: u.gc('showDefaultLoadingMoreText', true)
+		},
+		//是否显示没有更多数据的view
+		showLoadingMoreNoMoreView: {
+			type: Boolean,
+			default: u.gc('showLoadingMoreNoMoreView', true)
+		},
+		//是否显示没有更多数据的分割线，默认为是
+		showLoadingMoreNoMoreLine: {
+			type: Boolean,
+			default: u.gc('showLoadingMoreNoMoreLine', true)
+		},
+		//自定义底部没有更多数据的分割线样式
+		loadingMoreNoMoreLineCustomStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('loadingMoreNoMoreLineCustomStyle', {});
+			},
+		},
+		//当分页未满一屏时，是否自动加载更多，默认为否(nvue无效)
+		insideMore: {
+			type: Boolean,
+			default: u.gc('insideMore', false)
+		},
+		//距底部/右边多远时（单位px），触发 scrolltolower 事件，默认为100rpx
+		lowerThreshold: {
+			type: [Number, String],
+			default: u.gc('lowerThreshold', '100rpx')
+		},
+	},
+	data() {
+		return {
+			M: Enum.More,
+			//底部加载更多状态
+			loadingStatus: Enum.More.Default,
+			loadingStatusAfterRender: Enum.More.Default,
+			loadingMoreTimeStamp: 0,
+			loadingMoreDefaultSlot: null,
+			showLoadingMore: false,
+			customNoMore: -1,
+		}
+	},
+	computed: {
+		zLoadMoreConfig() {
+			return {
+				status: this.loadingStatusAfterRender,
+				defaultAsLoading: this.loadingMoreDefaultAsLoading,
+				defaultThemeStyle: this.finalLoadingMoreThemeStyle,
+				customStyle: this.loadingMoreCustomStyle,
+				titleCustomStyle: this.loadingMoreTitleCustomStyle,
+				iconCustomStyle: this.loadingMoreLoadingIconCustomStyle,
+				loadingIconType: this.loadingMoreLoadingIconType,
+				loadingIconCustomImage: this.loadingMoreLoadingIconCustomImage,
+				loadingAnimated: this.loadingMoreLoadingAnimated,
+				showNoMoreLine: this.showLoadingMoreNoMoreLine,
+				noMoreLineCustomStyle: this.loadingMoreNoMoreLineCustomStyle,
+				defaultText: this.finalLoadingMoreDefaultText,
+				loadingText: this.finalLoadingMoreLoadingText,
+				noMoreText: this.finalLoadingMoreNoMoreText,
+				failText: this.finalLoadingMoreFailText,
+				hideContent: !this.loadingMoreDefaultAsLoading && this.listRendering,
+			};
+		},
+		finalLoadingMoreThemeStyle() {
+			return this.loadingMoreThemeStyle.length ? this.loadingMoreThemeStyle : this.defaultThemeStyle;
+		},
+		showLoadingMoreDefault() {
+			return this._showLoadingMore('Default');
+		},
+		showLoadingMoreLoading() {
+			return this._showLoadingMore('Loading');
+		},
+		showLoadingMoreNoMore() {
+			return this._showLoadingMore('NoMore');
+		},
+		showLoadingMoreFail() {
+			return this._showLoadingMore('Fail');
+		},
+		showLoadingMoreCustom() {
+			return this._showLoadingMore('Custom');
+		}
+	},
+	methods: {
+		//页面滚动到底部时通知z-paging进行进一步处理
+		pageReachBottom() {
+			!this.useChatRecordMode && this._onLoadingMore('toBottom');
+		},
+		//手动触发上拉加载更多(非必须，可依据具体需求使用)
+		doLoadMore(type) {
+			this._onLoadingMore(type);
+		},
+		//通过@scroll事件检测是否滚动到了底部
+		_checkScrolledToBottom(scrollDiff, checked = false) {
+			if (this.cacheScrollNodeHeight === -1) {
+				this._getNodeClientRect('.zp-scroll-view').then((res) => {
+					if (res) {
+						const pageScrollNodeHeight = res[0].height;
+						this.cacheScrollNodeHeight = pageScrollNodeHeight;
+						if (scrollDiff - pageScrollNodeHeight <= this.finalLowerThreshold) {
+							this._onLoadingMore('toBottom');
+						}
+					}
+				});
+			} else {
+				if (scrollDiff - this.cacheScrollNodeHeight <= this.finalLowerThreshold) {
+					this._onLoadingMore('toBottom');
+				} else if (scrollDiff - this.cacheScrollNodeHeight <= 500 && !checked) {
+					u.delay(() => {
+						this._getNodeClientRect('.zp-scroll-view', true, true).then((res) => {
+							this.oldScrollTop = res[0].scrollTop;
+							const newScrollDiff = res[0].scrollHeight - this.oldScrollTop;
+							this._checkScrolledToBottom(newScrollDiff, true);
+						})
+					}, 150, 'checkScrolledToBottomDelay')
+				}
+			}
+		},
+		//触发加载更多时调用,from:toBottom-滑动到底部触发；1、click-点击加载更多触发
+		_onLoadingMore(from = 'click') {
+			if (this.isIos && from === 'toBottom' && !this.scrollToBottomBounceEnabled && this.scrollEnable) {
+				this.scrollEnable = false;
+				this.$nextTick(() => {
+					this.scrollEnable = true;
+				})
+			}
+			this.$emit('scrolltolower', from);
+			if (from === 'toBottom' && (!this.toBottomLoadingMoreEnabled || this.useChatRecordMode)) return;
+			if (this.refresherOnly || !this.loadingMoreEnabled || !(this.loadingStatus === Enum.More.Default || this.loadingStatus === Enum.More.Fail) || this.loading) return;
+			// #ifdef MP-WEIXIN
+			if (!this.isIos && !this.refresherOnly && !this.usePageScroll) {
+				const currentTimestamp = u.getTime();
+				if (this.loadingMoreTimeStamp > 0 && currentTimestamp - this.loadingMoreTimeStamp < 100) {
+					this.loadingMoreTimeStamp = 0;
+					return;
+				}
+			}
+			// #endif
+			this._doLoadingMore();
+		},
+		//处理开始加载更多
+		_doLoadingMore() {
+			if (this.pageNo >= this.defaultPageNo && this.loadingStatus !== Enum.More.NoMore) {
+				this.pageNo ++;
+				this._startLoading(false);
+				if (this.isLocalPaging) {
+					this._localPagingQueryList(this.pageNo, this.defaultPageSize, this.localPagingLoadingTime, res => {
+						this.completeByTotal(res, this.totalLocalPagingList.length);
+					})
+				} else {
+					this._emitQuery(this.pageNo, this.defaultPageSize, Enum.QueryFrom.LoadingMore);
+					this._callMyParentQuery();
+				}
+				this.loadingType = Enum.LoadingType.LoadingMore;
+			}
+		},
+		//(预处理)判断当没有更多数据且分页内容未超出z-paging时是否显示没有更多数据的view
+		_preCheckShowNoMoreInside(newVal, scrollViewNode, pagingContainerNode) {
+			if (this.loadingStatus === Enum.More.NoMore && this.hideNoMoreByLimit > 0 && newVal.length) {
+				this.showLoadingMore = newVal.length > this.hideNoMoreByLimit;
+			} else if ((this.loadingStatus === Enum.More.NoMore && this.hideNoMoreInside && newVal.length) || (this.insideMore && this.insideOfPaging !== false && newVal.length)) {
+				this.$nextTick(() => {
+					this._checkShowNoMoreInside(newVal, scrollViewNode, pagingContainerNode);
+				})
+				if (this.insideMore && this.insideOfPaging !== false && newVal.length) {
+					this.showLoadingMore = newVal.length;
+				}
+			} else {
+				this.showLoadingMore = newVal.length;
+			}
+		},
+		//判断当没有更多数据且分页内容未超出z-paging时是否显示没有更多数据的view
+		async _checkShowNoMoreInside(totalData, oldScrollViewNode, oldPagingContainerNode) {
+			try {
+				const scrollViewNode = oldScrollViewNode || await this._getNodeClientRect('.zp-scroll-view');
+				if (this.usePageScroll) {
+					if (scrollViewNode) {
+						const scrollViewTotalH = scrollViewNode[0].top + scrollViewNode[0].height;
+						this.insideOfPaging = scrollViewTotalH < this.windowHeight;
+						if (this.hideNoMoreInside) {
+							this.showLoadingMore = !this.insideOfPaging;
+						}
+						this._updateInsideOfPaging();
+					}
+				} else {
+					const pagingContainerNode = oldPagingContainerNode || await this._getNodeClientRect('.zp-paging-container-content');
+					const pagingContainerH = pagingContainerNode ? pagingContainerNode[0].height : 0;
+					const scrollViewH = scrollViewNode ? scrollViewNode[0].height : 0;
+					this.insideOfPaging = pagingContainerH < scrollViewH;
+					if (this.hideNoMoreInside) {
+						this.showLoadingMore = !this.insideOfPaging;
+					}
+					this._updateInsideOfPaging();
+				}
+			} catch (e) {
+				this.insideOfPaging = !totalData.length;
+				if (this.hideNoMoreInside) {
+					this.showLoadingMore = !this.insideOfPaging;
+				}
+				this._updateInsideOfPaging();
+			}
+		},
+		//是否要展示上拉加载更多view
+		_showLoadingMore(type) {
+			if (!this.showLoadingMoreWhenReload && (!(this.loadingStatus === Enum.More.Default ? this.nShowBottom : true) || !this.realTotalData.length)) return false;
+			if (((!this.showLoadingMoreWhenReload || this.isUserPullDown || this.loadingStatus !== Enum.More.Loading) && !this.showLoadingMore) || 
+			(!this.loadingMoreEnabled && (!this.showLoadingMoreWhenReload || this.isUserPullDown || this.loadingStatus !== Enum.More.Loading)) || this.refresherOnly) {
+				return false;
+			}
+			if (this.useChatRecordMode && type !== 'Loading') return false;
+			if (!this.$slots) return false;
+			if (type === 'Custom') {
+				return this.showDefaultLoadingMoreText && !(this.loadingStatus === Enum.More.NoMore && !this.showLoadingMoreNoMoreView);
+			}
+			const res = this.loadingStatus === Enum.More[type] && this.$slots[`loadingMore${type}`] && (type === 'NoMore' ? this.showLoadingMoreNoMoreView : true);
+			if (res) {
+				// #ifdef APP-NVUE
+				if (!this.isIos) {
+					this.nLoadingMoreFixedHeight = false;
+				}
+				//  #endif
+			}
+			return res;
+		},
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/loading.js b/uni_modules/z-paging/components/z-paging/js/modules/loading.js
new file mode 100644
index 0000000..52960a5
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/loading.js
@@ -0,0 +1,93 @@
+// [z-paging]loading相关模块
+import u from '.././z-paging-utils'
+import Enum from '.././z-paging-enum'
+
+export default {
+	props: {
+		//第一次加载后自动隐藏loading slot，默认为是
+		autoHideLoadingAfterFirstLoaded: {
+			type: Boolean,
+			default: u.gc('autoHideLoadingAfterFirstLoaded', true)
+		},
+		//loading slot是否铺满屏幕并固定，默认为否
+		loadingFullFixed: {
+			type: Boolean,
+			default: u.gc('loadingFullFixed', false)
+		},
+		//是否自动显示系统Loading：即uni.showLoading，若开启则将在刷新列表时(调用reload、refresh时)显示，下拉刷新和滚动到底部加载更多不会显示，默认为false。
+		autoShowSystemLoading: {
+			type: Boolean,
+			default: u.gc('autoShowSystemLoading', false)
+		},
+		//显示系统Loading时是否显示透明蒙层，防止触摸穿透，默认为是(H5、App、微信小程序、百度小程序有效)
+		systemLoadingMask: {
+			type: Boolean,
+			default: u.gc('systemLoadingMask', true)
+		},
+		//显示系统Loading时显示的文字，默认为"加载中"
+		systemLoadingText: {
+			type: [String, Object],
+			default: u.gc('systemLoadingText', null)
+		},
+	},
+	data() {
+		return {
+			loading: false,
+			loadingForNow: false,
+		}
+	},
+	watch: {
+		loadingStatus(newVal) {
+			this.$emit('loadingStatusChange', newVal);
+			this.$nextTick(() => {
+				this.loadingStatusAfterRender = newVal;
+			})
+			// #ifdef APP-NVUE
+			if (this.useChatRecordMode) {
+				if (this.pageNo === this.defaultPageNo && newVal === Enum.More.NoMore) {
+					this.nIsFirstPageAndNoMore = true;
+					return;
+				}
+			}
+			this.nIsFirstPageAndNoMore = false;
+			//  #endif
+		},
+		loading(newVal){
+			if (newVal) {
+				this.loadingForNow = newVal;
+			}
+		},
+	},
+	computed: {
+		showLoading() {
+			if (this.firstPageLoaded || !this.loading || !this.loadingForNow) return false;
+			if (this.finalShowSystemLoading){
+				uni.showLoading({
+					title: this.finalSystemLoadingText,
+					mask: this.systemLoadingMask
+				})
+			}
+			return this.autoHideLoadingAfterFirstLoaded ? (this.fromEmptyViewReload ? true : !this.pagingLoaded) : this.loadingType === Enum.LoadingType.Refresher;
+		},
+		finalShowSystemLoading() {
+			return this.autoShowSystemLoading && this.loadingType === Enum.LoadingType.Refresher;
+		}
+	},
+	methods: {
+		//处理开始加载更多状态
+		_startLoading(isReload = false) {
+			if ((this.showLoadingMoreWhenReload && !this.isUserPullDown) || !isReload) {
+				this.loadingStatus = Enum.More.Loading;
+			}
+			this.loading = true;
+		},
+		//停止系统loading和refresh
+		_endSystemLoadingAndRefresh(){
+			this.finalShowSystemLoading && uni.hideLoading();
+			!this.useCustomRefresher && uni.stopPullDownRefresh();
+			// #ifdef APP-NVUE
+			this.usePageScroll && uni.stopPullDownRefresh();
+			// #endif
+		}
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/nvue.js b/uni_modules/z-paging/components/z-paging/js/modules/nvue.js
new file mode 100644
index 0000000..2228841
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/nvue.js
@@ -0,0 +1,249 @@
+// [z-paging]nvue独有部分模块
+import u from '.././z-paging-utils'
+import c from '.././z-paging-constant'
+import Enum from '.././z-paging-enum'
+
+// #ifdef APP-NVUE
+const weexAnimation = weex.requireModule('animation');
+// #endif
+export default {
+	props: {
+		// #ifdef APP-NVUE
+		//nvue中修改列表类型，可选值有list、waterfall和scroller，默认为list
+		nvueListIs: {
+			type: String,
+			default: u.gc('nvueListIs', 'list')
+		},
+		//nvue waterfall配置，仅在nvue中且nvueListIs=waterfall时有效，配置参数详情参见：https://uniapp.dcloud.io/component/waterfall
+		nvueWaterfallConfig: {
+			type: Object,
+			default: function() {
+				return u.gc('nvueWaterfallConfig', {});
+			}
+		},
+		//nvue 控制是否回弹效果，iOS不支持动态修改
+		nvueBounce: {
+			type: Boolean,
+			default: u.gc('nvueBounce', true)
+		},
+		//nvue中通过代码滚动到顶部/底部时，是否加快动画效果(无滚动动画时无效)，默认为否
+		nvueFastScroll: {
+			type: Boolean,
+			default: u.gc('nvueFastScroll', false)
+		},
+		//nvue中list的id
+		nvueListId: {
+			type: String,
+			default: u.gc('nvueListId', '')
+		},
+		//nvue中refresh组件的样式
+		nvueRefresherStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('nvueRefresherStyle', {});
+			}
+		},
+		//nvue中是否按分页模式(类似竖向swiper)显示List，默认为false
+		nvuePagingEnabled: {
+			type: Boolean,
+			default: u.gc('nvuePagingEnabled', false)
+		},
+		//是否隐藏nvue列表底部的tagView，此view用于标识滚动到底部位置，若隐藏则滚动到底部功能将失效，在nvue中实现吸顶+swiper功能时需将最外层z-paging的此属性设置为true。默认为否
+		hideNvueBottomTag: {
+			type: Boolean,
+			default: u.gc('hideNvueBottomTag', false)
+		},
+		//nvue中控制onscroll事件触发的频率：表示两次onscroll事件之间列表至少滚动了10px。注意，将该值设置为较小的数值会提高滚动事件采样的精度，但同时也会降低页面的性能
+		offsetAccuracy: {
+			type: Number,
+			default: u.gc('offsetAccuracy', 10)
+		},
+		// #endif
+	},
+	data() {
+		return {
+			nRefresherLoading: false,
+			nListIsDragging: false,
+			nShowBottom: true,
+			nFixFreezing: false,
+			nShowRefresherReveal: false,
+			nIsFirstPageAndNoMore: false,
+			nFirstPageAndNoMoreChecked: false,
+			nLoadingMoreFixedHeight: false,
+			nShowRefresherRevealHeight: 0,
+			nOldShowRefresherRevealHeight: -1,
+			nRefresherWidth: uni.upx2px(750),
+		}
+	},
+	watch: {
+		// #ifdef APP-NVUE
+		nIsFirstPageAndNoMore: {
+			handler(newVal) {
+				const cellStyle = !this.useChatRecordMode || newVal ? {} : { transform: 'rotate(180deg)' };
+				this.$emit('update:cellStyle', cellStyle);
+				this.$emit('cellStyleChange', cellStyle);
+			},
+			immediate: true
+		},
+		// #endif
+	},
+	computed: {
+		// #ifdef APP-NVUE
+		nScopedSlots() {
+			// #ifdef VUE2
+			return this.$scopedSlots;
+			// #endif
+			// #ifdef VUE3
+			return null;
+			// #endif
+		},
+		nWaterfallColumnCount() {
+			if (this.finalNvueListIs !== 'waterfall') return 0;
+			return this._nGetWaterfallConfig('column-count', 2);
+		},
+		nWaterfallColumnWidth() {
+			return this._nGetWaterfallConfig('column-width', 'auto');
+		},
+		nWaterfallColumnGap() {
+			return this._nGetWaterfallConfig('column-gap', 'normal');
+		},
+		nWaterfallLeftGap() {
+			return this._nGetWaterfallConfig('left-gap', 0);
+		},
+		nWaterfallRightGap() {
+			return this._nGetWaterfallConfig('right-gap', 0);
+		},
+		nViewIs() {
+			const is = this.finalNvueListIs;
+			return is === 'scroller' || is === 'view' ? 'view' : is === 'waterfall' ? 'header' : 'cell';
+		},
+		nSafeAreaBottomHeight() {
+			return this.safeAreaInsetBottom ? this.safeAreaBottom : 0;
+		},
+		nChatRecordRotateStyle() {
+			return this.useChatRecordMode ? { transform: this.nIsFirstPageAndNoMore ? 'rotate(0deg)' : 'rotate(180deg)' } : {};
+		},
+		finalNvueListIs() {
+			if (this.usePageScroll) return 'view';
+			const nvueListIsLowerCase = this.nvueListIs.toLowerCase();
+			if (['list','waterfall','scroller'].indexOf(nvueListIsLowerCase) !== -1) return nvueListIsLowerCase;
+			return 'list';
+		},
+		finalNvueSuperListIs() {
+			return this.usePageScroll ? 'view' : 'scroller';
+		},
+		finalNvueRefresherEnabled() {
+			return this.finalNvueListIs !== 'view' && this.finalRefresherEnabled && !this.nShowRefresherReveal && !this.useChatRecordMode;
+		},
+		// #endif
+	},
+	mounted(){
+		// #ifdef APP-NVUE
+		//旋转屏幕时更新宽度
+		uni.onWindowResize((res) => {
+			// this._nUpdateRefresherWidth();
+		})
+		// #endif
+	},
+	methods: {
+		// #ifdef APP-NVUE
+		//列表滚动时触发
+		_nOnScroll(e) {
+			this.$emit('scroll', e);
+			const contentOffsetY = -e.contentOffset.y;
+			this.oldScrollTop = contentOffsetY;
+			this.nListIsDragging = e.isDragging;
+			this._checkShouldShowBackToTop(contentOffsetY, contentOffsetY - 1);
+		},
+		//下拉刷新刷新中
+		_nOnRrefresh() {
+			if (this.nShowRefresherReveal) return;
+			this.nRefresherLoading = true;
+			this.refresherStatus = Enum.Refresher.Loading;
+			this._doRefresherLoad();
+		},
+		//下拉刷新下拉中
+		_nOnPullingdown(e) {
+			if (this.refresherStatus === Enum.Refresher.Loading || (this.isIos && !this.nListIsDragging)) return;
+			this._emitTouchmove(e);
+			const { viewHeight, pullingDistance } = e;
+			this.refresherStatus = pullingDistance >= viewHeight ? Enum.Refresher.ReleaseToRefresh : Enum.Refresher.Default;
+		},
+		//下拉刷新结束
+		_nRefresherEnd(doEnd = true) {
+			if (doEnd) {
+			   this._nDoRefresherEndAnimation(0, -this.nShowRefresherRevealHeight); 
+			   !this.usePageScroll && this.$refs['zp-n-list'].resetLoadmore();
+			   this.nRefresherLoading = false;
+			}
+		},
+		//执行主动触发下拉刷新动画
+		_nDoRefresherEndAnimation(height, translateY, animate = true, checkStack = true) {
+			this._cleanRefresherCompleteTimeout();
+			this._cleanRefresherEndTimeout();
+			
+			if (!this.finalShowRefresherWhenReload) {
+				this.refresherEndTimeout = u.delay(() => {
+					this.refresherStatus = Enum.Refresher.Default;
+				}, this.refresherCompleteDuration);
+				return;
+			}
+			const stackCount = this.refresherRevealStackCount;
+			if (height === 0 && checkStack) {
+				this.refresherRevealStackCount --;
+				if (stackCount > 1) return;
+				this.refresherEndTimeout = u.delay(() => {
+					this.refresherStatus = Enum.Refresher.Default;
+				}, this.refresherCompleteDuration);
+			}
+			if (stackCount > 1) {
+				this.refresherStatus = Enum.Refresher.Loading;
+			}
+			
+			const duration = animate ? 200 : 0;
+			if (this.nOldShowRefresherRevealHeight !== height) {
+				if (height > 0) {
+					this.nShowRefresherReveal = true;
+				}
+				weexAnimation.transition(this.$refs['zp-n-list-refresher-reveal'], {
+					styles: {
+						height: `${height}px`,
+						transform: `translateY(${translateY}px)`,
+					},
+					duration,
+					timingFunction: 'linear',
+					needLayout: true,
+					delay: 0
+				})
+			}
+			u.delay(() => {
+				if (animate) {
+					this.nShowRefresherReveal = height > 0;
+				}
+			}, duration > 0 ? duration - 60 : 0);
+			this.nOldShowRefresherRevealHeight = height;
+		},
+		//滚动到底部加载更多
+		_nOnLoadmore() {
+			if (this.nShowRefresherReveal || !this.totalData.length) return;
+			this.useChatRecordMode ? this.doChatRecordLoadMore() : this._onLoadingMore('toBottom');
+		},
+		//获取nvue waterfall单项配置
+		_nGetWaterfallConfig(key, defaultValue) {
+			return this.nvueWaterfallConfig[key] || defaultValue;
+		},
+		//更新nvue 下拉刷新view容器的宽度
+		_nUpdateRefresherWidth() {
+			u.delay(() => {
+				this.$nextTick(()=>{
+					this._getNodeClientRect('.zp-n-list').then(node => {
+						if (node) {
+							this.nRefresherWidth = node[0].width || this.nRefresherWidth;
+						}
+					})
+				})
+			})	
+		}
+		// #endif
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/refresher.js b/uni_modules/z-paging/components/z-paging/js/modules/refresher.js
new file mode 100644
index 0000000..b0f5d8e
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/refresher.js
@@ -0,0 +1,677 @@
+// [z-paging]下拉刷新view模块
+import u from '.././z-paging-utils'
+import c from '.././z-paging-constant'
+import Enum from '.././z-paging-enum'
+
+export default {
+	props: {
+		//下拉刷新的主题样式，支持black，white，默认black
+		refresherThemeStyle: {
+			type: String,
+			default: u.gc('refresherThemeStyle', '')
+		},
+		//自定义下拉刷新中左侧图标的样式
+		refresherImgStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('refresherImgStyle', {});
+			}
+		},
+		//自定义下拉刷新中右侧状态描述文字的样式
+		refresherTitleStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('refresherTitleStyle', {});
+			}
+		},
+		//自定义下拉刷新中右侧最后更新时间文字的样式(show-refresher-update-time为true时有效)
+		refresherUpdateTimeStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('refresherUpdateTimeStyle', {});
+			}
+		},
+		//在微信小程序和QQ小程序中，是否实时监听下拉刷新中进度，默认为否
+		watchRefresherTouchmove: {
+			type: Boolean,
+			default: u.gc('watchRefresherTouchmove', false)
+		},
+		//底部加载更多的主题样式，支持black，white，默认black
+		loadingMoreThemeStyle: {
+			type: String,
+			default: u.gc('loadingMoreThemeStyle', '')
+		},
+		//是否只使用下拉刷新，设置为true后将关闭mounted自动请求数据、关闭滚动到底部加载更多，强制隐藏空数据图。默认为否
+		refresherOnly: {
+			type: Boolean,
+			default: u.gc('refresherOnly', false)
+		},
+		//自定义下拉刷新默认状态下回弹动画时间，单位为毫秒，默认为100毫秒，nvue无效
+		refresherDefaultDuration: {
+			type: [Number, String],
+			default: u.gc('refresherDefaultDuration', 100)
+		},
+		//自定义下拉刷新结束以后延迟回弹的时间，单位为毫秒，默认为0
+		refresherCompleteDelay: {
+			type: [Number, String],
+			default: u.gc('refresherCompleteDelay', 0)
+		},
+		//自定义下拉刷新结束回弹动画时间，单位为毫秒，默认为300毫秒(refresherEndBounceEnabled为false时，refresherCompleteDuration为设定值的1/3)，nvue无效
+		refresherCompleteDuration: {
+			type: [Number, String],
+			default: u.gc('refresherCompleteDuration', 300)
+		},
+		//自定义下拉刷新结束状态下是否允许列表滚动，默认为否
+		refresherCompleteScrollable: {
+			type: Boolean,
+			default: u.gc('refresherCompleteScrollable', false)
+		},
+		//是否使用自定义的下拉刷新，默认为是，即使用z-paging的下拉刷新。设置为false即代表使用uni scroll-view自带的下拉刷新，h5、App、微信小程序以外的平台不支持uni scroll-view自带的下拉刷新
+		useCustomRefresher: {
+			type: Boolean,
+			default: u.gc('useCustomRefresher', true)
+		},
+		//自定义下拉刷新下拉帧率，默认为40，过高可能会出现抖动问题
+		refresherFps: {
+			type: [Number, String],
+			default: u.gc('refresherFps', 40)
+		},
+		//自定义下拉刷新允许触发的最大下拉角度，默认为40度，当下拉角度小于设定值时，自定义下拉刷新动画不会被触发
+		refresherMaxAngle: {
+			type: [Number, String],
+			default: u.gc('refresherMaxAngle', 40)
+		},
+		//自定义下拉刷新的角度由未达到最大角度变到达到最大角度时，是否继续下拉刷新手势，默认为否
+		refresherAngleEnableChangeContinued: {
+			type: Boolean,
+			default: u.gc('refresherAngleEnableChangeContinued', false)
+		},
+		//自定义下拉刷新默认状态下的文字
+		refresherDefaultText: {
+			type: [String, Object],
+			default: u.gc('refresherDefaultText', null)
+		},
+		//自定义下拉刷新松手立即刷新状态下的文字
+		refresherPullingText: {
+			type: [String, Object],
+			default: u.gc('refresherPullingText', null)
+		},
+		//自定义下拉刷新刷新中状态下的文字
+		refresherRefreshingText: {
+			type: [String, Object],
+			default: u.gc('refresherRefreshingText', null)
+		},
+		//自定义下拉刷新刷新结束状态下的文字
+		refresherCompleteText: {
+			type: [String, Object],
+			default: u.gc('refresherCompleteText', null)
+		},
+		//自定义下拉刷新默认状态下的图片
+		refresherDefaultImg: {
+			type: String,
+			default: u.gc('refresherDefaultImg', null)
+		},
+		//自定义下拉刷新松手立即刷新状态下的图片，默认与refresherDefaultImg一致
+		refresherPullingImg: {
+			type: String,
+			default: u.gc('refresherPullingImg', null)
+		},
+		//自定义下拉刷新刷新中状态下的图片
+		refresherRefreshingImg: {
+			type: String,
+			default: u.gc('refresherRefreshingImg', null)
+		},
+		//自定义下拉刷新刷新结束状态下的图片
+		refresherCompleteImg: {
+			type: String,
+			default: u.gc('refresherCompleteImg', null)
+		},
+		//自定义下拉刷新刷新中状态下是否展示旋转动画
+		refresherRefreshingAnimated: {
+			type: Boolean,
+			default: u.gc('refresherRefreshingAnimated', true)
+		},
+		//是否开启自定义下拉刷新刷新结束回弹效果，默认为是
+		refresherEndBounceEnabled: {
+			type: Boolean,
+			default: u.gc('refresherEndBounceEnabled', true)
+		},
+		//是否开启自定义下拉刷新，默认为是
+		refresherEnabled: {
+			type: Boolean,
+			default: u.gc('refresherEnabled', true)
+		},
+		//设置自定义下拉刷新阈值，默认为80rpx
+		refresherThreshold: {
+			type: [Number, String],
+			default: u.gc('refresherThreshold', '80rpx')
+		},
+		//设置系统下拉刷新默认样式，支持设置 black，white，none，none 表示不使用默认样式，默认为black
+		refresherDefaultStyle: {
+			type: String,
+			default: u.gc('refresherDefaultStyle', 'black')
+		},
+		//设置自定义下拉刷新区域背景
+		refresherBackground: {
+			type: String,
+			default: u.gc('refresherBackground', 'transparent')
+		},
+		//设置固定的自定义下拉刷新区域背景
+		refresherFixedBackground: {
+			type: String,
+			default: u.gc('refresherFixedBackground', 'transparent')
+		},
+		//设置固定的自定义下拉刷新区域高度，默认为0
+		refresherFixedBacHeight: {
+			type: [Number, String],
+			default: u.gc('refresherFixedBacHeight', 0)
+		},
+		//设置自定义下拉刷新下拉超出阈值后继续下拉位移衰减的比例，范围0-1，值越大代表衰减越多。默认为0.65(nvue无效)
+		refresherOutRate: {
+			type: Number,
+			default: u.gc('refresherOutRate', 0.65)
+		},
+		//设置自定义下拉刷新下拉时实际下拉位移与用户下拉距离的比值，默认为0.75，即代表若用户下拉10px，则实际位移为7.5px(nvue无效)
+		refresherPullRate: {
+			type: Number,
+			default: u.gc('refresherPullRate', 0.75)
+		},
+		//是否显示最后更新时间，默认为否
+		showRefresherUpdateTime: {
+			type: Boolean,
+			default: u.gc('showRefresherUpdateTime', false)
+		},
+		//如果需要区别不同页面的最后更新时间，请为不同页面的z-paging的`refresher-update-time-key`设置不同的字符串
+		refresherUpdateTimeKey: {
+			type: String,
+			default: u.gc('refresherUpdateTimeKey', 'default')
+		},
+		//下拉刷新时下拉到“松手立即刷新”状态时是否使手机短振动，默认为否（h5无效）
+		refresherVibrate: {
+			type: Boolean,
+			default: u.gc('refresherVibrate', false)
+		},
+		//下拉刷新时是否禁止下拉刷新view跟随用户触摸竖直移动，默认为否。注意此属性只是禁止下拉刷新view移动，其他下拉刷新逻辑依然会正常触发
+		refresherNoTransform: {
+			type: Boolean,
+			default: u.gc('refresherNoTransform', false)
+		},
+	},
+	data() {
+		return {
+			R: Enum.Refresher,
+			//下拉刷新状态
+			refresherStatus: Enum.Refresher.Default,
+			refresherTouchstartY: 0,
+			lastRefresherTouchmove: null,
+			refresherReachMaxAngle: true,
+			refresherTransform: 'translateY(0px)',
+			refresherTransition: '',
+			finalRefresherDefaultStyle: 'black',
+			refresherRevealStackCount: 0,
+			refresherCompleteTimeout: null,
+			refresherCompleteSubTimeout: null,
+			refresherEndTimeout: null,
+			isTouchmovingTimeout: null,
+			refresherTriggered: false,
+			isTouchmoving: false,
+			isTouchEnded: false,
+			isUserPullDown: false,
+			privateRefresherEnabled: -1,
+			privateShowRefresherWhenReload: false,
+			customRefresherHeight: -1,
+			showCustomRefresher: false,
+			doRefreshAnimateAfter: false,
+			isRefresherInComplete: false,
+			pullDownTimeStamp: 0,
+			moveDis: 0,
+			oldMoveDis: 0,
+			currentDis: 0,
+			oldCurrentMoveDis: 0,
+			oldRefresherTouchmoveY: 0,
+			oldTouchDirection: '',
+			oldEmitedTouchDirection: '',
+			oldPullingDistance: -1,
+			refresherThresholdUpdateTag: 0
+		}
+	},
+	watch: {
+		refresherDefaultStyle: {
+			handler(newVal) {
+				if (newVal.length) {
+					this.finalRefresherDefaultStyle = newVal;
+				}
+			},
+			immediate: true
+		},
+		refresherStatus(newVal) {
+			newVal === Enum.Refresher.Loading && this._cleanRefresherEndTimeout();
+			this.refresherVibrate && newVal === Enum.Refresher.ReleaseToRefresh && this._doVibrateShort();
+			this.$emit('refresherStatusChange', newVal);
+			this.$emit('update:refresherStatus', newVal);
+		},
+		refresherEnabled(newVal) {
+			!newVal && this.endRefresh();
+		}
+	},
+	computed: {
+		pullDownDisTimeStamp() {
+			return 1000 / this.refresherFps;
+		},
+		finalRefresherEnabled() {
+			if (this.useChatRecordMode) return false;
+			if (this.privateRefresherEnabled === -1) return this.refresherEnabled;
+			return this.privateRefresherEnabled === 1;
+		},
+		finalRefresherThreshold() {
+			let refresherThreshold = this.refresherThreshold;
+			let idDefault = false;
+			if (refresherThreshold === '80rpx') {
+				idDefault = true;
+				if (this.showRefresherUpdateTime) {
+					refresherThreshold = '120rpx';
+				}
+			}
+			if (idDefault && this.customRefresherHeight > 0) return this.customRefresherHeight;
+			return u.convertToPx(refresherThreshold);
+		},
+		finalRefresherFixedBacHeight() {
+			return u.convertToPx(this.refresherFixedBacHeight);
+		},
+		finalRefresherThemeStyle() {
+			return this.refresherThemeStyle.length ? this.refresherThemeStyle : this.defaultThemeStyle;
+		},
+		finalRefresherOutRate() {
+			let rate = this.refresherOutRate;
+			rate = Math.max(0,rate);
+			rate = Math.min(1,rate);
+			return rate;
+		},
+		finalRefresherPullRate() {
+			let rate = this.refresherPullRate;
+			rate = Math.max(0,rate);
+			return rate;
+		},
+		finalRefresherTransform() {
+			if (this.refresherNoTransform || this.refresherTransform === 'translateY(0px)') return 'none';
+			return this.refresherTransform;
+		},
+		finalShowRefresherWhenReload() {
+			return this.showRefresherWhenReload || this.privateShowRefresherWhenReload;
+		},
+		finalRefresherTriggered() {
+			if (!(this.finalRefresherEnabled && !this.useCustomRefresher)) return false;
+			return this.refresherTriggered;
+		},
+		showRefresher() {
+			const showRefresher = this.finalRefresherEnabled && this.useCustomRefresher;
+			// #ifndef APP-NVUE
+			this.customRefresherHeight === -1 && showRefresher && u.delay(() => this.$nextTick(this._updateCustomRefresherHeight));
+			// #endif
+			return showRefresher;
+		},
+		hasTouchmove(){
+			// #ifdef VUE2
+			// #ifdef APP-VUE || H5
+			if (this.$listeners && !this.$listeners.refresherTouchmove) return false;
+			// #endif
+			// #ifdef MP-WEIXIN || MP-QQ
+			return this.watchRefresherTouchmove;
+			// #endif
+			return true;
+			// #endif
+			return this.watchRefresherTouchmove;
+		},
+	},
+	methods: {
+		//终止下拉刷新状态
+		endRefresh() {
+			this.totalData = this.realTotalData;
+			this._refresherEnd();
+			this._endSystemLoadingAndRefresh();
+			this._handleScrollViewDisableBounce({ bounce: true });
+			this.$nextTick(() => {
+				this.refresherTriggered = false;
+			})
+		},
+		handleRefresherStatusChanged(func) {
+			this.refresherStatusChangedFunc = func;
+		},
+		//自定义下拉刷新被触发
+		_onRefresh(fromScrollView = false,isUserPullDown = true) {
+			if (fromScrollView && !(this.finalRefresherEnabled && !this.useCustomRefresher)) return;
+			this.$emit('onRefresh');
+			this.$emit('Refresh');
+			// #ifdef APP-NVUE
+			if (this.loading) {
+				u.delay(this._nRefresherEnd, 500)
+				return;
+			}
+			// #endif
+			if (this.loading || this.isRefresherInComplete) return;
+			this.loadingType = Enum.LoadingType.Refresher;
+			if (this.nShowRefresherReveal) return;
+			this.isUserPullDown = isUserPullDown;
+			this.isUserReload = !isUserPullDown;
+			this._startLoading(true);
+			this.refresherTriggered = true;
+			if(this.reloadWhenRefresh && isUserPullDown){
+				this.useChatRecordMode ? this._onLoadingMore('click') : this._reload(false, false, isUserPullDown);
+			}
+		},
+		//自定义下拉刷新被复位
+		_onRestore() {
+			this.refresherTriggered = 'restore';
+			this.$emit('onRestore');
+			this.$emit('Restore');
+		},
+		// #ifndef APP-VUE || MP-WEIXIN || MP-QQ || H5
+		//拖拽开始
+		_refresherTouchstart(e) {
+			this._handleListTouchstart();
+			if (this._touchDisabled()) return;
+			this._handleRefresherTouchstart(u.getTouch(e));
+		},
+		// #endif
+		//进一步处理拖拽开始结果
+		_handleRefresherTouchstart(touch) {
+			if (!this.loading && this.isTouchEnded) {
+				this.isTouchmoving = false;
+			}
+			this.loadingType = Enum.LoadingType.Refresher;
+			this.isTouchmovingTimeout && clearTimeout(this.isTouchmovingTimeout);
+			this.isTouchEnded = false;
+			this.refresherTransition = '';
+			this.refresherTouchstartY = touch.touchY;
+			this.$emit('refresherTouchstart', this.refresherTouchstartY);
+			this.lastRefresherTouchmove = touch;
+			this._cleanRefresherCompleteTimeout();
+			this._cleanRefresherEndTimeout();
+		},
+		// #ifndef APP-VUE || MP-WEIXIN || MP-QQ || H5
+		//拖拽中
+		_refresherTouchmove(e) {
+			const currentTimeStamp = u.getTime();
+			let touch = null;
+			let refresherTouchmoveY = 0;
+			if (this.watchTouchDirectionChange) {
+				touch = u.getTouch(e);
+				refresherTouchmoveY = touch.touchY;
+				const direction  = refresherTouchmoveY > this.oldRefresherTouchmoveY ? 'top' : 'bottom';
+				if (direction === this.oldTouchDirection && direction !== this.oldEmitedTouchDirection) {
+					this._handleTouchDirectionChange({ direction });
+					this.oldEmitedTouchDirection = direction;
+				}
+				this.oldTouchDirection = direction;
+				this.oldRefresherTouchmoveY = refresherTouchmoveY;
+			}
+			if (this.pullDownTimeStamp && currentTimeStamp - this.pullDownTimeStamp <= this.pullDownDisTimeStamp) return;
+			if (this._touchDisabled()) return;
+			this.pullDownTimeStamp = Number(currentTimeStamp);
+			touch = u.getTouch(e);
+			refresherTouchmoveY = touch.touchY;
+			let moveDis = refresherTouchmoveY - this.refresherTouchstartY;
+			if (moveDis < 0) return;
+			if (this.refresherMaxAngle >= 0 && this.refresherMaxAngle <= 90 && this.lastRefresherTouchmove && this.lastRefresherTouchmove.touchY <= refresherTouchmoveY) {
+				if (!moveDis && !this.refresherAngleEnableChangeContinued && this.moveDis < 1 && !this.refresherReachMaxAngle) return;
+				const x = Math.abs(touch.touchX - this.lastRefresherTouchmove.touchX);
+				const y = Math.abs(refresherTouchmoveY - this.lastRefresherTouchmove.touchY);
+				const z = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
+				if ((x || y) && x > 1) {
+					const angle = Math.asin(y / z) / Math.PI * 180;
+					if (angle < this.refresherMaxAngle) {
+						this.lastRefresherTouchmove = touch;
+						this.refresherReachMaxAngle = false;
+						return;
+					}
+				}
+			}
+			moveDis = this._getFinalRefresherMoveDis(moveDis);
+			this._handleRefresherTouchmove(moveDis, touch);
+			if (!this.disabledBounce) {
+				if(this.isIos){
+					// #ifndef MP-LARK
+					this._handleScrollViewDisableBounce({ bounce: false });
+					// #endif
+				}
+				this.disabledBounce = true;
+			}
+			this._emitTouchmove({ pullingDistance: moveDis, dy: this.moveDis - this.oldMoveDis });
+		},
+		// #endif
+		//进一步处理拖拽中结果
+		_handleRefresherTouchmove(moveDis, touch) {
+			this.refresherReachMaxAngle = true;
+			this.isTouchmovingTimeout && clearTimeout(this.isTouchmovingTimeout);
+			this.isTouchmoving = true;
+			this.isTouchEnded = false;
+			this.refresherStatus = moveDis >= this.finalRefresherThreshold ? Enum.Refresher.ReleaseToRefresh : this.refresherStatus = Enum.Refresher.Default;
+			// #ifndef APP-VUE || MP-WEIXIN || MP-QQ  || H5
+			// this.scrollEnable = false;
+			this.refresherTransform = `translateY(${moveDis}px)`;
+			this.lastRefresherTouchmove = touch;
+			// #endif
+			this.moveDis = moveDis;
+		},
+		// #ifndef APP-VUE || MP-WEIXIN || MP-QQ || H5
+		//拖拽结束
+		_refresherTouchend(e) {
+			if (this._touchDisabled() || !this.isTouchmoving) return;
+			const touch = u.getTouch(e);
+			let refresherTouchendY = touch.touchY;
+			let moveDis = refresherTouchendY - this.refresherTouchstartY;
+			moveDis = this._getFinalRefresherMoveDis(moveDis);
+			this._handleRefresherTouchend(moveDis);
+			this._handleScrollViewDisableBounce({bounce: true});
+			this.disabledBounce = false;
+		},
+		// #endif
+		//进一步处理拖拽结束结果
+		_handleRefresherTouchend(moveDis) {
+			// #ifndef APP-PLUS || H5 || MP-WEIXIN
+			if (!this.isTouchmoving) return;
+			// #endif
+			this.isTouchmovingTimeout && clearTimeout(this.isTouchmovingTimeout);
+			this.refresherReachMaxAngle = true;
+			this.isTouchEnded = true;
+			const refresherThreshold = this.finalRefresherThreshold;
+			if (moveDis >= refresherThreshold && this.refresherStatus === Enum.Refresher.ReleaseToRefresh) {
+				// #ifndef APP-VUE || MP-WEIXIN || MP-QQ || H5
+				this.refresherTransform = `translateY(${refresherThreshold}px)`;
+				this.refresherTransition = 'transform .1s linear';
+				// #endif
+				u.delay(() => {
+					this._emitTouchmove({ pullingDistance: refresherThreshold, dy: this.moveDis - refresherThreshold });
+				}, 0.1);
+				this.moveDis = refresherThreshold;
+				this.refresherStatus = Enum.Refresher.Loading;
+				this._doRefresherLoad();
+			} else {
+				this._refresherEnd();
+				this.isTouchmovingTimeout = u.delay(() => {
+					this.isTouchmoving = false;
+				}, this.refresherDefaultDuration);
+			}
+			this.scrollEnable = true;
+			this.$emit('refresherTouchend', moveDis);
+		},
+		//处理列表触摸开始事件
+		_handleListTouchstart() {
+			if (this.useChatRecordMode && this.autoHideKeyboardWhenChat) {
+				uni.hideKeyboard();
+				this.$emit('hidedKeyboard');
+			}
+		},
+		//处理scroll-view bounce是否生效
+		_handleScrollViewDisableBounce({ bounce }) {
+			if (!this.usePageScroll && !this.scrollToTopBounceEnabled && this.wxsScrollTop <= 5) {
+				// #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5
+				this.refresherTransition = '';
+				// #endif
+				this.scrollEnable = bounce;
+			}
+		},
+		//wxs正在下拉状态改变处理
+		_handleWxsPullingDownStatusChange(onPullingDown) {
+			this.wxsOnPullingDown = onPullingDown;
+			if (onPullingDown && !this.useChatRecordMode) {
+				this.renderPropScrollTop = 0;
+			}
+		},
+		//wxs正在下拉处理
+		_handleWxsPullingDown({ moveDis, diffDis }){
+			this._emitTouchmove({ pullingDistance: moveDis,dy: diffDis });
+		},
+		//wxs触摸方向改变
+		_handleTouchDirectionChange({ direction }) {
+			this.$emit('touchDirectionChange',direction);
+		},
+		//wxs通知更新其props
+		_handlePropUpdate(){
+			this.wxsPropType = u.getTime().toString();
+		},
+		//下拉刷新结束
+		_refresherEnd(shouldEndLoadingDelay = true, fromAddData = false, isUserPullDown = false, setLoading = true) {
+			if (this.loadingType === Enum.LoadingType.Refresher) {
+				const refresherCompleteDelay = (fromAddData && (isUserPullDown || this.showRefresherWhenReload)) ? this.refresherCompleteDelay : 0;
+				const refresherStatus = refresherCompleteDelay > 0 ? Enum.Refresher.Complete : Enum.Refresher.Default;
+				if (this.finalShowRefresherWhenReload) {
+					const stackCount = this.refresherRevealStackCount;
+					this.refresherRevealStackCount --;
+					if (stackCount > 1) return;
+				}
+				this._cleanRefresherEndTimeout();
+				this.refresherEndTimeout = u.delay(() => {
+					this.refresherStatus = refresherStatus;
+				}, this.refresherStatus !== Enum.Refresher.Default && refresherStatus === Enum.Refresher.Default ? this.refresherCompleteDuration : 0);
+				
+				// #ifndef APP-NVUE
+				if (refresherCompleteDelay > 0) {
+					this.isRefresherInComplete = true;
+				}
+				// #endif
+				this._cleanRefresherCompleteTimeout();
+				this.refresherCompleteTimeout = u.delay(() => {
+					let animateDuration = 1;
+					const animateType = this.refresherEndBounceEnabled && fromAddData ? 'cubic-bezier(0.19,1.64,0.42,0.72)' : 'linear';
+					if (fromAddData) {
+						animateDuration = this.refresherEndBounceEnabled ? this.refresherCompleteDuration / 1000 : this.refresherCompleteDuration / 3000;
+					}
+					this.refresherTransition = `transform ${fromAddData ? animateDuration : this.refresherDefaultDuration / 1000}s ${animateType}`;
+					// #ifndef APP-VUE || MP-WEIXIN || MP-QQ  || H5
+					this.refresherTransform = 'translateY(0px)';
+					this.currentDis = 0;
+					// #endif
+					// #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5
+					this.wxsPropType = this.refresherTransition + 'end' + u.getTime();
+					// #endif
+					// #ifdef APP-NVUE
+					this._nRefresherEnd();
+					// #endif
+					this.moveDis = 0;
+					// #ifndef APP-NVUE
+					if (refresherStatus === Enum.Refresher.Complete) {
+						if (this.refresherCompleteSubTimeout) {
+							clearTimeout(this.refresherCompleteSubTimeout);
+							this.refresherCompleteSubTimeout = null;
+						}
+						this.refresherCompleteSubTimeout = u.delay(() => {
+							this.$nextTick(() => {
+								this.refresherStatus = Enum.Refresher.Default;
+								this.isRefresherInComplete = false;
+							})
+						}, animateDuration * 800);
+					}
+					// #endif
+					this._emitTouchmove({ pullingDistance: 0, dy: this.moveDis });
+				}, refresherCompleteDelay);
+			}
+			if (setLoading) {
+				u.delay(() => this.loading = false, shouldEndLoadingDelay ? c.delayTime : 0);
+				isUserPullDown && this._onRestore();
+			}
+		},
+		//模拟用户手动触发下拉刷新
+		_doRefresherRefreshAnimate() {
+			this._cleanRefresherCompleteTimeout();
+			// #ifndef APP-NVUE
+			const doRefreshAnimateAfter = !this.doRefreshAnimateAfter && (this.finalShowRefresherWhenReload) && this
+				.customRefresherHeight === -1 && this.refresherThreshold === '80rpx';
+			if (doRefreshAnimateAfter) {
+				this.doRefreshAnimateAfter = true;
+				return;
+			}
+			// #endif
+			this.refresherRevealStackCount ++;
+			// #ifndef APP-VUE || MP-WEIXIN || MP-QQ  || H5
+			this.refresherTransform = `translateY(${this.finalRefresherThreshold}px)`;
+			// #endif
+			// #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5
+			this.wxsPropType = 'begin' + u.getTime();
+			// #endif
+			this.moveDis = this.finalRefresherThreshold;
+			this.refresherStatus = Enum.Refresher.Loading;
+			this.isTouchmoving = true;
+			this.isTouchmovingTimeout && clearTimeout(this.isTouchmovingTimeout);
+			this._doRefresherLoad(false);
+		},
+		//触发下拉刷新
+		_doRefresherLoad(isUserPullDown = true) {
+			this._onRefresh(false,isUserPullDown);
+			this.loading = true;
+		},
+		// #ifndef APP-VUE || MP-WEIXIN || MP-QQ || H5
+		//获取处理后的moveDis
+		_getFinalRefresherMoveDis(moveDis) {
+			let diffDis = moveDis - this.oldCurrentMoveDis;
+			this.oldCurrentMoveDis = moveDis;
+			if (diffDis > 0) {
+				diffDis = diffDis * this.finalRefresherPullRate;
+				if (this.currentDis > this.finalRefresherThreshold) {
+					diffDis = diffDis * (1 - this.finalRefresherOutRate);
+				}
+			}
+			diffDis = diffDis > 100 ? diffDis / 100 : diffDis;
+			this.currentDis += diffDis;
+			this.currentDis = Math.max(0, this.currentDis);
+			return this.currentDis;
+		},
+		//判断touch手势是否要触发
+		_touchDisabled() {
+			const checkOldScrollTop = this.oldScrollTop > 5;
+			return this.loading || this.isRefresherInComplete || this.useChatRecordMode || !this.refresherEnabled || !this.useCustomRefresher ||(this.usePageScroll && this.useCustomRefresher && this.pageScrollTop > 10) || (!(this.usePageScroll && this.useCustomRefresher) && checkOldScrollTop);
+		},
+		// #endif
+		//更新自定义下拉刷新view高度
+		_updateCustomRefresherHeight() {
+			this._getNodeClientRect('.zp-custom-refresher-slot-view').then((res) => {
+				this.customRefresherHeight = res ? res[0].height : 0;
+				this.showCustomRefresher = this.customRefresherHeight > 0;
+				if (this.doRefreshAnimateAfter) {
+					this.doRefreshAnimateAfter = false;
+					this._doRefresherRefreshAnimate();
+				}
+			});
+		},
+		//发射pullingDown事件
+		_emitTouchmove(e) {
+			// #ifndef APP-NVUE
+			e.viewHeight = this.finalRefresherThreshold;
+			// #endif
+			e.rate = e.viewHeight > 0 ? e.pullingDistance / e.viewHeight : 0;
+			this.hasTouchmove && this.oldPullingDistance !== e.pullingDistance && this.$emit('refresherTouchmove', e);
+			this.oldPullingDistance = e.pullingDistance;
+		},
+		//清除refresherCompleteTimeout
+		_cleanRefresherCompleteTimeout() {
+			this.refresherCompleteTimeout = this._cleanTimeout(this.refresherCompleteTimeout);
+			// #ifdef APP-NVUE
+			this._nRefresherEnd(false);
+			// #endif
+		},
+		//清除refresherEndTimeout
+		_cleanRefresherEndTimeout() {
+			this.refresherEndTimeout = this._cleanTimeout(this.refresherEndTimeout);
+		},
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/scroller.js b/uni_modules/z-paging/components/z-paging/js/modules/scroller.js
new file mode 100644
index 0000000..39a2fbc
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/scroller.js
@@ -0,0 +1,464 @@
+// [z-paging]scroll相关模块
+import u from '.././z-paging-utils'
+import Enum from '.././z-paging-enum'
+
+// #ifdef APP-NVUE
+const weexDom = weex.requireModule('dom');
+// #endif
+
+export default {
+	props: {
+		//使用页面滚动，默认为否，当设置为是时则使用页面的滚动而非此组件内部的scroll-view的滚动，使用页面滚动时z-paging无需设置确定的高度且对于长列表展示性能更高，但配置会略微繁琐
+		usePageScroll: {
+			type: Boolean,
+			default: u.gc('usePageScroll', false)
+		},
+		//是否可以滚动，使用内置scroll-view和nvue时有效，默认为是
+		scrollable: {
+			type: Boolean,
+			default: u.gc('scrollable', true)
+		},
+		//控制是否出现滚动条，默认为是
+		showScrollbar: {
+			type: Boolean,
+			default: u.gc('showScrollbar', true)
+		},
+		//是否允许横向滚动，默认为否
+		scrollX: {
+			type: Boolean,
+			default: u.gc('scrollX', false)
+		},
+		//iOS设备上滚动到顶部时是否允许回弹效果，默认为否。关闭回弹效果后可使滚动到顶部与下拉刷新更连贯，但是有吸顶view时滚动到顶部时可能出现抖动。
+		scrollToTopBounceEnabled: {
+			type: Boolean,
+			default: u.gc('scrollToTopBounceEnabled', false)
+		},
+		//iOS设备上滚动到底部时是否允许回弹效果，默认为是。
+		scrollToBottomBounceEnabled: {
+			type: Boolean,
+			default: u.gc('scrollToBottomBounceEnabled', true)
+		},
+		//在设置滚动条位置时使用动画过渡，默认为否
+		scrollWithAnimation: {
+			type: Boolean,
+			default: u.gc('scrollWithAnimation', false)
+		},
+		//值应为某子元素id（id不能以数字开头）。设置哪个方向可滚动，则在哪个方向滚动到该元素
+		scrollIntoView: {
+			type: String,
+			default: u.gc('scrollIntoView', '')
+		},
+	},
+	data() {
+		return {
+			scrollTop: 0,
+			oldScrollTop: 0,
+			scrollViewStyle: {},
+			scrollViewContainerStyle: {},
+			scrollViewInStyle: {},
+			pageScrollTop: -1,
+			scrollEnable: true,
+			privateScrollWithAnimation: -1,
+			cacheScrollNodeHeight: -1
+		}
+	},
+	watch: {
+		oldScrollTop(newVal) {
+			!this.usePageScroll && this._scrollTopChange(newVal,false);
+		},
+		pageScrollTop(newVal) {
+			this.usePageScroll && this._scrollTopChange(newVal,true);
+		},
+		usePageScroll: {
+			handler(newVal) {
+				this.loaded && this.autoHeight && this._setAutoHeight(!newVal);
+				// #ifdef H5
+				if (newVal) {
+					this.$nextTick(() => {
+						const mainScrollRef = this.$refs['zp-scroll-view'].$refs.main;
+						if (mainScrollRef) {
+							mainScrollRef.style = {};
+						}
+					})
+				}
+				// #endif
+			},
+			immediate: true
+		},
+		finalScrollTop(newVal) {
+			if (!this.useChatRecordMode) {
+				this.renderPropScrollTop = newVal < 6 ? 0 : 10;
+			}
+		},
+	},
+	computed: {
+		finalScrollWithAnimation() {
+			if (this.privateScrollWithAnimation !== -1) {
+				const scrollWithAnimation = this.privateScrollWithAnimation === 1;
+				this.privateScrollWithAnimation = -1;
+				return scrollWithAnimation;
+			}
+			return this.scrollWithAnimation;
+		},
+		finalScrollViewStyle() {
+			if (this.superContentZIndex != 1) {
+				this.scrollViewStyle['z-index'] = this.superContentZIndex;
+				this.scrollViewStyle['position'] = 'relative';
+			}
+			return this.scrollViewStyle;
+		},
+		finalScrollTop() {
+			return this.usePageScroll ? this.pageScrollTop : this.oldScrollTop;
+		},
+		finalIsOldWebView() {
+			return this.isOldWebView && !this.usePageScroll;
+		}
+	},
+	methods: {
+		//滚动到顶部，animate为是否展示滚动动画，默认为是
+		scrollToTop(animate, checkReverse = true) {
+			// #ifdef APP-NVUE
+			if (checkReverse && this.useChatRecordMode) {
+				if (!this.nIsFirstPageAndNoMore) {
+					this.scrollToBottom(animate, false);
+					return;
+				}
+			}
+			// #endif
+			this.$nextTick(() => {
+				this._scrollToTop(animate, false);
+				// #ifdef APP-NVUE
+				if (this.nvueFastScroll && animate) {
+					u.delay(() => {
+						this._scrollToTop(false, false);
+					});
+				}
+				// #endif
+			})
+		},
+		//滚动到底部，animate为是否展示滚动动画，默认为是
+		scrollToBottom(animate, checkReverse = true) {
+			// #ifdef APP-NVUE
+			if (checkReverse && this.useChatRecordMode) {
+				if (!this.nIsFirstPageAndNoMore) {
+					this.scrollToTop(animate, false);
+					return;
+				}
+			}
+			// #endif
+			this.$nextTick(() => {
+				this._scrollToBottom(animate);
+				// #ifdef APP-NVUE
+				if (this.nvueFastScroll && animate) {
+					u.delay(() => {
+						this._scrollToBottom(false);
+					});
+				}
+				// #endif
+			})
+		},
+		//滚动到指定view(vue中有效)。sel为需要滚动的view的id值，不包含"#"；offset为偏移量，单位为px；animate为是否展示滚动动画，默认为否
+		scrollIntoViewById(sel, offset, animate) {
+			this._scrollIntoView(sel, offset, animate);
+		},
+		//滚动到指定view(vue中有效)。nodeTop为需要滚动的view的top值(通过uni.createSelectorQuery()获取)；offset为偏移量，单位为px；animate为是否展示滚动动画，默认为否
+		scrollIntoViewByNodeTop(nodeTop, offset, animate) {
+			this.scrollTop = this.oldScrollTop;
+			this.$nextTick(() => {
+				this._scrollIntoViewByNodeTop(nodeTop, offset, animate);
+			})
+		},
+		//滚动到指定位置(vue中有效)。y为与顶部的距离，单位为px；offset为偏移量，单位为px；animate为是否展示滚动动画，默认为否
+		scrollToY(y, offset, animate) {
+			this.scrollTop = this.oldScrollTop;
+			this.$nextTick(() => {
+				this._scrollToY(y, offset, animate);
+			})
+		},
+		//滚动到指定view(nvue中有效)。index为需要滚动的view的index(第几个)；offset为偏移量，单位为px；animate为是否展示滚动动画，默认为否
+		scrollIntoViewByIndex(index, offset, animate) {
+			this._scrollIntoView(index, offset, animate);
+		},
+		//滚动到指定view(nvue中有效)。view为需要滚动的view(通过`this.$refs.xxx`获取)，不包含"#"；offset为偏移量，单位为px；animate为是否展示滚动动画，默认为否
+		scrollIntoViewByView(view, offset, animate) {
+			this._scrollIntoView(view, offset, animate);
+		},
+		//当使用页面滚动并且自定义下拉刷新时，请在页面的onPageScroll中调用此方法，告知z-paging当前的pageScrollTop，否则会导致在任意位置都可以下拉刷新
+		updatePageScrollTop(value) {
+			this.pageScrollTop = value;
+		},
+		//当使用页面滚动并且设置了slot="top"时，默认初次加载会自动获取其高度，并使内部容器下移，当slot="top"的view高度动态改变时，在其高度需要更新时调用此方法
+		updatePageScrollTopHeight() {
+			this._updatePageScrollTopOrBottomHeight('top');
+		},
+		//当使用页面滚动并且设置了slot="bottom"时，默认初次加载会自动获取其高度，并使内部容器下移，当slot="bottom"的view高度动态改变时，在其高度需要更新时调用此方法
+		updatePageScrollBottomHeight() {
+			this._updatePageScrollTopOrBottomHeight('bottom');
+		},
+		//更新slot="left"和slot="right"宽度，当slot="left"或slot="right"宽度动态改变时调用
+		updateLeftAndRightWidth() {
+			if (!this.finalIsOldWebView) return;
+			this.$nextTick(() => this._updateLeftAndRightWidth(this.scrollViewContainerStyle, 'zp-page'));
+		},
+		//更新z-paging内置scroll-view的scrollTop
+		updateScrollViewScrollTop(scrollTop, animate = true) {
+			this.privateScrollWithAnimation = animate ? 1 : 0;
+			this.scrollTop = this.oldScrollTop;
+			this.$nextTick(() => {
+				this.scrollTop = scrollTop;
+				this.oldScrollTop = this.scrollTop;
+			});
+		},
+		
+		//当滚动到顶部时
+		_onScrollToUpper() {
+			this.$emit('scrolltoupper');
+			this.$emit('scrollTopChange', 0);
+			this.$nextTick(() => {
+				this.oldScrollTop = 0;
+			})
+			this.useChatRecordMode && this.loadingStatus !== Enum.More.NoMore && this._onLoadingMore('click');
+		},
+		//当滚动到底部时
+		_onScrollToLower(e) {
+			(!e.detail || !e.detail.direction || e.detail.direction === 'bottom') && this._onLoadingMore('toBottom')
+		},
+		//滚动到顶部
+		_scrollToTop(animate = true, isPrivate = true) {
+			// #ifdef APP-NVUE
+			const el = this.$refs['zp-n-list-top-tag'];
+			if (this.usePageScroll) {
+				this._getNodeClientRect('zp-page-scroll-top', false).then(node => {
+					const nodeHeight = node ? node[0].height : 0;
+					weexDom.scrollToElement(el, {
+						offset: -nodeHeight,
+						animated: animate
+					});
+				});
+			} else {
+				if (!this.isIos && this.nvueListIs === 'scroller') {
+					this._getNodeClientRect('zp-n-refresh-container', false).then(node => {
+						const nodeHeight = node ? node[0].height : 0;
+						weexDom.scrollToElement(el, {
+							offset: -nodeHeight,
+							animated: animate
+						});
+					});
+				} else {
+					weexDom.scrollToElement(el, {
+						offset: 0,
+						animated: animate
+					});
+				}
+			}
+			return;
+			// #endif
+			if (this.usePageScroll) {
+				this.$nextTick(() => {
+					uni.pageScrollTo({
+						scrollTop: 0,
+						duration: animate ? 100 : 0,
+					});
+				});
+				return;
+			}
+			this.privateScrollWithAnimation = animate ? 1 : 0;
+			this.scrollTop = this.oldScrollTop;
+			this.$nextTick(() => {
+				this.scrollTop = 0;
+				this.oldScrollTop = this.scrollTop;
+			});
+		},
+		//滚动到底部
+		async _scrollToBottom(animate = true) {
+			// #ifdef APP-NVUE
+			const el = this.$refs['zp-n-list-bottom-tag'];
+			if (el) {
+				weexDom.scrollToElement(el, {
+					offset: 0,
+					animated: animate
+				});
+			} else {
+				u.consoleErr('滚动到底部失败，因为您设置了hideNvueBottomTag为true');
+			}
+			return;
+			// #endif
+			if (this.usePageScroll) {
+				this.$nextTick(() => {
+					uni.pageScrollTo({
+						scrollTop: Number.MAX_VALUE,
+						duration: animate ? 100 : 0,
+					});
+				});
+				return;
+			}
+			try {
+				this.privateScrollWithAnimation = animate ? 1 : 0;
+				const pagingContainerNode = await this._getNodeClientRect('.zp-paging-container');
+				const scrollViewNode = await this._getNodeClientRect('.zp-scroll-view');
+				const pagingContainerH = pagingContainerNode ? pagingContainerNode[0].height : 0;
+				const scrollViewH = scrollViewNode ? scrollViewNode[0].height : 0;
+				if (pagingContainerH > scrollViewH) {
+					this.scrollTop = this.oldScrollTop;
+					this.$nextTick(() => {
+						this.scrollTop = pagingContainerH - scrollViewH + this.virtualPlaceholderTopHeight;
+						this.oldScrollTop = this.scrollTop;
+					});
+				}
+			} catch (e) {}
+		},
+		//滚动到指定view
+		_scrollIntoView(sel, offset = 0, animate = false, finishCallback) {
+			try {
+				this.scrollTop = this.oldScrollTop;
+				this.$nextTick(() => {
+					// #ifdef APP-NVUE
+					const refs = this.$parent.$refs;
+					if (!refs) return;
+					const dataType = Object.prototype.toString.call(sel);
+					let el = null;
+					if (dataType === '[object Number]') {
+						const els = refs[`z-paging-${sel}`];
+						el = els ? els[0] : null;
+					} else if (dataType === '[object Array]') {
+						el = sel[0];
+					} else {
+						el = sel;
+					}
+					if (el) {
+						weexDom.scrollToElement(el, {
+							offset: -offset,
+							animated: animate
+						});
+					} else {
+						u.consoleErr('在nvue中滚动到指定位置，cell必须设置 :ref="`z-paging-${index}`"');
+					}
+					return;
+					// #endif
+					this._getNodeClientRect('#' + sel.replace('#', ''), this.$parent).then((node) => {
+						if (node) {
+							let nodeTop = node[0].top;
+							this._scrollIntoViewByNodeTop(nodeTop, offset, animate);
+							finishCallback && finishCallback();
+						}
+					});
+				});
+			} catch (e) {}
+		},
+		//通过nodeTop滚动到指定view
+		_scrollIntoViewByNodeTop(nodeTop, offset = 0, animate = false) {
+			this._scrollToY(nodeTop, offset, animate, true);
+		},
+		//滚动到指定位置
+		_scrollToY(y, offset = 0, animate = false, addScrollTop = false) {
+			this.privateScrollWithAnimation = animate ? 1 : 0;
+			if (this.usePageScroll) {
+				uni.pageScrollTo({
+					scrollTop: y - offset,
+					duration: animate ? 100 : 0
+				});
+			} else {
+				if(addScrollTop){
+				   y += this.oldScrollTop; 
+				}
+				this.scrollTop = y - offset;
+				this.oldScrollTop = this.scrollTop;
+			}
+		},
+		//scroll-view滚动中
+		_scroll(e) {
+			this.$emit('scroll', e);
+			const scrollTop = e.detail.scrollTop;
+			// #ifndef APP-NVUE
+			this.finalUseVirtualList && this._updateVirtualScroll(scrollTop, this.oldScrollTop - scrollTop);
+			// #endif
+			this.oldScrollTop = scrollTop;
+			const scrollDiff = e.detail.scrollHeight - this.oldScrollTop;
+			!this.isIos && this._checkScrolledToBottom(scrollDiff);
+		},
+		//检测scrollView是否要铺满屏幕
+		_doCheckScrollViewShouldFullHeight(totalData) {
+			if (this.autoFullHeight && this.usePageScroll && this.isTotalChangeFromAddData) {
+				// #ifndef APP-NVUE
+				this.$nextTick(() => {
+					this._checkScrollViewShouldFullHeight((scrollViewNode, pagingContainerNode) => {
+						this._preCheckShowNoMoreInside(totalData, scrollViewNode, pagingContainerNode)
+					});
+				})
+				// #endif
+				// #ifdef APP-NVUE
+				this._preCheckShowNoMoreInside(totalData)
+				// #endif
+			} else {
+				this._preCheckShowNoMoreInside(totalData)
+			} 
+		},
+		//检测z-paging是否要全屏覆盖(当使用页面滚动并且不满全屏时，默认z-paging需要铺满全屏，避免数据过少时内部的empty-view无法正确展示)
+		async _checkScrollViewShouldFullHeight(callback) {
+			try {
+				const scrollViewNode = await this._getNodeClientRect('.zp-scroll-view');
+				const pagingContainerNode = await this._getNodeClientRect('.zp-paging-container-content');
+				if (!scrollViewNode || !pagingContainerNode) return;
+				const scrollViewHeight = pagingContainerNode[0].height;
+				const scrollViewTop = scrollViewNode[0].top;
+				if (this.isAddedData && scrollViewHeight + scrollViewTop <= this.windowHeight) {
+					this._setAutoHeight(true, scrollViewNode);
+					callback(scrollViewNode, pagingContainerNode);
+				} else {
+					this._setAutoHeight(false);
+					callback(null, null);
+				}
+			} catch (e) {
+				callback(null, null);
+			}
+		},
+		//scrollTop改变时触发
+		_scrollTopChange(newVal, isPageScrollTop){
+			this.$emit('scrollTopChange', newVal);
+			this.$emit('update:scrollTop', newVal);
+			this._checkShouldShowBackToTop(newVal);
+			const scrollTop = this.isIos ? (newVal > 5 ? 6 : 0) : (newVal > 105 ? 106 : (newVal > 5 ? 6 : 0));
+			if (isPageScrollTop && this.wxsPageScrollTop !== scrollTop) {
+				this.wxsPageScrollTop = scrollTop;
+			} else if (!isPageScrollTop && this.wxsScrollTop !== scrollTop) {
+				this.wxsScrollTop = scrollTop;
+				if (scrollTop > 6) {
+					this.scrollEnable = true;
+				}
+			}
+		},
+		//更新使用页面滚动时slot="top"或"bottom"插入view的高度
+		_updatePageScrollTopOrBottomHeight(type) {
+			// #ifndef APP-NVUE
+			if (!this.usePageScroll) return;
+			// #endif
+			this._doCheckScrollViewShouldFullHeight(this.realTotalData);
+			const node = `.zp-page-${type}`;
+			const marginText = `margin${type.slice(0,1).toUpperCase() + type.slice(1)}`;
+			let safeAreaInsetBottomAdd = this.safeAreaInsetBottom;
+			this.$nextTick(() => {
+				let delayTime = 0;
+				// #ifdef MP-BAIDU || APP-NVUE
+				delayTime = 50;
+				// #endif
+				u.delay(() => {
+					this._getNodeClientRect(node).then((res) => {
+						if (res) {
+							let pageScrollNodeHeight = res[0].height;
+							if (type === 'bottom') {
+								if (safeAreaInsetBottomAdd) {
+									pageScrollNodeHeight += this.safeAreaBottom;
+								}
+							} else {
+								this.cacheTopHeight = pageScrollNodeHeight;
+							}
+							this.$set(this.scrollViewStyle, marginText, `${pageScrollNodeHeight}px`);
+						} else if (safeAreaInsetBottomAdd) {
+							this.$set(this.scrollViewStyle, marginText, `${this.safeAreaBottom}px`);
+						}
+					});
+				}, delayTime)
+			})
+		},
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/virtual-list.js b/uni_modules/z-paging/components/z-paging/js/modules/virtual-list.js
new file mode 100644
index 0000000..dd55127
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/virtual-list.js
@@ -0,0 +1,461 @@
+// [z-paging]虚拟列表模块
+import u from '.././z-paging-utils'
+import c from '.././z-paging-constant'
+import Enum from '.././z-paging-enum'
+
+export default {
+	props: {
+		//是否使用虚拟列表，默认为否
+		useVirtualList: {
+			type: Boolean,
+			default: u.gc('useVirtualList', false)
+		},
+		//在使用虚拟列表时，是否使用兼容模式，默认为否
+		useCompatibilityMode: {
+			type: Boolean,
+			default: u.gc('useCompatibilityMode', false)
+		},
+		//使用兼容模式时传递的附加数据
+		extraData: {
+			type: Object,
+			default: function() {
+				return u.gc('extraData', {});
+			}
+		},
+		//是否在z-paging内部循环渲染列表(内置列表)，默认为否。若use-virtual-list为true，则此项恒为true
+		useInnerList: {
+			type: Boolean,
+			default: u.gc('useInnerList', false)
+		},
+		//强制关闭inner-list，默认为false，如果为true将强制关闭innerList，适用于开启了虚拟列表后需要强制关闭inner-list的情况
+		forceCloseInnerList: {
+			type: Boolean,
+			default: u.gc('forceCloseInnerList', false)
+		},
+		//内置列表cell的key名称，仅nvue有效，在nvue中开启use-inner-list时必须填此项
+		cellKeyName: {
+			type: String,
+			default: u.gc('cellKeyName', '')
+		},
+		//innerList样式
+		innerListStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('innerListStyle', {});
+			}
+		},
+		//innerCell样式
+		innerCellStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('innerCellStyle', {});
+			}
+		},
+		//预加载的列表可视范围(列表高度)页数，默认为12，即预加载当前页及上下各12页的cell。此数值越大，则虚拟列表中加载的dom越多，内存消耗越大(会维持在一个稳定值)，但增加预加载页面数量可缓解快速滚动短暂白屏问题
+		preloadPage: {
+			type: [Number, String],
+			default: u.gc('preloadPage', 12),
+			validator: (value) => {
+				if (value <= 0) u.consoleErr('preload-page必须大于0！');
+				return value > 0;
+			}
+		},
+		//虚拟列表cell高度模式，默认为fixed，也就是每个cell高度完全相同，将以第一个cell高度为准进行计算。可选值【dynamic】，即代表高度是动态非固定的，【dynamic】性能低于【fixed】。
+		cellHeightMode: {
+			type: String,
+			default: u.gc('cellHeightMode', Enum.CellHeightMode.Fixed)
+		},
+		//虚拟列表列数，默认为1。常用于每行有多列的情况，例如每行有2列数据，需要将此值设置为2
+		virtualListCol: {
+			type: [Number, String],
+			default: u.gc('virtualListCol', 1)
+		},
+		//虚拟列表scroll取样帧率，默认为80，过低容易出现白屏问题，过高容易出现卡顿问题
+		virtualScrollFps: {
+			type: [Number, String],
+			default: u.gc('virtualScrollFps', 80)
+		},
+	},
+	data() {
+		return {
+			virtualListKey: u.getInstanceId(),
+			virtualPageHeight: 0,
+			virtualCellHeight: 0,
+			virtualScrollTimeStamp: 0,
+			
+			virtualList: [],
+			virtualPlaceholderTopHeight: 0,
+			virtualPlaceholderBottomHeight: 0,
+			virtualTopRangeIndex: 0,
+			virtualBottomRangeIndex: 0,
+			lastVirtualTopRangeIndex: 0,
+			lastVirtualBottomRangeIndex: 0,
+			virtualItemInsertedCount: 0,
+			
+			virtualHeightCacheList: [],
+			
+			getCellHeightRetryCount: {
+				fixed: 0,
+				dynamic: 0
+			},
+			pagingOrgTop: -1,
+			updateVirtualListFromDataChange: false
+		}
+	},
+	watch: {
+		realTotalData(newVal) {
+			// #ifndef APP-NVUE
+			if (this.finalUseVirtualList) {
+				this.updateVirtualListFromDataChange = true;
+				this.$nextTick(() => {
+					this.getCellHeightRetryCount.fixed = 0;
+					!newVal.length && this._resetDynamicListState(!this.isUserPullDown);
+					newVal.length && this.cellHeightMode === Enum.CellHeightMode.Fixed && this.isFirstPage && this._updateFixedCellHeight();
+					this._updateVirtualScroll(this.oldScrollTop);
+				})
+			}
+			// #endif
+		},
+		virtualList(newVal){
+			this.$emit('update:virtualList', newVal);
+			this.$emit('virtualListChange', newVal);
+		}
+	},
+	computed: {
+		virtualCellIndexKey() {
+			return c.listCellIndexKey;
+		},
+		finalUseVirtualList() {
+			if (this.useVirtualList && this.usePageScroll){
+				u.consoleErr('使用页面滚动时，开启虚拟列表无效！');
+			}
+			return this.useVirtualList && !this.usePageScroll;
+		},
+		finalUseInnerList() {
+			return this.useInnerList || (this.finalUseVirtualList && !this.forceCloseInnerList);
+		},
+		finalCellKeyName() {
+			// #ifdef APP-NVUE
+			if (this.finalUseVirtualList && !this.cellKeyName.length){
+				u.consoleErr('在nvue中开启use-virtual-list必须设置cell-key-name，否则将可能导致列表渲染错误！');
+			}
+			// #endif
+			return this.cellKeyName;
+		},
+		finalVirtualPageHeight(){
+			return this.virtualPageHeight > 0 ? this.virtualPageHeight : this.windowHeight;
+		},
+		virtualRangePageHeight(){
+			return this.finalVirtualPageHeight * this.preloadPage;
+		},
+		virtualScrollDisTimeStamp() {
+			return 1000 / this.virtualScrollFps;
+		},
+	},
+	methods: {
+		//在使用动态高度虚拟列表时，若在列表数组中需要插入某个item，需要调用此方法；item:需要插入的item，index:插入的cell位置，若index为2，则插入的item在原list的index=1之后，index从0开始
+		doInsertVirtualListItem(item, index) {
+			if (this.cellHeightMode !== Enum.CellHeightMode.Dynamic) return;
+			this.virtualItemInsertedCount ++;
+			if (!item || Object.prototype.toString.call(item) !== '[object Object]') {
+				item = { item };
+			}
+			const cellIndexKey = this.virtualCellIndexKey;
+			item[cellIndexKey] = `custom-${this.virtualItemInsertedCount}`;
+			item[c.listCellIndexUniqueKey] = `${this.virtualListKey}-${item[cellIndexKey]}`;
+			this.totalData.splice(index, 0, item);
+			this.$nextTick(async () => {
+				let retryCount = 0;
+				while (retryCount <= 10) {
+					await u.wait(c.delayTime);
+					
+					const cellNode = await this._getNodeClientRect(`#zp-id-${item[cellIndexKey]}`, this.finalUseInnerList);
+					if (!cellNode) {
+						retryCount ++;
+						continue;
+					} 
+					
+					const currentHeight = cellNode ? cellNode[0].height : 0;
+					const lastHeightCache = this.virtualHeightCacheList[index - 1];
+					const lastTotalHeight = lastHeightCache ? lastHeightCache.totalHeight : 0;
+					this.virtualHeightCacheList.splice(index, 0, {
+						height: currentHeight,
+						lastTotalHeight,
+						totalHeight: lastTotalHeight + currentHeight
+					});
+					
+					for (let i = index + 1; i < this.virtualHeightCacheList.length; i++) {
+						const thisNode = this.virtualHeightCacheList[i];
+						thisNode.lastTotalHeight += currentHeight;
+						thisNode.totalHeight += currentHeight;
+					}
+					
+					this._updateVirtualScroll(this.oldScrollTop);
+					break;
+				}
+			})
+		},
+		//在使用动态高度虚拟列表时，手动更新指定cell的缓存高度(当cell高度在初始化之后再次改变时调用)；index:需要更新的cell在列表中的位置，从0开始
+		didUpdateVirtualListCell(index) {
+			if (this.cellHeightMode !== Enum.CellHeightMode.Dynamic) return;
+			const currentNode = this.virtualHeightCacheList[index];
+			this.$nextTick(() => {
+				this._getNodeClientRect(`#zp-id-${index}`, this.finalUseInnerList).then(cellNode => {
+					const cellNodeHeight = cellNode ? cellNode[0].height : 0;
+					const heightDis = cellNodeHeight - currentNode.height;
+					currentNode.height = cellNodeHeight;
+					currentNode.totalHeight = currentNode.lastTotalHeight + cellNodeHeight;
+					
+					for (let i = index + 1; i < this.virtualHeightCacheList.length; i++) {
+						const thisNode = this.virtualHeightCacheList[i];
+						thisNode.totalHeight += heightDis;
+						thisNode.lastTotalHeight += heightDis;
+					}
+				});
+			})
+		},
+		//在使用动态高度虚拟列表时，若删除了列表数组中的某个item，需要调用此方法以更新高度缓存数组；index:删除的cell在列表中的位置，从0开始
+		didDeleteVirtualListCell(index) {
+			if (this.cellHeightMode !== Enum.CellHeightMode.Dynamic) return;
+			const currentNode = this.virtualHeightCacheList[index];
+			for (let i = index + 1; i < this.virtualHeightCacheList.length; i++) {
+				const thisNode = this.virtualHeightCacheList[i];
+				thisNode.totalHeight -= currentNode.height;
+				thisNode.lastTotalHeight -= currentNode.height;
+			}
+			this.virtualHeightCacheList.splice(index, 1);
+		},
+		//初始化虚拟列表
+		_virtualListInit() {
+			this.$nextTick(() => {
+				u.delay(() => {
+					this._getNodeClientRect('.zp-scroll-view').then(node => {
+						if (node) {
+							this.pagingOrgTop = node[0].top;
+							this.virtualPageHeight = node[0].height;
+						}
+					});
+				});
+			})
+		},
+		//cellHeightMode为fixed时获取第一个cell高度
+		_updateFixedCellHeight() {
+			this.$nextTick(() => {
+				u.delay(() => {
+					this._getNodeClientRect(`#zp-id-${0}`,this.finalUseInnerList).then(cellNode => {
+						if (!cellNode) {
+							if (this.getCellHeightRetryCount.fixed > 10) return;
+							this.getCellHeightRetryCount.fixed ++;
+							this._updateFixedCellHeight();
+						} else {
+							this.virtualCellHeight = cellNode[0].height;
+							this._updateVirtualScroll(this.oldScrollTop);
+						}
+					});
+				}, c.delayTime, 'updateFixedCellHeightDelay');
+			})
+		},
+		//cellHeightMode为dynamic时获取每个cell高度
+		_updateDynamicCellHeight(list, dataFrom = 'bottom') {
+			const dataFromTop = dataFrom === 'top';
+			const heightCacheList = this.virtualHeightCacheList;
+			const currentCacheList = dataFromTop ?  [] : heightCacheList;
+			let listTotalHeight = 0;
+			this.$nextTick(() => {
+				u.delay(async () => {
+					for (let i = 0; i < list.length; i++) {
+						const cellNode = await this._getNodeClientRect(`#zp-id-${list[i][this.virtualCellIndexKey]}`, this.finalUseInnerList);
+						const currentHeight = cellNode ? cellNode[0].height : 0;
+						if (!cellNode) {
+							if (this.getCellHeightRetryCount.dynamic <= 10) {
+								heightCacheList.splice(heightCacheList.length - i, i);
+								this.getCellHeightRetryCount.dynamic ++;
+								this._updateDynamicCellHeight(list, dataFrom);
+							}
+							return;
+						} 
+						const lastHeightCache = currentCacheList.length ? currentCacheList.slice(-1)[0] : null;
+						const lastTotalHeight = lastHeightCache ? lastHeightCache.totalHeight : 0;
+						currentCacheList.push({
+							height: currentHeight,
+							lastTotalHeight,
+							totalHeight: lastTotalHeight + currentHeight
+						});
+						if (dataFromTop) {
+							listTotalHeight += currentHeight;
+						}
+					}
+					if (dataFromTop && list.length) {
+						for (let i = 0; i < heightCacheList.length; i++) {
+							const heightCacheItem = heightCacheList[i];
+							heightCacheItem.lastTotalHeight += listTotalHeight;
+							heightCacheItem.totalHeight += listTotalHeight;
+						}
+						this.virtualHeightCacheList = currentCacheList.concat(heightCacheList);
+					}
+					this._updateVirtualScroll(this.oldScrollTop);
+				}, c.delayTime, 'updateDynamicCellHeightDelay')
+			})
+		},
+		//设置cellItem的index
+		_setCellIndex(list, dataFrom = 'bottom') {
+			let currentItemIndex = 0;
+			const cellIndexKey = this.virtualCellIndexKey;
+			if (this.totalData.length) {
+				if (dataFrom === 'bottom') {
+					currentItemIndex = this.realTotalData.length;
+					const lastItem = this.realTotalData.length ? this.realTotalData.slice(-1)[0] : null;
+					if (lastItem && lastItem[cellIndexKey] !== undefined) {
+						currentItemIndex = lastItem[cellIndexKey] + 1;
+					}
+				} else if (dataFrom === 'top') {
+					const firstItem = this.realTotalData.length ? this.realTotalData[0] : null;
+					if (firstItem && firstItem[cellIndexKey] !== undefined) {
+						currentItemIndex = firstItem[cellIndexKey] - list.length;
+					}
+				}
+			} else {			
+				this._resetDynamicListState();
+			}
+			for (let i = 0; i < list.length; i++) {
+				let item = list[i];
+				if (!item || Object.prototype.toString.call(item) !== '[object Object]') {
+					item = { item };
+				}
+				item[cellIndexKey] = currentItemIndex + i;
+				item[c.listCellIndexUniqueKey] = `${this.virtualListKey}-${item[cellIndexKey]}`;
+				list[i] = item;
+			}
+			this.getCellHeightRetryCount.dynamic = 0;
+			this.cellHeightMode === Enum.CellHeightMode.Dynamic && this._updateDynamicCellHeight(list, dataFrom);
+		},
+		//更新scroll滚动
+		_updateVirtualScroll(scrollTop, scrollDiff = 0) {
+			const currentTimeStamp = u.getTime();
+			scrollTop === 0 && this._resetTopRange();
+			if (scrollTop !== 0 && this.virtualScrollTimeStamp && currentTimeStamp - this.virtualScrollTimeStamp <= this.virtualScrollDisTimeStamp) {
+				return;
+			}
+			this.virtualScrollTimeStamp = currentTimeStamp;
+			
+			let scrollIndex = 0;
+			const cellHeightMode = this.cellHeightMode;
+			if (cellHeightMode === Enum.CellHeightMode.Fixed) {
+				scrollIndex = parseInt(scrollTop / this.virtualCellHeight) || 0;
+				this._updateFixedTopRangeIndex(scrollIndex);
+				this._updateFixedBottomRangeIndex(scrollIndex);
+			} else if(cellHeightMode === Enum.CellHeightMode.Dynamic) {
+				const scrollDirection = scrollDiff > 0 ? 'top' : 'bottom';
+				const rangePageHeight = this.virtualRangePageHeight;
+				const topRangePageOffset = scrollTop - rangePageHeight;
+				const bottomRangePageOffset = scrollTop + this.finalVirtualPageHeight + rangePageHeight;
+				
+				let virtualBottomRangeIndex = 0;
+				let virtualPlaceholderBottomHeight = 0;
+				let reachedLimitBottom = false;
+				const heightCacheList = this.virtualHeightCacheList;
+				const lastHeightCache = !!heightCacheList ? heightCacheList.slice(-1)[0] : null;
+				
+				let startTopRangeIndex = this.virtualTopRangeIndex;
+				if (scrollDirection === 'bottom') {
+					for (let i = startTopRangeIndex; i < heightCacheList.length; i++){
+						const heightCacheItem = heightCacheList[i];
+						if (heightCacheItem && heightCacheItem.totalHeight > topRangePageOffset) {
+							this.virtualTopRangeIndex = i;
+							this.virtualPlaceholderTopHeight = heightCacheItem.lastTotalHeight;
+							break;
+						}
+					}
+				} else {
+					let topRangeMatched = false;
+					for (let i = startTopRangeIndex; i >= 0; i--){
+						const heightCacheItem = heightCacheList[i];
+						if (heightCacheItem && heightCacheItem.totalHeight < topRangePageOffset) {
+							this.virtualTopRangeIndex = i;
+							this.virtualPlaceholderTopHeight = heightCacheItem.lastTotalHeight;
+							topRangeMatched = true;
+							break;
+						}
+					}
+					!topRangeMatched && this._resetTopRange();
+				}
+				for (let i = this.virtualTopRangeIndex; i < heightCacheList.length; i++){
+					const heightCacheItem = heightCacheList[i];
+					if (heightCacheItem && heightCacheItem.totalHeight > bottomRangePageOffset) {
+						virtualBottomRangeIndex = i;
+						virtualPlaceholderBottomHeight = lastHeightCache.totalHeight - heightCacheItem.totalHeight;
+						reachedLimitBottom = true;
+						break;
+					}
+				}
+				if (!reachedLimitBottom || this.virtualBottomRangeIndex === 0) {
+					this.virtualBottomRangeIndex = this.realTotalData.length ? this.realTotalData.length - 1 : this.pageSize;
+					this.virtualPlaceholderBottomHeight = 0;
+				} else {
+					this.virtualBottomRangeIndex = virtualBottomRangeIndex;
+					this.virtualPlaceholderBottomHeight = virtualPlaceholderBottomHeight;
+				}
+				this._updateVirtualList();
+			}
+		},
+		//更新fixedCell模式下topRangeIndex&placeholderTopHeight
+		_updateFixedTopRangeIndex(scrollIndex) {
+			let virtualTopRangeIndex = this.virtualCellHeight === 0 ? 0 : scrollIndex - (parseInt(this.finalVirtualPageHeight / this.virtualCellHeight) || 1) * this.preloadPage;
+			virtualTopRangeIndex *= this.virtualListCol;
+			virtualTopRangeIndex = Math.max(0, virtualTopRangeIndex);
+			this.virtualTopRangeIndex = virtualTopRangeIndex;
+			this.virtualPlaceholderTopHeight = (virtualTopRangeIndex / this.virtualListCol) * this.virtualCellHeight;
+		},
+		//更新fixedCell模式下bottomRangeIndex&placeholderBottomHeight
+		_updateFixedBottomRangeIndex(scrollIndex) {
+			let virtualBottomRangeIndex = this.virtualCellHeight === 0 ? this.pageSize : scrollIndex + (parseInt(this.finalVirtualPageHeight / this.virtualCellHeight) || 1) * (this.preloadPage + 1);
+			virtualBottomRangeIndex *= this.virtualListCol;
+			virtualBottomRangeIndex = Math.min(this.realTotalData.length, virtualBottomRangeIndex);
+			this.virtualBottomRangeIndex = virtualBottomRangeIndex;
+			this.virtualPlaceholderBottomHeight = (this.realTotalData.length - virtualBottomRangeIndex) * this.virtualCellHeight / this.virtualListCol;
+			this._updateVirtualList();
+		},
+		//更新virtualList
+		_updateVirtualList() {
+			const shouldUpdateList = this.updateVirtualListFromDataChange || (this.lastVirtualTopRangeIndex !== this.virtualTopRangeIndex || this.lastVirtualBottomRangeIndex !== this.virtualBottomRangeIndex);
+			if (shouldUpdateList) {
+				this.updateVirtualListFromDataChange = false;
+				this.lastVirtualTopRangeIndex =  this.virtualTopRangeIndex;
+				this.lastVirtualBottomRangeIndex = this.virtualBottomRangeIndex;
+				this.virtualList = this.realTotalData.slice(this.virtualTopRangeIndex, this.virtualBottomRangeIndex + 1);
+			}
+		},
+		//重置动态cell模式下的高度缓存数据、虚拟列表和滚动状态
+		_resetDynamicListState(resetVirtualList = false) {
+			this.virtualHeightCacheList = [];
+			if (resetVirtualList) {
+				this.virtualList = [];
+			}
+			this.virtualTopRangeIndex = 0;
+			this.virtualPlaceholderTopHeight = 0;
+		},
+		//重置topRangeIndex和placeholderTopHeight
+		_resetTopRange() {
+			this.virtualTopRangeIndex = 0;
+			this.virtualPlaceholderTopHeight = 0;
+			this._updateVirtualList();
+		},
+		//检测虚拟列表当前滚动位置，如发现滚动位置不正确则重新计算虚拟列表相关参数(为解决在App中可能出现的长时间进入后台后打开App白屏的问题)
+		_checkVirtualListScroll() {
+			if (this.finalUseVirtualList) {
+				this.$nextTick(() => {
+					this._getNodeClientRect('.zp-paging-touch-view').then(node => {
+						const currentTop = node ? node[0].top : 0;
+						if (!node || (currentTop === this.pagingOrgTop && this.virtualPlaceholderTopHeight !== 0)) {
+							this._updateVirtualScroll(0);
+						}
+					});
+				})
+			}
+		},
+		//处理使用内置列表时点击了cell事件
+		_innerCellClick(item, index) {
+			this.$emit('innerCellClick', item, index);
+		}
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/z-paging-config.js b/uni_modules/z-paging/components/z-paging/js/z-paging-config.js
new file mode 100644
index 0000000..c7b714e
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/z-paging-config.js
@@ -0,0 +1,21 @@
+// [z-paging]处理main.js中的配置信息工具
+
+let config = null;
+let getedStorage = false;
+const storageKey = 'Z-PAGING-CONFIG-STORAGE-KEY'
+
+function setConfig(value) {
+	uni.setStorageSync(storageKey, value);
+}
+
+function getConfig() {
+	if (getedStorage) return config;
+	config = uni.getStorageSync(storageKey);
+	getedStorage = true;
+	return config;
+}
+
+export default {
+	setConfig,
+	getConfig
+};
diff --git a/uni_modules/z-paging/components/z-paging/js/z-paging-constant.js b/uni_modules/z-paging/components/z-paging/js/z-paging-constant.js
new file mode 100644
index 0000000..acb63f5
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/z-paging-constant.js
@@ -0,0 +1,12 @@
+// [z-paging]常量
+
+export default {
+	version: '2.6.0',
+	delayTime: 100,
+	errorUpdateKey: 'z-paging-error-emit',
+	completeUpdateKey: 'z-paging-complete-emit',
+	cachePrefixKey: 'z-paging-cache',
+	
+	listCellIndexKey: 'zp_index',
+	listCellIndexUniqueKey: 'zp_unique_index'
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/z-paging-enum.js b/uni_modules/z-paging/components/z-paging/js/z-paging-enum.js
new file mode 100644
index 0000000..17ad63a
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/z-paging-enum.js
@@ -0,0 +1,44 @@
+// [z-paging]枚举
+
+export default {
+	//当前加载类型 0.下拉刷新 1.上拉加载更多
+	LoadingType: {
+		Refresher: 0,
+		LoadingMore: 1
+	},
+	//下拉刷新状态 0.默认状态 1.松手立即刷新 2.刷新中 3.刷新结束
+	Refresher: {
+		Default: 0,
+		ReleaseToRefresh: 1,
+		Loading: 2,
+		Complete: 3
+	},
+	//底部加载更多状态 0.默认状态 1.加载中 2.没有更多数据 3.加载失败
+	More: {
+		Default: 0,
+		Loading: 1,
+		NoMore: 2,
+		Fail: 3
+	},
+	//@query触发来源 0.用户主动下拉刷新 1.通过reload触发 2.通过refresh触发 3.通过滚动到底部加载更多或点击底部加载更多触发
+	QueryFrom: {
+		UserPullDown: 0,
+		Reload: 1,
+		Refresh: 2,
+		LoadingMore: 3
+	},
+	//虚拟列表cell高度模式
+	CellHeightMode: {
+		//固定高度
+		Fixed: 'fixed',
+		//动态高度
+		Dynamic: 'dynamic'
+	},
+	//列表缓存模式
+	CacheMode: {
+		//默认模式，只会缓存一次
+		Default: 'default',
+		//总是缓存，每次列表刷新(下拉刷新、调用reload等)都会更新缓存
+		Always: 'always'
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/z-paging/components/z-paging/js/z-paging-interceptor.js b/uni_modules/z-paging/components/z-paging/js/z-paging-interceptor.js
new file mode 100644
index 0000000..d0e9b2b
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/z-paging-interceptor.js
@@ -0,0 +1,48 @@
+// [z-paging]拦截器
+
+//拦截&处理@query事件
+function handleQuery(callback) {
+	try {
+		setTimeout(function() {
+			_getApp().globalData.zp_handleQueryCallback = callback;
+		}, 1);
+	} catch (e) {}
+}
+
+//拦截&处理@query事件(私有，请勿调用)
+function _handleQuery(pageNo, pageSize, from, lastItem){
+	const callback = _getApp().globalData.zp_handleQueryCallback;
+	return callback ? callback(pageNo, pageSize, from, lastItem) : [pageNo, pageSize, from];
+}
+
+//拦截&处理系统language转i18n local
+function handleLanguage2Local(callback) {
+	try {
+		setTimeout(function() {
+			_getApp().globalData.zp_handleLanguage2LocalCallback = callback;
+		}, 1);
+	} catch (e) {}
+}
+
+//拦截&处理系统language转i18n local(私有，请勿调用)
+function _handleLanguage2Local(language, local){
+	const callback = _getApp().globalData.zp_handleLanguage2LocalCallback;
+	return callback ? callback(language, local) : local;
+}
+
+//获取当前app对象
+function _getApp(){
+	// #ifndef APP-NVUE
+	return getApp();
+	// #endif
+	// #ifdef APP-NVUE
+	return getApp({ allowDefault: true });
+	// #endif
+}
+
+export default {
+	handleQuery,
+	_handleQuery,
+	handleLanguage2Local,
+	_handleLanguage2Local
+};
diff --git a/uni_modules/z-paging/components/z-paging/js/z-paging-main.js b/uni_modules/z-paging/components/z-paging/js/z-paging-main.js
new file mode 100644
index 0000000..6500695
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/z-paging-main.js
@@ -0,0 +1,446 @@
+// [z-paging]核心js
+
+import zStatic from './z-paging-static'
+import c from './z-paging-constant'
+import u from './z-paging-utils'
+
+import zPagingRefresh from '../components/z-paging-refresh'
+import zPagingLoadMore from '../components/z-paging-load-more'
+import zPagingEmptyView from '../../z-paging-empty-view/z-paging-empty-view'
+
+// modules
+import commonLayoutModule from './modules/common-layout'
+import dataHandleModule from './modules/data-handle'
+import i18nModule from './modules/i18n'
+import nvueModule from './modules/nvue'
+import emptyModule from './modules/empty'
+import refresherModule from './modules/refresher'
+import loadMoreModule from './modules/load-more'
+import loadingModule from './modules/loading'
+import scrollerModule from './modules/scroller'
+import backToTopModule from './modules/back-to-top'
+import virtualListModule from './modules/virtual-list'
+
+import Enum from './z-paging-enum'
+
+const systemInfo = uni.getSystemInfoSync();
+
+export default {
+	name: "z-paging",
+	components: {
+		zPagingRefresh,
+		zPagingLoadMore,
+		zPagingEmptyView
+	},
+	mixins: [
+		commonLayoutModule,
+		dataHandleModule,
+		i18nModule,
+		nvueModule,
+		emptyModule,
+		refresherModule,
+		loadMoreModule,
+		loadingModule,
+		scrollerModule,
+		backToTopModule,
+		virtualListModule
+	],
+	data() {
+		return {
+			//--------------静态资源---------------
+			base64Arrow: zStatic.base64Arrow,
+			base64Flower: zStatic.base64Flower,
+			base64BackToTop: zStatic.base64BackToTop,
+
+			//-------------全局数据相关--------------
+			//当前加载类型
+			loadingType: Enum.LoadingType.Refresher,
+			requestTimeStamp: 0,
+			chatRecordLoadingMoreText: '',
+			wxsPropType: '',
+			renderPropScrollTop: -1,
+			checkScrolledToBottomTimeOut: null,
+			cacheTopHeight: -1,
+
+			//--------------状态&判断---------------
+			insideOfPaging: -1,
+			isLoadFailed: false,
+			isIos: systemInfo.platform === 'ios',
+			disabledBounce: false,
+			fromCompleteEmit: false,
+			disabledCompleteEmit: false,
+			pageLaunched: false,
+			
+			//---------------wxs相关---------------
+			wxsIsScrollTopInTopRange: true,
+			wxsScrollTop: 0,
+			wxsPageScrollTop: 0,
+			wxsOnPullingDown: false,
+		};
+	},
+	props: {
+		//调用complete后延迟处理的时间，单位为毫秒，默认0毫秒，优先级高于minDelay
+		delay: {
+			type: [Number, String],
+			default: u.gc('delay', 0),
+		},
+		//触发@query后最小延迟处理的时间，单位为毫秒，默认0毫秒，优先级低于delay（假设设置为300毫秒，若分页请求时间小于300毫秒，则在调用complete后延迟[300毫秒-请求时长]；若请求时长大于300毫秒，则不延迟），当show-refresher-when-reload为true或reload(true)时，其最小值为400
+		minDelay: {
+			type: [Number, String],
+			default: u.gc('minDelay', 0),
+		},
+		//设置z-paging的style，部分平台(如微信小程序)无法直接修改组件的style，可使用此属性代替
+		pagingStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('pagingStyle', {});
+			},
+		},
+		//z-paging的高度，优先级低于pagingStyle中设置的height；传字符串，如100px、100rpx、100%
+		height: {
+			type: String,
+			default: u.gc('height', '')
+		},
+		//z-paging的宽度，优先级低于pagingStyle中设置的width；传字符串，如100px、100rpx、100%
+		width: {
+			type: String,
+			default: u.gc('width', '')
+		},
+		//z-paging的背景色，优先级低于pagingStyle中设置的background。传字符串，如"#ffffff"
+		bgColor: {
+			type: String,
+			default: u.gc('bgColor', '')
+		},
+		//设置z-paging的容器(插槽的父view)的style
+		pagingContentStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('pagingContentStyle', {});
+			},
+		},
+		//z-paging是否自动高度，若自动高度则会自动铺满屏幕
+		autoHeight: {
+			type: Boolean,
+			default: u.gc('autoHeight', false)
+		},
+		//z-paging是否自动高度时，附加的高度，注意添加单位px或rpx，若需要减少高度，则传负数
+		autoHeightAddition: {
+			type: [Number, String],
+			default: u.gc('autoHeightAddition', '0px')
+		},
+		//loading(下拉刷新、上拉加载更多)的主题样式，支持black，white，默认black
+		defaultThemeStyle: {
+			type: String,
+			default: u.gc('defaultThemeStyle', 'black')
+		},
+		//z-paging是否使用fixed布局，若使用fixed布局，则z-paging的父view无需固定高度，z-paging高度默认为100%，默认为是(当使用内置scroll-view滚动时有效)
+		fixed: {
+			type: Boolean,
+			default: u.gc('fixed', true)
+		},
+		//是否开启底部安全区域适配
+		safeAreaInsetBottom: {
+			type: Boolean,
+			default: u.gc('safeAreaInsetBottom', false)
+		},
+		//开启底部安全区域适配后，是否使用placeholder形式实现，默认为否。为否时滚动区域会自动避开底部安全区域，也就是所有滚动内容都不会挡住底部安全区域，若设置为是，则滚动时滚动内容会挡住底部安全区域，但是当滚动到底部时才会避开底部安全区域
+		useSafeAreaPlaceholder: {
+			type: Boolean,
+			default: u.gc('useSafeAreaPlaceholder', false)
+		},
+		//slot="top"的view的z-index，默认为99，仅使用页面滚动时有效
+		topZIndex: {
+			type: Number,
+			default: u.gc('topZIndex', 99)
+		},
+		//z-paging内容容器父view的z-index，默认为1
+		superContentZIndex: {
+			type: Number,
+			default: u.gc('superContentZIndex', 1)
+		},
+		//z-paging内容容器部分的z-index，默认为10
+		contentZIndex: {
+			type: Number,
+			default: u.gc('contentZIndex', 10)
+		},
+		//使用页面滚动时，是否在不满屏时自动填充满屏幕，默认为是
+		autoFullHeight: {
+			type: Boolean,
+			default: u.gc('autoFullHeight', true)
+		},
+		//是否监听列表触摸方向改变，默认为否
+		watchTouchDirectionChange: {
+			type: Boolean,
+			default: u.gc('watchTouchDirectionChange', false)
+		},
+	},
+	created(){
+		if (this.createdReload && !this.refresherOnly && this.auto) {
+			this._startLoading();
+			this.$nextTick(this._preReload);
+		}
+	},
+	mounted() {
+		this.wxsPropType = u.getTime().toString();
+		this.renderJsIgnore;
+		if (!this.createdReload && !this.refresherOnly && this.auto) {
+			this.$nextTick(this._preReload);
+		}
+		this.finalUseCache && this._setListByLocalCache();
+		let delay = 0;
+		// #ifdef H5 || MP
+		delay = c.delayTime;
+		// #endif
+		this.$nextTick(() => {
+			this.systemInfo = uni.getSystemInfoSync();
+			!this.usePageScroll && this.autoHeight && this._setAutoHeight();
+			this.loaded = true;
+		})
+		this.updatePageScrollTopHeight();
+		this.updatePageScrollBottomHeight();
+		this.updateLeftAndRightWidth();
+		if (this.finalRefresherEnabled && this.useCustomRefresher) {
+			this.$nextTick(() => {
+				this.isTouchmoving = true;
+			})
+		}
+		this._onEmit();
+		// #ifdef APP-NVUE
+		if (!this.isIos && !this.useChatRecordMode) {
+			this.nLoadingMoreFixedHeight = true;
+		}
+		this._nUpdateRefresherWidth();
+		// #endif
+		// #ifndef APP-NVUE
+		this.finalUseVirtualList && this._virtualListInit();
+		// #endif
+		// #ifndef APP-PLUS
+		this.$nextTick(() => {
+			setTimeout(() => {
+				this._getCssSafeAreaInsetBottom(() => this.safeAreaInsetBottom && this.updatePageScrollBottomHeight());
+			}, delay)
+		})
+		// #endif
+	},
+	destroyed() {
+		this._offEmit();
+	},
+	// #ifdef VUE3
+	unmounted() {
+		this._offEmit();
+	},
+	// #endif
+	watch: {
+		defaultThemeStyle: {
+			handler(newVal) {
+				if (newVal.length) {
+					this.finalRefresherDefaultStyle = newVal;
+				}
+			},
+			immediate: true
+		},
+		autoHeight(newVal) {
+			this.loaded && !this.usePageScroll && this._setAutoHeight(newVal);
+		},
+		autoHeightAddition(newVal) {
+			this.loaded && !this.usePageScroll && this.autoHeight && this._setAutoHeight(newVal);
+		},
+	},
+	computed: {
+		finalPagingStyle() {
+			const pagingStyle = this.pagingStyle;
+			if (!this.systemInfo) return pagingStyle;
+			const { windowTop, windowBottom } = this;
+			if (!this.usePageScroll && this.fixed) {
+				if (windowTop && !pagingStyle.top) {
+					pagingStyle.top = windowTop + 'px';
+				}
+				if (windowBottom && !pagingStyle.bottom) {
+					pagingStyle.bottom = windowBottom + 'px';
+				}
+			}
+			if (this.bgColor.length && !pagingStyle['background']) {
+				pagingStyle['background'] = this.bgColor;
+			}
+			if (this.height.length && !pagingStyle['height']) {
+				pagingStyle['height'] = this.height;
+			}
+			if (this.width.length && !pagingStyle['width']) {
+				pagingStyle['width'] = this.width;
+			}
+			return pagingStyle;
+		},
+		finalLowerThreshold() {
+			return u.convertToPx(this.lowerThreshold);
+		},
+		finalPagingContentStyle() {
+			if (this.contentZIndex != 1) {
+				this.pagingContentStyle['z-index'] = this.contentZIndex;
+				this.pagingContentStyle['position'] = 'relative';
+			}
+			return this.pagingContentStyle;
+		},
+		renderJsIgnore() {
+			if ((this.usePageScroll && this.useChatRecordMode) || !this.refresherEnabled || !this.useCustomRefresher) {
+				this.$nextTick(() => {
+					this.renderPropScrollTop = 10;
+				})
+			}
+			return 0;
+		},
+		windowHeight() {
+			if (!this.systemInfo) return 0;
+			return this.systemInfo.windowHeight || 0;
+		},
+		windowBottom() {
+			if (!this.systemInfo) return 0;
+			let windowBottom = this.systemInfo.windowBottom || 0;
+			if (this.safeAreaInsetBottom && !this.useSafeAreaPlaceholder) {
+				windowBottom += this.safeAreaBottom;
+			}
+			return windowBottom;
+		},
+		isIosAndH5() {
+			// #ifndef H5
+			return false;
+			// #endif
+			return this.isIos;
+		}
+	},
+	methods: {
+		//当前版本号
+		getVersion() {
+			return `z-paging v${c.version}`;
+		},
+		//设置nvue List的specialEffects
+		setSpecialEffects(args) {
+			this.setListSpecialEffects(args);
+		},
+		//与setSpecialEffects等效，兼容旧版本
+		setListSpecialEffects(args) {
+			this.nFixFreezing = args && Object.keys(args).length;
+			if (this.isIos) {
+				this.privateRefresherEnabled = 0;
+			}
+			!this.usePageScroll && this.$refs['zp-n-list'].setSpecialEffects(args);
+		},
+		// #ifdef APP-VUE
+		//当app长时间进入后台后进入前台，因系统内存管理导致app重新加载时，进行一些适配处理
+		_handlePageLaunch() {
+			// 首次触发不进行处理，只有进入后台后打开app重新加载时才处理
+			if (this.pageLaunched) {
+				// 解决在vue3+ios中，app ReLaunch时顶部下拉刷新展示位置向下偏移的问题
+				// #ifdef VUE3
+				this.refresherThresholdUpdateTag = 1;
+				this.$nextTick(() => {
+					this.refresherThresholdUpdateTag = 0;
+				})
+				// #endif
+				// 解决使用虚拟列表时，app ReLaunch时白屏问题
+				this._checkVirtualListScroll();
+			}
+			this.pageLaunched = true;
+		},
+		// #endif
+		//使手机发生较短时间的振动（15ms）
+		_doVibrateShort() {
+			// #ifndef H5
+			
+			// #ifdef APP-PLUS
+			if (this.isIos) {
+				const UISelectionFeedbackGenerator = plus.ios.importClass('UISelectionFeedbackGenerator');
+				const feedbackGenerator = new UISelectionFeedbackGenerator();
+				feedbackGenerator.init();
+				setTimeout(() => {
+					feedbackGenerator.selectionChanged();
+				}, 0)
+			} else {
+				plus.device.vibrate(15);
+			}
+			// #endif
+			// #ifndef APP-PLUS
+			uni.vibrateShort();
+			// #endif
+			
+			// #endif
+		},
+		//设置z-paging高度
+		async _setAutoHeight(shouldFullHeight = true, scrollViewNode = null) {
+			let heightKey = 'min-height';
+			// #ifndef APP-NVUE
+			heightKey = 'min-height';
+			// #endif
+			try {
+				if (shouldFullHeight) {
+					let finalScrollViewNode = scrollViewNode || await this._getNodeClientRect('.zp-scroll-view');
+					let finalScrollBottomNode = await this._getNodeClientRect('.zp-page-bottom');
+					if (finalScrollViewNode) {
+						const scrollViewTop = finalScrollViewNode[0].top;
+						let scrollViewHeight = this.windowHeight - scrollViewTop;
+						scrollViewHeight -= finalScrollBottomNode ? finalScrollBottomNode[0].height : 0;
+						const additionHeight = u.convertToPx(this.autoHeightAddition);
+						const finalHeight = scrollViewHeight + additionHeight - (this.insideMore ? 1 : 0) + 'px !important';
+						this.$set(this.scrollViewStyle, heightKey, finalHeight);
+						this.$set(this.scrollViewInStyle, heightKey, finalHeight);
+					}
+				} else {
+					this.$delete(this.scrollViewStyle, heightKey);
+					this.$delete(this.scrollViewInStyle, heightKey);
+				}
+			} catch (e) {}
+		},
+		//触发更新是否超出页面状态
+		_updateInsideOfPaging() {
+			this.insideMore && this.insideOfPaging === true && setTimeout(this.doLoadMore, 200)
+		},
+		//清除timeout
+		_cleanTimeout(timeout) {
+			if (timeout) {
+				clearTimeout(timeout);
+				timeout = null;
+			}
+			return timeout;
+		},
+		//添加全局emit监听
+		_onEmit() {
+			uni.$on(c.errorUpdateKey, () => {
+				this.loading && this.complete(false).catch(() => {});
+			})
+			uni.$on(c.completeUpdateKey, (data) => {
+				setTimeout(() => {
+					if (this.loading) {
+						if (!this.disabledCompleteEmit) {
+							const type = data.type || 'normal';
+							const list = data.list || data;
+							const rule = data.rule;
+							this.fromCompleteEmit = true;
+							switch (type){
+								case 'normal':
+									this.complete(list);
+									break;
+								case 'total':
+									this.completeByTotal(list, rule);
+									break;
+								case 'nomore':
+									this.completeByNoMore(list, rule);
+									break;
+								case 'key':
+									this.completeByKey(list, rule);
+									break;
+								default:
+									break;
+							}
+						} else {
+							this.disabledCompleteEmit = false;
+						}
+					}
+				}, 1);
+			})
+		},
+		//销毁全局emit和listener监听
+		_offEmit(){
+			uni.$off(c.errorUpdateKey);
+			uni.$off(c.completeUpdateKey);
+		}
+	},
+};
diff --git a/uni_modules/z-paging/components/z-paging/js/z-paging-mixin.js b/uni_modules/z-paging/components/z-paging/js/z-paging-mixin.js
new file mode 100644
index 0000000..9d09caf
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/z-paging-mixin.js
@@ -0,0 +1,22 @@
+// [z-paging]使用页面滚动时引入此mixin，用于监听和处理onPullDownRefresh等页面生命周期方法
+
+export default {
+	onPullDownRefresh() {
+		if (this.isPagingRefNotFound()) return;
+		this.$refs.paging.reload().catch(() => {});
+	},
+	onPageScroll(e) {
+		if (this.isPagingRefNotFound()) return;
+		this.$refs.paging.updatePageScrollTop(e.scrollTop);
+		e.scrollTop < 10 && this.$refs.paging.doChatRecordLoadMore();
+	},
+	onReachBottom() {
+		if (this.isPagingRefNotFound()) return;
+		this.$refs.paging.pageReachBottom();
+	},
+	methods: {
+		isPagingRefNotFound() {
+			return !this.$refs.paging;
+		}
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/z-paging-static.js b/uni_modules/z-paging/components/z-paging/js/z-paging-static.js
new file mode 100644
index 0000000..05f80d5
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/z-paging-static.js
@@ -0,0 +1,13 @@
+// [z-paging]公用的静态图片资源
+
+export default {
+	base64Arrow: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkBAMAAACCzIhnAAAAD1BMVEVHcExRUVFMTExRUVFRUVE9CdWsAAAABHRSTlMAjjrY9ZnUjwAAAQFJREFUWMPt2MsNgzAMgGEEE1B1gKJmAIRYoCH7z9RCXrabh33iYktcIv35EEg5ZBh07pvxJU6MFSPOSRnjnBUjUsaciRUjMsb4xIoRCWNiYsUInzE5sWKEyxiYWDbyefqHx1zIeiYTk7mQYziTYecxHvEJjwmIT3hMQELCYSISEg4TkZj0mYTEpM8kJCU9JiMp6TEZyUmbAUhO2gxAQNJiIAKSFgMRmNQZhMCkziAEJTUGIyipMRjBSZkhCE7KDEFIUmTeGCHJxWz0zXaE0GTCG8ZFtEaS347r/1fe11YyHYVfubxayfjoHmc0YYwmmmiiiSaaaKLJ7ckyz5ve+dw3Xw2emdwm9xSbAAAAAElFTkSuQmCC',
+	base64ArrowWhite: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkBAMAAACCzIhnAAAAElBMVEVHcEz///////////////////+IGTx/AAAABnRSTlMA/dAkXZOhASU/AAABYElEQVRYw+2YwXLCIBCGsdAHWGbyAKZ4zxi9O017rxLf/1UaWFAgA1m8dcpedNSPf/l/Vh0Ya/Wn6hN0JcGvoCqRM4C8VBFiDwBqqNuJKV0rAnCgy3AUqZE57x0iqTL8Br4U3WBf/YWaIlTKfAcELU/h9w72CSVPa3C3OCDvhpHbRp/s2vq4fHhCeiCl2A3m4Qd71DQR257mFBlMcTlbFnFWzNtHxewYEfSiaLS4el8d8nyhmKJd1CF4eOS0keLMAuSxubLBIeIGQW8YHCFFo7EH9+YDcQt9FMZEswTheaNxTHwHT8SZorJjMrEVwo4Zo0U8HSEyZvJMOg4RjnmmRr8nDYeIz3OMkbfE/QhBo+U9RnZJxjGCRh/WKmHEMWLNkfPKsGh/CWJk1JjG0kcuJggTt34VDP8aWAFhp4nybVb5+9qQhjSkIQ1pSEMa8k+Q5U9rV3dF8MpFBK+/7miVq1/HZ2qmo9D+pAAAAABJRU5ErkJggg==',
+	base64Flower: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkBAMAAACCzIhnAAAAKlBMVEVHcEzDw8Ovr6+pqamUlJTCwsKenp61tbWxsbGysrLNzc2bm5u5ubmjo6MpovhuAAAACnRSTlMA/P79/sHDhiZS0DxZowAABBBJREFUWMPtl89rE0EUx7ctTXatB3MI1SWnDbUKPUgXqh4ED8Uf7KUVSm3ooVSpSii0Fn/gD4j4o+APiEoVmos9FO2celiqZVgwgaKHPQiCCkv+F99kM7Ozm5kxq1dfD91k9pPve9/3ZjbRNHHok/mKli4eIPNgSuRObuN9SqSEzM20iGnm0yIbqCuV7NSSSIV7uyPM6JMBYdeTOanh/QihJYZsUCSby+VkMj2AvOt0rAeQAwqE3lfKMZVlQCZk1QOCKkkVPadITCfIRNKxfoJI5+0OIFtJx14CMSg1mRSDko7VAfksRQzEbGYqxOJcVTWMCH2I1/IACNW0PWU2M8cmAVHtnH5mM1VRWtwKZjOd5JbF6s1IbaYqaotjNlPHgDAnlAizubTR6ovMYn052g/U5qcmOpi0WL8xTS/3IfSet5m8MEr5ajjF5le6dq/OJpobrdY0t3i9QgefWrxW9/1BLhk0E9m8FeUMhhXal499iD0eQRfDF+ts/tttORRerfp+oV7f4xJj82iUYm1Yzod+ZQEAlS/8mMBwKebVmCVp1f0JLS6zKd17+iwRKTARVg2SHtz3iEbBH+Q+U28zW2Jiza8Tjb1YFoYZMsJyjDqp3M9XBQdSdPLFdxEpvOB37JrHcmR/y9+LgoTlCFGZEa2sc6d4PGlweEa2JSVPoVm+IfGG3ZL037iV9oH+P+Jxc4HGVflNq1M0pivao/EopO4b/ojVCP9GjmiXOeS0DOn1o/iiccT4ORnyvBGF3yUywkQajW4Ti0SGuiy/wVSg/L8w+X/8Q+hvUx8Xd90z4oV5a1i88MbFWHz0WZZ1UrTwBGPX3Rat9AFiXRMRjoMdIdJLEOt2h7jrYOzgOamKZSWSNspOS0X8SAqRYmxRL7sg4eLzYmNehcxh3uoyud/BH2Udux4ywxFTc1xC7Mgf4vMhc5S+kSH3Y7yj+qpwIWSoPTVCOOPVthGx9FbGqrwFw6wSFxJr+17zeKcztt3u+2roAEVgUjDd+AHGuxHy2rZHaa8JMkTHEeyi85ANPO9j9BVuBRD2FY5LDMo/Sz/2hReqGIs/KiFin+CsPsYO/yvM3jL2vE8EbX7/Bf8ejtr2GLN65bioAdgLd8Bis/mD5GmP2qeqyo2ZwQEOtAjRIDH7mBKpUcMoApbZJ5UIxkEwxyMZyMxW/uKFvHCFR3SSmerHyDNQ2dF4JG6zIMpBgLfjSF9x1D6smFcYnGApjmSLICO3ecCDWrQ48geba9DI3STy2i7ax6WIB62fSyIZIiO3GFQqSURp8wCo7GhJBGwuSovJBNjb7kT6FPVnIa9qJ2Ko+l9mefGIdinaMp0yC1URYiwsdfNE45EuA5Cx9EhalfvN5s+UyItm81vaB3p4joniN+SCP7Qc1hblAAAAAElFTkSuQmCC',
+	base64FlowerWhite: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkBAMAAACCzIhnAAAAElBMVEX///9HcEz///////////////84chYNAAAABnRSTlP/AGzCOYZj5g1nAAACfklEQVRYw+2YTVPDIBCGtza9Jw25a0bvcax30o73OOr//yvma2F3YWlpPTijXNpAHrK8LLALVPFium2vNIFSbwGKTGQA2GUiHcD29yDNy3sMIdUBQl7r2H8mOEVqAHgPkYZUS6Qc2zYhQqtjyDZEximCZwWZLIBeIgYShs2NzxKpSUehYpMJhURGb+O+w5BpMCAREKPnCDHbIY20SzhM5yxziAXpOiBXydrekT9i5XDEq4NIIHHgyU5mRGqviII4mREJJA4QJzMiILwlRJzpKxJKvCBm8OsBBbLux0tsPl4RKYm5aPu6jw1U4mGxEUR9g8M1PcqBEp/WJliNgYOXueBzS4jZSIcgY5lCtevgDSgyzE+rAfuOTQMq0yzvoGH18qju27Mayzs4fPyMziCx81NJa5RNfW7vPYK9KOfDiVkBxFHG8hAj9txuoBuSWORsFfkpBf7xKFLSeaOefEojh5jz22DJEqMP8fUyaKdQx+RnG+yXMpe8Aars8ueR1pVH/bW3FyyvPRw90upLDHwpgBDtg4aUBNkxRLXMAi03IhcZtr1m+FeI/O/JNyDmmL1djLOauSlNflBpW18RQ2bPqXI22MXXEk75KRHTnkPkYbESbdKP2ZFk0r5sIwffAjy1lx+vx7NLjB6/E7Jfv5ERKhzpN0w8IDE8IGFDv5dhz10s7GFiXRZcUeLCEG5P5nDq9k4PFDcoMpE3GY4OuxuCXhmuyNB6k0RsLIAvqp9NE5r8ZCSS8gxnUp7ODdYhZTqxuiJ9uyJJtPmpqJ7wVj+XVieS903iViHziqAhchLEJAyb7jWU647EpUofQ0ziUuXXXhDddtlllSwjgSQu7r4BRWhQqfDPMVwAAAAASUVORK5CYII=',
+	base64Success: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkBAMAAACCzIhnAAAAElBMVEVRUVFHcExTU1NRUVFRUVFRUVFOSlSUAAAABnRSTlP/AI6+VySB3ZENAAACcElEQVRYw+2YyYKCMAyGI8hdpdxdZu7gcpdZ7jL6/s8yYheSNi0aPdqbwOffpGmaFOYPD3gj4bisN7vddv17N/JVgxn5x12IWgIaWTuO/IE3PseQbwjGPo2cgRmHFLJwdm/X643zwiqOKPPJ1nj3sjEP2iiifZWj5bhopSyGaEO2HX5fbQJzwJ+W7x/jw5ZFjsEU0PMph9xE8i5EqprKALW95eJQURkgzw98uJ/JvwGecR7bIjWWsUgVrrIfFZ2HlLy3sKETD1mmRLRMRhGVssRa0xJkdn3SpJBymBkM8+pSSDXMDNyDaToVHd2fgpNt0sjwiUZO19+jGQ+gQEg9Oq+bufmAVGihomNmjQG7UG3020vrlm7lkFnKFGU3kZ0KGAdmKe821pipQ+qEKcrZeTL2g5FsUks4cStjEZWwXg0b0n4GxmEpkWwIs5VBynjgK7xZaz1/0D7OxkVuLpsY5BQNFyLS84VBjjbg0iL2r2EQHBOxBhikuUOkdxODVF1cxHoWtPPsiyXO455Iv34hssCO8EV4ZIYTjS8SR4qYSHRiTiYQ4ZFbHi0iIhhBTi6dTCgSWRcnw4h4yGTuyTAiOGBIWGoZTgSHJQl+LcOJ4OCnW6yX2bMnJ9pidCOXtkTkTrIGpYuOynAiOF14SamMiOCk5Ke+mq8BcOrrvym8d0zKIQnWT+M1WwOQNO4fFiWb18hhERxJPx2fblbPHHyC41VyiAtKBUFBIih7JMWVoIQTFIr3lKPN80WvoLSWFPC653ioTZA0I0FrQ7qU6asaK0H7JmkSJa2ooOGVtNUsc3j9FYHkIkJy3SG6VHnfXKXGP9t4N9Q4Ye98AAAAAElFTkSuQmCC',
+	base64SuccessWhite: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkBAMAAACCzIhnAAAAGFBMVEVHcEz///////////////////////////8dS1W+AAAAB3RSTlMAiVYk6KvDHLfaegAAAo1JREFUWMPtWEtzmzAQNhCTq910ytXpiyvxTNOr60zrayepx9d02gnX4sTm7xcEiJX2gdnkGJ1A4tOnfWqXyeR1vMRYzrcPD9v5h5MBl3/Ldvx4cxIg/FWC8X0xjLjalM54uhhCfCrRuJURX0pi3EmIqZV7O59vrRZmguStHL9b7S7ftfLwOtiZDw7AHMtmquAQ12b5Wwbnordm8g9zLLO49qc/m2n6aKnhwPOGZ08hAiNHhheiHae1lOUPGZpQkPKa3q0mOUjaRzSRaGUjpy/mmWSwySSpllcEteBKAT52KEnSbblA51pJEPxBQoiH1FP4E3s5+FJv07h6/ylD6ui7B+9fq/ehrFB98ghec9EoVtyjK8pqCHLmCBOwMWSCeWFNN4MbPAk55NhsvoFHSSVR0k5TCTTEzlUGcqV/nVp7n9oIVkmtaqbAEqEgfdgHJPwsEAyZ9r4VAZXFjpEwyaw3+H2v42KYxKhs1XvY/gSSGv+IHyUSuHXCeZhLAgVI3EjgSGo1Fb3xO0tGGU9S2/KAIbtjxpJASG73qox6w5LUq0cEOa+iIONIWIilQSQ0pPa2jgaRQAgQP7c0mITRWGxpMAmEQFN2NAQJNCV0mI6GIIEO47hlQ0ORQLd0nL+hoUjg1m6I1TRr8uYEAriBHLcVFQ5UEMiBe3XkTBEG04WXlGKGxPnMS305XQPA1Ocn2JiuAZwE66fxnKwBnDTuXxZTMq85lwW6kt5ndLqZPefiU1yvmktcUSooChJF2aMprhQlnKJQ5FxRKkcVRa+itNYU8Io2oVkY14w0NMWYlqft91Bj9VHq+ca3b43BxjWJmla0sfKohlfTVpPN+93L/yLQ/IjQ/O5Q/VR5HdL4D7mlxmjwVdELAAAAAElFTkSuQmCC',
+	base64Empty: 'data:image/png;base64,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',
+	base64Error: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIBAMAAABfdrOtAAAAJFBMVEVHcEzo6Oibm5ukpKSbm5uampqbm5ubm5u5ubnn5+fm5ub6+vpGpDPdAAAAC3RSTlMA/v4hb+u20dq8aQhnHL4AAATwSURBVHja7ZvNb+JGGMbdjjdVe3NPodzeMhj1ZMUGujkh28B9wKR7iwwBqafWSbPqsbm0uTWtVlrTS9v0Et9yqLQS/1zHNiTZMMB4bO92d+dRUITt8c/PvPPx2h4URUpKSkpKSkpK6m3K6lFN73Q+S/+es3W3fzabTh2Dl0FAXEM+BgrgeXxRsdILTDU9n7J0vz/+EsCYC9KEiSFc06pf5zouqAkjkGWo0OG5Fq6j2IwZ6I4/4DhyTxc20oUjAj5PRTTrwvGAZ9p+ADzlD4RDctCoLhb7JUP87xeLxS3BZUIQ+YNCFi8wRwc4GIqGRK/GkM+5ILV8kFflOmkkkH/LddJ4c05eSSfSyTvrZPEmnCw+UCeuk84QvTSnUF0uCL68fBle/swF+RL1QZ/EpU6gHtOsAM64pnjPwxgTLsjoBM58ODNaAXYBT5QeGdr0KwcEA8He0TkPBLCjUDNHpG4qlg8eTCzXht1FVd1MxTPHj5LTtUiSrKK+7iDf8wBGxk4If3arLv/HF4Tox0A2nlFIGp+CIA+LzSamgbp4TNvZjECtDAjyMcB5HybLO6NxsRA1vmFCNjguNXDGWygbRPXh/B+zn9zPWK5RCkT18QxA57YgAqE+HGS6/tAoD4JO0ts+M2tbyQJpc95a5oI0xXNhCZGQ/x8E0VSCkUZY6Z6CIE/qdO5eL+yPlW6tMMgefPs3o7Bdt8iguJj4DThlZSY/rJ0yB+RraLDK2jAQCHyr4zIhT9mQ7vowygMZjpgQG+CYUV2E1EWqixyzICr8eFFnBB5ba1Y4IIfeKQvysW7ssZrwQLEFmvCBM2U6oRkdI5Wgm1QnO8RUTDlASoiESIiESMh7BDHKhlhu/LbSNUuEqL3lu1p945vO3BArADiaum7vBGDUKQfSIjBykooyrRPQnTIglHFfSagHeqd4iErwa9duEebpckGQjx/VT4v5fC0XhJHAd1mPRvJAVMZiAeQzTpgHYrPKqkGnUEiX+dCoNS4UgniHMTnUS4iESIiE7IS0x+mnVAidglDwVcmQJpy2WQ8VC4UgogfbA1RE4Nuw3UghEBV2rKl7V5ygAJPSY9KGQbP01mVjA5Fa2f1kQN2U3k+M9POWB8gnJUNMZJioWTMzKwOklyxgDrCXVcMMEF90tXM9C2TiCqmfCdIRi/jeewNpyerKok9WkGuzfCdYC+fXRsmBxxpVGG2zY0ZBbieJKvPrDQce3lxppBhIjGFWGkVoxUEoZt0Mukn2XBQH0bTHZpaMIp2sU/6qasU70W6/eHjM09VmYSc6C6Jpvz+orKvVxot8kL3HkMr9IZ9qeZ2o6RrO9mOI9ufdIR9peZ2gNIW31yC/MpyI9ngUDNIsezPks3vIsWDGdYA7cZa9pbqUVeCr/neiaR3U3R4BfXPg75vwb8I/b7HjxChobDZCO+Ny4wuxxaVxPPowcoNnrzPmzGFlX3RJHz2FafbhJ41n8PLx2DCM7KkwQgpqka1DVzKdJNHfJwBe9l/n0eSZFsIPjVSY8xZKZpSXnogwled98wAx3xRcdBNq1f1fhFVdIcL5tvaDolC7XaqaWStEtLOJHkbhlSauMLrma4yHEa03AVUoIUs/M2NQFkchBZiGUPeKonAnqhLOo4hrKf0WTyZ1FcU0Ki0hVrSr+Mucnvya7jYUKSkpKSkpKSmpD0f/AXq+Umj5XnXDAAAAAElFTkSuQmCC',
+	base64BackToTop: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIBAMAAABfdrOtAAAAElBMVEVRUVH+/v5HcEyZmZlRUVFRUVGm1ByOAAAABnRSTlPMzADMTZAJBBGsAAAEnElEQVR42t2cS27jMAyGf7/2U+QCQeDsbeQCgZDujaC5/1UmkzaJn+JDFGcw3LdfflKibJkkDnxrL7dbg7sNt6+L4O8OYBM+B0ys+QrGkHZG+OEEQ8g6go8Bx1GIGMdpNOQyIG6XdMgnSPtKhLQDGEZFBgYMkhKFtGBb0EIEjDgFRowoBVaMGAWpMedEfxMiZtwpUsgZCqtlkCNUdpVAWigtCCCDFtLwIWeoreZCWiRYYEKGFEjDg+yRZCUH0iLRAgNyToXUNCRZyMqWhGnUN2IPm3wSlwJ7IUspyCBkIQUZhCykIIeQuRTkEDKXAuM9srrtYbrZN7Y98giZSoFd+t1OxmMITG0dcrSFXFchZ1tIvQZpYWxhBbK3hpQrkMEa0iwh5t4a+QvZvDXyF7J5a+Qv5PPW21/I5623v5DPW29/IaO3Xv5Clrw1y1/Ikrdm+Qs5svw83yNnSJ5BQb4F/F7EIEJSnThGBAXxkFQfLOviQUE8JAUPsosHBfGQfDAtHhREQ1JxIV00KIgmrnRI84S0yAd5BAXxxJUck0f6Qnwr9qmr6xF5xLMjcwn/iudIEAdWnyjkEXlQKZiRVzoqRyLbgeUKKR8Q4alY7cSnoxzSf2ggsqehKr6YVpcXpOd7H93f60cKhOd7Re2LteUF4eLqiVS1mr0ge4io6C2+soaFkJ7MuuuQs1yITEp9hwwKISIpzR2iESKSIoT0rLNwuVHQqoSIpAQJpGce60vIUSdEIuUqgPTsJ5QFZK8UIpBS8iG94GFrDjlrhfCl8CG96Llxmle4kEr6vKWBPIVo9kqDQSRk9/3cWoikcCFPAd33v4dIChPyEvLzBA6RlEYWke4JEUnhKXkLeUEKxRHJFfKCQHGucIW8IdZSRkLeEGMpYyEjiK2UsZARxFTKRMgYYillImQMMZQyFTKB2EmZCplAuFLIHT8TMoWwpQwiIVMIUwqpZP5bp5CCvCTiQKr5f5lCQN+tPCBn2ZvVDFJwIDUP0m1BYAfZYRNSsCB7BqTbhoARePIxtZ9tgwWkoJcwCalmv3MBAemtO4R6dah2HaKQqj8Zvp9sQDjvJ21+SPCBHPJDDk6QITekEV7gqCC19CpKAym9IMfckKv4olMBCeIrWwVEfvkshzQekO9r9P1/ALk+IG1eSPCDiCJfyG+FyU+A6ZCa/piZDinpz7LpkCv5gdkAEshP5emQhv7onw6pGeULyZCSUYiRDAmMkpJkCKs4JhFSq8p8hJBSVbAkhARV6ZUQoisik0FqXTmcDHLVFfbJIEFXoiiCNMpiSxGkVJaNiiBBWQArgTTaUl4JpNQWJUsgQVteXQg+AKkLxQWFGKW+5J2+eVp4S168X3CF1CltCKdTJ8lb84YK2bUBO+wZW0Pqv9nk4tKu49N45NJC5dMM5tLW5tOg59Jq6NM06dL+abFXwr/RkuvTXJwae1abtE/Dt0/ruksTvs84AZ/BCC4jHnyGVfiM3VBQFANEXEah+Ax18RlP4zNox2dkkM/wI58xTn8yDCXGYCDV3W5RGSajtXyGhG1jbpbjzpwGt/0MJft8jqC7iUbQ/QZaxdnKqcIftwAAAABJRU5ErkJggg==',
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/z-paging-utils.js b/uni_modules/z-paging/components/z-paging/js/z-paging-utils.js
new file mode 100644
index 0000000..59e9bf6
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/z-paging-utils.js
@@ -0,0 +1,228 @@
+// [z-paging]工具类
+
+import zConfig from './z-paging-config'
+import zLocalConfig from '../config/index'
+import c from './z-paging-constant'
+
+const storageKey = 'Z-PAGING-REFRESHER-TIME-STORAGE-KEY';
+let config = null;
+const timeoutMap = {};
+
+/*
+当z-paging未使用uni_modules管理时，控制台会有警告：WARNING: Module not found: Error: Can't resolve '@/uni_modules/z-paging'...
+此时注释下方try中的代码即可
+*/
+// #ifdef VUE2
+try {
+	const contextKeys = require.context('@/uni_modules/z-paging', false, /\z-paging-config$/).keys();
+	if (contextKeys.length) {
+		const suffix = '.js';
+		config = require('@/uni_modules/z-paging/z-paging-config' + suffix);
+	}
+} catch (e) {}
+// #endif
+
+//获取默认配置信息
+function gc(key, defaultValue) {
+	if (!config) {
+		if (zLocalConfig && Object.keys(zLocalConfig).length) {
+			config = zLocalConfig;
+		} else {
+			const tempConfig = zConfig.getConfig();
+			if (zConfig && tempConfig) {
+				config = tempConfig;
+			}
+		}
+	}
+	if (!config) return defaultValue;
+	const value = config[_toKebab(key)];
+	return value === undefined ? defaultValue : value;
+}
+
+
+//获取最终的touch位置
+function getTouch(e) {
+	let touch = null;
+	if (e.touches && e.touches.length) {
+		touch = e.touches[0];
+	} else if (e.changedTouches && e.changedTouches.length) {
+		touch = e.changedTouches[0];
+	} else if (e.datail && e.datail != {}) {
+		touch = e.datail;
+	} else {
+		return {
+			touchX: 0,
+			touchY: 0
+		}
+	}
+	return {
+		touchX: touch.clientX,
+		touchY: touch.clientY
+	};
+}
+
+//判断当前手势是否在z-paging内触发
+function getTouchFromZPaging(target) {
+	if (target && target.tagName && target.tagName !== 'BODY' && target.tagName !== 'UNI-PAGE-BODY') {
+		const classList = target.classList;
+		if (classList && classList.contains('z-paging-content')) {
+			return {
+				isFromZp: true, 
+				isPageScroll: classList.contains('z-paging-content-page'), 
+				isReachedTop: classList.contains('z-paging-reached-top')
+			};
+		} else {
+			return getTouchFromZPaging(target.parentNode);
+		}
+	} else {
+		return { isFromZp: false };
+	}
+}
+
+//获取z-paging所在的parent
+function getParent(parent) {
+	if (!parent) return null;
+	if (parent.$refs.paging) return parent;
+	return getParent(parent.$parent);
+}
+
+//打印错误信息
+function consoleErr(err) {
+	console.error(`[z-paging]${err}`);
+}
+
+//延时操作，如果key存在，调用时根据key停止之前的延时操作
+function delay(callback, ms = c.delayTime, key) {
+	const timeout = setTimeout(callback, ms);;
+	if (!!key) {
+		timeoutMap[key] && clearTimeout(timeoutMap[key]);
+		timeoutMap[key] = timeout;
+	}
+	return timeout;
+}
+
+//设置下拉刷新时间
+function setRefesrherTime(time, key) {
+	const datas = getRefesrherTime() || {};
+	datas[key] = time;
+	uni.setStorageSync(storageKey, datas);
+}
+
+//获取下拉刷新时间
+function getRefesrherTime() {
+	return uni.getStorageSync(storageKey);
+}
+
+//通过下拉刷新标识key获取下拉刷新时间
+function getRefesrherTimeByKey(key) {
+	const datas = getRefesrherTime();
+	return datas && datas[key] ? datas[key] : null;
+}
+
+//通过下拉刷新标识key获取下拉刷新时间(格式化之后)
+function getRefesrherFormatTimeByKey(key, textMap) {
+	const time = getRefesrherTimeByKey(key);
+	const timeText = time ? _timeFormat(time, textMap) : textMap.none;
+	return `${textMap.title}${timeText}`;
+}
+
+//将文本的px或者rpx转为px的值
+function convertToPx(text) {
+	const dataType = Object.prototype.toString.call(text);
+	if (dataType === '[object Number]') return text;
+	let isRpx = false;
+	if (text.indexOf('rpx') !== -1 || text.indexOf('upx') !== -1) {
+		text = text.replace('rpx', '').replace('upx', '');
+		isRpx = true;
+	} else if (text.indexOf('px') !== -1) {
+		text = text.replace('px', '');
+	}
+	if (!isNaN(text)) {
+		if (isRpx) return Number(uni.upx2px(text));
+		return Number(text);
+	}
+	return 0;
+}
+
+//获取当前时间
+function getTime() {
+	return (new Date()).getTime();
+}
+
+//获取z-paging实例id
+function getInstanceId() {
+    const s = [];
+    const hexDigits = "0123456789abcdef";
+    for (let i = 0; i < 10; i++) {
+        s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+    }
+    return s.join('') + getTime();
+}
+
+// 等待一段时间
+function wait(ms) {
+	return new Promise(resolve => {
+		setTimeout(resolve, ms);
+	});
+}
+
+//------------------ 私有方法 ------------------------
+//时间格式化
+function _timeFormat(time, textMap) {
+	const date = new Date(time);
+	const currentDate = new Date();
+	const dateDay = new Date(time).setHours(0, 0, 0, 0);
+	const currentDateDay = new Date().setHours(0, 0, 0, 0);
+	const disTime = dateDay - currentDateDay;
+	let dayStr = '';
+	const timeStr = _dateTimeFormat(date);
+	if (disTime === 0) {
+		dayStr = textMap.today;
+	} else if (disTime === -86400000) {
+		dayStr = textMap.yesterday;
+	} else {
+		dayStr = _dateDayFormat(date, date.getFullYear() !== currentDate.getFullYear());
+	}
+	return `${dayStr} ${timeStr}`;
+}
+
+//date格式化为年月日
+function _dateDayFormat(date, showYear = true) {
+	const year = date.getFullYear();
+	const month = date.getMonth() + 1;
+	const day = date.getDate();
+	return showYear ? `${year}-${_fullZeroToTwo(month)}-${_fullZeroToTwo(day)}` : `${_fullZeroToTwo(month)}-${_fullZeroToTwo(day)}`;
+}
+
+//data格式化为时分
+function _dateTimeFormat(date) {
+	const hour = date.getHours();
+	const minute = date.getMinutes();
+	return `${_fullZeroToTwo(hour)}:${_fullZeroToTwo(minute)}`;
+}
+
+//不满2位在前面填充0
+function _fullZeroToTwo(str) {
+	str = str.toString();
+	return str.length === 1 ? '0' + str : str;
+}
+
+//驼峰转短横线
+function _toKebab(value) {
+	return value.replace(/([A-Z])/g, "-$1").toLowerCase();
+}
+
+export default {
+	gc,
+	setRefesrherTime,
+	getRefesrherFormatTimeByKey,
+	getTouch,
+	getTouchFromZPaging,
+	getParent,
+	convertToPx,
+	getTime,
+	getInstanceId,
+	consoleErr,
+	delay,
+	wait
+};
diff --git a/uni_modules/z-paging/components/z-paging/wxs/z-paging-renderjs.js b/uni_modules/z-paging/components/z-paging/wxs/z-paging-renderjs.js
new file mode 100644
index 0000000..9ecf76b
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/wxs/z-paging-renderjs.js
@@ -0,0 +1,58 @@
+// [z-paging]使用renderjs在app-vue和h5中对touchmove事件冒泡进行处理
+
+import u from '../js/z-paging-utils'
+const data = {
+	startY: 0,
+	isTouchFromZPaging: false,
+	isUsePageScroll: false,
+	isReachedTop: true,
+	isIosAndH5: false,
+	appLaunched: false
+}
+
+export default {
+	mounted() {
+		if (window) {
+			this._handleTouch();
+			// #ifdef APP-VUE
+			this.$ownerInstance.callMethod('_handlePageLaunch');
+			// #endif
+		}
+	},
+	methods: {
+		//接收逻辑层发送的数据
+		renderPropIsIosAndH5Change(newVal) {
+			if (newVal === -1) return;
+			data.isIosAndH5 = newVal;
+		},
+		//拦截处理touch事件
+		_handleTouch() {
+			if (!window.$zPagingRenderJsInited) {
+				window.$zPagingRenderJsInited = true;
+				window.addEventListener('touchstart', this._handleTouchstart, { passive: true })
+				window.addEventListener('touchmove', this._handleTouchmove, { passive: false })
+			}
+		},
+		_handleTouchstart(e) {
+			const touch = u.getTouch(e);
+			data.startY = touch.touchY;
+			const touchResult = u.getTouchFromZPaging(e.target);
+			data.isTouchFromZPaging = touchResult.isFromZp;
+			data.isUsePageScroll = touchResult.isPageScroll;
+			data.isReachedTop = touchResult.isReachedTop;
+		},
+		_handleTouchmove(e) {
+			const touch = u.getTouch(e);
+			const moveY = touch.touchY - data.startY;
+			if (data.isTouchFromZPaging && ((data.isReachedTop && moveY > 0)  || (data.isIosAndH5 && !data.isUsePageScroll && moveY < 0))) {
+				if (e.cancelable && !e.defaultPrevented) {
+					e.preventDefault();
+				}
+			}
+		},
+		_removeAllEventListener(){
+			window.removeEventListener('touchstart');
+			window.removeEventListener('touchmove');
+		}
+	}
+};
diff --git a/uni_modules/z-paging/components/z-paging/wxs/z-paging-wxs.wxs b/uni_modules/z-paging/components/z-paging/wxs/z-paging-wxs.wxs
new file mode 100644
index 0000000..4dbc64f
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/wxs/z-paging-wxs.wxs
@@ -0,0 +1,340 @@
+// [z-paging]微信小程序、QQ小程序、app-vue、h5上使用wxs实现自定义下拉刷新，降低逻辑层与视图层的通信折损，提升性能
+
+var currentDis = 0;
+var isPCFlag = -1;
+var startY = -1;
+
+function propObserver(newValue, oldValue, ownerIns, ins) {
+	var state = ownerIns.getState() || {};
+	state.currentIns = ins;
+	var dataset = ins.getDataset();
+	var loading = dataset.loading == true;
+	if (newValue && newValue.indexOf('end') != -1) {
+		var transition = newValue.split('end')[0];
+		_setTransform('translateY(0px)', ins, false, transition);
+		state.moveDis = 0;
+		state.oldMoveDis = 0;
+		currentDis = 0;
+	} else if (newValue && newValue.indexOf('begin') != -1) {
+		var refresherThreshold = ins.getDataset().refresherthreshold;
+		_setTransformValue(refresherThreshold, ins, state, false);
+	}
+}
+
+function touchstart(e, ownerIns) {
+	var ins = _getIns(ownerIns);
+	var state = {};
+	var dataset = {};
+	ownerIns.callMethod('_handleListTouchstart');
+	if (ins) {
+		state = ins.getState();
+		dataset = ins.getDataset();
+		if (_touchDisabled(e, ins, 0)) return;
+	}
+	var isTouchEnded = state.isTouchEnded;
+	state.oldMoveDis = 0;
+	var touch = _getTouch(e);
+	var loading = _isTrue(dataset.loading);
+	state.startY = touch.touchY;
+	startY = state.startY;
+	state.lastTouch = touch;
+	if (!loading && isTouchEnded) {
+		state.isTouchmoving = false;
+	}
+	state.isTouchEnded = false;
+	ownerIns.callMethod('_handleRefresherTouchstart', touch);
+}
+
+function touchmove(e, ownerIns) {
+	var touch = _getTouch(e);
+	var ins = _getIns(ownerIns);
+	var dataset = ins.getDataset();
+	var refresherThreshold = dataset.refresherthreshold;
+	var isIos = _isTrue(dataset.isios);
+	var state = ins.getState();
+	var watchTouchDirectionChange = _isTrue(dataset.watchtouchdirectionchange);
+	var moveDisObj = {};
+	var moveDis = 0;
+	var prevent = false;
+	if (watchTouchDirectionChange) {
+		moveDisObj = _getMoveDis(e, ins);
+		moveDis = moveDisObj.currentDis;
+		prevent = moveDisObj.isDown;
+		var direction = prevent ? 'top' : 'bottom';
+		if (prevent == state.oldTouchDirection && prevent != state.oldEmitedTouchDirection) {
+			ownerIns.callMethod('_handleTouchDirectionChange', { direction: direction }); 
+			state.oldEmitedTouchDirection = prevent;
+		}
+		state.oldTouchDirection = prevent;
+	}
+	if (_touchDisabled(e, ins, 1)) {
+		_handlePullingDown(state, ownerIns, false);
+		return true;
+	}
+	if (!_getAngleIsInRange(e, touch, state, dataset)) {
+		_handlePullingDown(state, ownerIns, false);
+		return true;
+	}
+	moveDisObj = _getMoveDis(e, ins);
+	moveDis = moveDisObj.currentDis;
+	prevent = moveDisObj.isDown;
+	if (moveDis < 0) {
+		_setTransformValue(0, ins, state, false);
+		_handlePullingDown(state, ownerIns, false);
+		return true;
+	}
+	if (prevent && !state.disabledBounce) {
+		ownerIns.callMethod('_handleScrollViewDisableBounce', {bounce: false});
+		state.disabledBounce = true;
+		_handlePullingDown(state, ownerIns, prevent);
+		return !prevent;
+	}
+	_setTransformValue(moveDis, ins, state, false);
+	var oldRefresherStatus = state.refresherStatus;
+	var oldIsTouchmoving = _isTrue(dataset.oldistouchmoving);
+	var hasTouchmove = _isTrue(dataset.hastouchmove);
+	var isTouchmoving = state.isTouchmoving;
+	state.refresherStatus = moveDis >= refresherThreshold ? 1 : 0;
+	if (!isTouchmoving) {
+		state.isTouchmoving = true;
+		isTouchmoving = true;
+	}
+	if (state.isTouchEnded) {
+		state.isTouchEnded = false;
+	}
+	if (hasTouchmove) {
+		ownerIns.callMethod('_handleWxsPullingDown', { moveDis:moveDis, diffDis:moveDisObj.diffDis });
+	}
+	if (oldRefresherStatus == undefined || oldRefresherStatus != state.refresherStatus || oldIsTouchmoving != isTouchmoving) {
+		ownerIns.callMethod('_handleRefresherTouchmove', moveDis, touch);
+	}
+	_handlePullingDown(state, ownerIns, prevent);
+	return !prevent;
+}
+
+function touchend(e, ownerIns) {
+	var touch = _getTouch(e);
+	var ins = _getIns(ownerIns);
+	var dataset = ins.getDataset();
+	var state = ins.getState();
+	if (_touchDisabled(e, ins, 2)) return;
+	state.reachMaxAngle = true;
+	state.hitReachMaxAngleCount = 0;
+	state.disabledBounce = false;
+	state.fixedIsTopHitCount = 0;
+	if (!state.isTouchmoving) return;
+	var oldRefresherStatus = state.refresherStatus;
+	var oldMoveDis = state.moveDis;
+	var refresherThreshold = ins.getDataset().refresherthreshold
+	var moveDis = _getMoveDis(e, ins).currentDis;
+	if (!(moveDis >= refresherThreshold && oldRefresherStatus === 1)) {
+		state.isTouchmoving = false;
+	}
+	ownerIns.callMethod('_handleRefresherTouchend', moveDis);
+	state.isTouchEnded = true;
+	if (oldMoveDis < refresherThreshold) return;
+	var animate = false;
+	if (moveDis >= refresherThreshold) {
+		moveDis = refresherThreshold;
+		animate = true;
+	}
+	_setTransformValue(moveDis, ins, state, animate);
+}
+
+// #ifdef H5
+function isPC() {
+	if (!navigator) return false;
+	if (isPCFlag != -1) return isPCFlag;
+	var agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+	isPCFlag = agents.every(function(item) { return navigator.userAgent.indexOf(item) < 0 });
+	return isPCFlag;
+}
+
+var movable = false;
+
+function mousedown(e, ins) {
+	if (!isPC()) return;
+	touchstart(e, ins);
+	movable = true;
+}
+
+function mousemove(e, ins) {
+	if (!isPC() || !movable) return;
+	touchmove(e, ins);
+}
+
+function mouseup(e, ins) {
+	if (!isPC()) return;
+	touchend(e, ins);
+	movable = false;
+}
+
+function mouseleave(e, ins) {
+	if (!isPC()) return;
+	movable = false;
+}
+// #endif
+
+
+function _setTransformValue(value, ins, state, animate) {
+	value = value || 0;
+	if (state.moveDis == value) return;
+	state.moveDis = value;
+	_setTransform('translateY(' + value + 'px)', ins, animate, '');
+}
+
+function _setTransform(transform, ins, animate, transition) {
+	var dataset = ins.getDataset();
+	if (_isTrue(dataset.refreshernotransform)) return;
+	transform = transform == 'translateY(0px)' ? 'none' : transform;
+	ins.requestAnimationFrame(function() {
+		var stl = { 'transform': transform };
+		if (animate) {
+			stl['transition'] = 'transform .1s linear';
+		}
+		if (transition.length) {
+			stl['transition'] = transition;
+		}
+		ins.setStyle(stl);
+	})
+}
+
+function _getMoveDis(e, ins) {
+	var state = ins.getState();
+	var refresherThreshold = parseFloat(ins.getDataset().refresherthreshold);
+	var refresherOutRate = parseFloat(ins.getDataset().refresheroutrate);
+	var refresherPullRate = parseFloat(ins.getDataset().refresherpullrate);
+	var touch = _getTouch(e);
+	var currentStartY = !state.startY || state.startY == 'NaN' ? startY : state.startY;
+	var moveDis = touch.touchY - currentStartY;
+	var oldMoveDis = state.oldMoveDis || 0;
+	state.oldMoveDis = moveDis;
+	var diffDis = moveDis - oldMoveDis;
+	if (diffDis > 0) {
+		diffDis = diffDis * refresherPullRate;
+		if (currentDis > refresherThreshold) {
+			diffDis = diffDis * (1 - refresherOutRate);
+		}
+	}
+	diffDis = diffDis > 100 ? diffDis / 100 : (diffDis > 20 ? diffDis / 1.2 : diffDis);
+	currentDis += diffDis;
+	currentDis = Math.max(0, currentDis);
+	return {
+		currentDis: currentDis,
+		diffDis: diffDis,
+		isDown: diffDis > 0
+	};
+}
+
+function _getTouch(e) {
+	var touch = e;
+	if (e.touches && e.touches.length) {
+		touch = e.touches[0];
+	} else if (e.changedTouches && e.changedTouches.length) {
+		touch = e.changedTouches[0];
+	} else if (e.datail && e.datail != {}) {
+		touch = e.datail;
+	}
+	return {
+		touchX: touch.clientX,
+		touchY: touch.clientY
+	};
+}
+
+function _getIns(ownerIns) {
+	var ins = ownerIns.getState().currentIns;
+	if (!ins) {
+		ownerIns.callMethod('_handlePropUpdate');
+	}
+	return ins;
+}
+
+function _touchDisabled(e, ins, processTag) {
+	var dataset = ins.getDataset();
+	var state = ins.getState();
+	var loading = _isTrue(dataset.loading);
+	var useChatRecordMode = _isTrue(dataset.usechatrecordmode);
+	var refresherEnabled = _isTrue(dataset.refresherenabled);
+	var useCustomRefresher = _isTrue(dataset.usecustomrefresher);
+	var usePageScroll = _isTrue(dataset.usepagescroll);
+	var pageScrollTop = parseFloat(dataset.pagescrolltop);
+	var scrollTop = parseFloat(dataset.scrolltop);
+	var finalScrollTop = usePageScroll ? pageScrollTop : scrollTop;
+	var fixedIsTop = false;
+	var isIos = _isTrue(dataset.isios);
+	if (!isIos && finalScrollTop == (state.startScrollTop || 0) && finalScrollTop <= 105) {
+		fixedIsTop = true;
+	}
+	var fixedIsTopHitCount = state.fixedIsTopHitCount || 0;
+	if (fixedIsTop) {
+		fixedIsTopHitCount ++;
+		if (fixedIsTopHitCount <= 2) {
+			fixedIsTop = false;
+		}
+		state.fixedIsTopHitCount = fixedIsTopHitCount;
+	} else {
+		state.fixedIsTopHitCount = 0;
+	}
+	if (!isIos && processTag === 0) {
+		state.startScrollTop = finalScrollTop || 0;
+	}
+	if (!isIos && processTag === 2) {
+		fixedIsTop = true;
+	}
+	return loading || useChatRecordMode || !refresherEnabled || !useCustomRefresher || 
+	((usePageScroll && useCustomRefresher && pageScrollTop > 5) && !fixedIsTop) || 
+	((!usePageScroll && useCustomRefresher && scrollTop > 5) && !fixedIsTop);
+}
+
+function _getAngleIsInRange(e, touch, state, dataset) {
+	var maxAngle = dataset.refreshermaxangle;
+	var refresherAecc = _isTrue(dataset.refresheraecc);
+	var lastTouch = state.lastTouch;
+	var reachMaxAngle = state.reachMaxAngle;
+	var moveDis = state.oldMoveDis;
+	if (!lastTouch) return true;
+	if (maxAngle >= 0 && maxAngle <= 90 && lastTouch) {
+		if ((!moveDis || moveDis < 1) && !refresherAecc && reachMaxAngle != null && !reachMaxAngle) return false;
+		var x = Math.abs(touch.touchX - lastTouch.touchX);
+		var y = Math.abs(touch.touchY - lastTouch.touchY);
+		var z = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
+		if ((x || y) && x > 1) {
+			var angle = Math.asin(y / z) / Math.PI * 180;
+			if (angle < maxAngle) {
+				var hitReachMaxAngleCount = state.hitReachMaxAngleCount || 0;
+				state.hitReachMaxAngleCount = ++hitReachMaxAngleCount;
+				if (state.hitReachMaxAngleCount > 2) {
+					state.lastTouch = touch;
+					state.reachMaxAngle = false;
+				}
+				return false;
+			}
+		}
+	}
+	state.lastTouch = touch;
+	return true;
+}
+
+function _handlePullingDown(state, ins, onPullingDown) {
+	var oldOnPullingDown = state.onPullingDown || false;
+	if (oldOnPullingDown != onPullingDown) {
+		ins.callMethod('_handleWxsPullingDownStatusChange', onPullingDown);
+	}
+	state.onPullingDown = onPullingDown;
+}
+
+function _isTrue(value) {
+	value = (typeof(value) === 'string' ? JSON.parse(value) : value) || false;
+	return value == true || value == 'true';
+}
+
+module.exports = {
+	touchstart: touchstart,
+	touchmove: touchmove,
+	touchend: touchend,
+	mousedown: mousedown,
+	mousemove: mousemove,
+	mouseup: mouseup,
+	mouseleave: mouseleave,
+	propObserver: propObserver
+}
diff --git a/uni_modules/z-paging/components/z-paging/z-paging.vue b/uni_modules/z-paging/components/z-paging/z-paging.vue
new file mode 100644
index 0000000..30d48f8
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/z-paging.vue
@@ -0,0 +1,307 @@
+ <!--                        _             
+  ____     _ __   __ _  __ _(_)_ __   __ _ 
+ |_  /____| '_ \ / _` |/ _` | | '_ \ / _` |
+  / /_____| |_) | (_| | (_| | | | | | (_| |
+ /___|    | .__/ \__,_|\__, |_|_| |_|\__, |
+          |_|          |___/         |___/ 
+v2.6.0 (2023-10-17)
+by ZXLee
+-->
+<!-- 文档地址：https://z-paging.zxlee.cn -->
+<!-- github地址：https://github.com/SmileZXLee/uni-z-paging -->
+<!-- dcloud地址：https://ext.dcloud.net.cn/plugin?id=3935 -->
+<!-- 反馈QQ群：790460711(已满)、371624008 -->
+
+<template name="z-paging">
+	<!-- #ifndef APP-NVUE -->
+	<view :class="{'z-paging-content':true,'z-paging-content-fixed':!usePageScroll&&fixed,'z-paging-content-page':usePageScroll,'z-paging-reached-top':renderPropScrollTop<1}" :style="[finalPagingStyle]">
+		<!-- #ifndef APP-PLUS -->
+		<view v-if="cssSafeAreaInsetBottom===-1" class="zp-safe-area-inset-bottom"></view>
+		<!-- #endif -->
+		<!-- 顶部固定的slot -->
+		<slot v-if="!usePageScroll&&zSlots.top" name="top" />
+		<view class="zp-page-top" @touchmove.stop.prevent v-else-if="usePageScroll&&zSlots.top" :style="[{'top':`${windowTop}px`,'z-index':topZIndex}]">
+			<slot name="top" />
+		</view>
+		<view :class="{'zp-view-super':true,'zp-scroll-view-super':!usePageScroll}" :style="[finalScrollViewStyle]">
+			<view v-if="zSlots.left" :class="{'zp-page-left':true,'zp-absoulte':finalIsOldWebView}">
+				<slot name="left" />
+			</view>
+			<view :class="{'zp-scroll-view-container':true,'zp-absoulte':finalIsOldWebView}" :style="[scrollViewContainerStyle]">
+				<scroll-view
+					ref="zp-scroll-view" :class="{'zp-scroll-view':true,'zp-scroll-view-absolute':!usePageScroll,'zp-scroll-view-hide-scrollbar':!showScrollbar}"
+					:scroll-top="scrollTop" :scroll-x="scrollX"
+					:scroll-y="scrollable&&!usePageScroll&&scrollEnable&&(refresherCompleteScrollable?true:refresherStatus!==R.Complete)" :enable-back-to-top="finalEnableBackToTop"
+					:show-scrollbar="showScrollbar" :scroll-with-animation="finalScrollWithAnimation"
+					:scroll-into-view="scrollIntoView" :lower-threshold="finalLowerThreshold" :upper-threshold="5"
+					:refresher-enabled="finalRefresherEnabled&&!useCustomRefresher" :refresher-threshold="finalRefresherThreshold"
+					:refresher-default-style="finalRefresherDefaultStyle" :refresher-background="refresherBackground"
+					:refresher-triggered="finalRefresherTriggered" @scroll="_scroll" @scrolltolower="_onScrollToLower"
+					@scrolltoupper="_onScrollToUpper" @refresherrestore="_onRestore" @refresherrefresh="_onRefresh(true)"
+					>	
+					<view class="zp-paging-touch-view"
+					<!-- #ifndef APP-VUE || MP-WEIXIN || MP-QQ  || H5 -->
+					@touchstart="_refresherTouchstart" @touchmove="_refresherTouchmove" @touchend="_refresherTouchend" @touchcancel="_refresherTouchend"
+					<!-- #endif -->
+					<!-- #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5 -->
+					@touchstart="pagingWxs.touchstart" @touchmove="pagingWxs.touchmove" @touchend="pagingWxs.touchend" @touchcancel="pagingWxs.touchend"
+					@mousedown="pagingWxs.mousedown" @mousemove="pagingWxs.mousemove" @mouseup="pagingWxs.mouseup" @mouseleave="pagingWxs.mouseleave"
+					<!-- #endif -->
+					>	
+						<view v-if="finalRefresherFixedBacHeight>0" class="zp-fixed-bac-view" :style="[{'background': refresherFixedBackground,'height': `${finalRefresherFixedBacHeight}px`}]"></view>
+						<view class="zp-paging-main" :style="[scrollViewInStyle,{'transform': finalRefresherTransform,'transition': refresherTransition}]"
+						<!-- #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5 -->
+						:change:prop="pagingWxs.propObserver" :prop="wxsPropType"
+						:data-refresherThreshold="finalRefresherThreshold" :data-isIos="isIos"
+						:data-loading="loading||isRefresherInComplete" :data-useChatRecordMode="useChatRecordMode" 
+						:data-refresherEnabled="refresherEnabled" :data-useCustomRefresher="useCustomRefresher" :data-pageScrollTop="wxsPageScrollTop"
+						:data-scrollTop="wxsScrollTop" :data-refresherMaxAngle="refresherMaxAngle" :data-refresherNoTransform="refresherNoTransform"
+						:data-refresherAecc="refresherAngleEnableChangeContinued" :data-usePageScroll="usePageScroll" :data-watchTouchDirectionChange="watchTouchDirectionChange"
+						:data-oldIsTouchmoving="isTouchmoving" :data-refresherOutRate="finalRefresherOutRate" :data-refresherPullRate="finalRefresherPullRate" :data-hasTouchmove="hasTouchmove"
+						<!-- #endif -->
+						<!-- #ifdef APP-VUE || H5 -->
+						:change:renderPropIsIosAndH5="pagingRenderjs.renderPropIsIosAndH5Change" :renderPropIsIosAndH5="isIosAndH5"
+						<!-- #endif -->
+						>	
+							<view v-if="showRefresher" class="zp-custom-refresher-view" :style="[{'margin-top': `-${finalRefresherThreshold+refresherThresholdUpdateTag}px`,'background': refresherBackground,'opacity': isTouchmoving ? 1 : 0}]">
+								<view class="zp-custom-refresher-container" :style="[{'height': `${finalRefresherThreshold}px`,'background': refresherBackground}]">
+									<!-- 下拉刷新view -->
+									<view class="zp-custom-refresher-slot-view">
+										<slot v-if="!(zSlots.refresherComplete&&refresherStatus===R.Complete)" :refresherStatus="refresherStatus" name="refresher" />
+									</view>
+									<slot v-if="zSlots.refresherComplete&&refresherStatus===R.Complete" name="refresherComplete" />
+									<z-paging-refresh ref="refresh" v-else-if="!showCustomRefresher" :style="[{'height': `${finalRefresherThreshold}px`}]" :status="refresherStatus"
+										:defaultThemeStyle="finalRefresherThemeStyle" :defaultText="finalRefresherDefaultText"
+										:pullingText="finalRefresherPullingText" :refreshingText="finalRefresherRefreshingText" :completeText="finalRefresherCompleteText"
+										:defaultImg="refresherDefaultImg" :pullingImg="refresherPullingImg" :refreshingImg="refresherRefreshingImg" :completeImg="refresherCompleteImg" :refreshingAnimated="refresherRefreshingAnimated"
+										:showUpdateTime="showRefresherUpdateTime" :updateTimeKey="refresherUpdateTimeKey" :updateTimeTextMap="finalRefresherUpdateTimeTextMap"
+										:imgStyle="refresherImgStyle" :titleStyle="refresherTitleStyle" :updateTimeStyle="refresherUpdateTimeStyle" />
+								</view>
+							</view>
+							<view class="zp-paging-container">
+								<slot v-if="useChatRecordMode&&zSlots.chatLoading&&loadingStatus!==M.NoMore&&realTotalData.length" name="chatLoading" />
+								<view v-else-if="useChatRecordMode&&loadingStatus!==M.NoMore&&realTotalData.length" class="zp-chat-record-loading-container">
+									<text v-if="loadingStatus!==M.Loading" @click="_onScrollToUpper"
+										:class="defaultThemeStyle==='white'?'zp-loading-more-text zp-loading-more-text-white':'zp-loading-more-text zp-loading-more-text-black'">{{chatRecordLoadingMoreText}}</text>
+									<image v-else :src="base64Flower" class="zp-chat-record-loading-custom-image" />
+								</view>
+								<!-- 全屏Loading -->
+								<slot v-if="showLoading&&zSlots.loading&&!loadingFullFixed" name="loading" />
+								<!-- 主体内容 -->
+								<view class="zp-paging-container-content" :style="[{transform:virtualPlaceholderTopHeight>0?`translateY(${virtualPlaceholderTopHeight}px)`:'none'},finalPagingContentStyle]">
+									<slot />
+									<!-- 内置列表&虚拟列表 -->
+									<template v-if="finalUseInnerList">
+										<slot name="header"/>
+										<view class="zp-list-container" :style="[innerListStyle]">
+											<template v-if="finalUseVirtualList">
+												<view class="zp-list-cell" :style="[innerCellStyle]" :id="`zp-id-${item[virtualCellIndexKey]}`" v-for="(item,index) in virtualList" :key="item['zp_unique_index']" @click="_innerCellClick(item,virtualTopRangeIndex+index)">
+													<view v-if="useCompatibilityMode">使用兼容模式请在组件源码z-paging.vue第99行中注释这一行，并打开下面一行注释</view>
+													<!-- <zp-public-virtual-cell v-if="useCompatibilityMode" :extraData="extraData" :item="item" :index="virtualTopRangeIndex+index" /> -->
+													<slot v-else name="cell" :item="item" :index="virtualTopRangeIndex+index"/>
+												</view>
+											</template>
+											<template v-else>
+												<view class="zp-list-cell" v-for="(item,index) in realTotalData" :key="index" @click="_innerCellClick(item,index)">
+													<slot name="cell" :item="item" :index="index"/>
+												</view>
+											</template>
+										</view>
+										<slot name="footer"/>
+									</template>
+									<view v-if="useVirtualList" class="zp-virtual-placeholder" :style="[{height:virtualPlaceholderBottomHeight+'px'}]"/>
+									<!-- 上拉加载更多view -->
+									<!-- #ifndef MP-ALIPAY -->
+									<slot v-if="showLoadingMoreDefault" name="loadingMoreDefault" />
+									<slot v-else-if="showLoadingMoreLoading" name="loadingMoreLoading" />
+									<slot v-else-if="showLoadingMoreNoMore" name="loadingMoreNoMore" />
+									<slot v-else-if="showLoadingMoreFail" name="loadingMoreFail" />
+									<z-paging-load-more @doClick="_onLoadingMore('click')" v-else-if="showLoadingMoreCustom" :zConfig="zLoadMoreConfig" />
+									<!-- #endif -->
+									<!-- #ifdef MP-ALIPAY -->
+									<slot v-if="loadingStatus===M.Default&&zSlots.loadingMoreDefault&&showLoadingMore&&loadingMoreEnabled&&!useChatRecordMode" name="loadingMoreDefault" />
+									<slot v-else-if="loadingStatus===M.Loading&&zSlots.loadingMoreLoading&&showLoadingMore&&loadingMoreEnabled" name="loadingMoreLoading" />
+									<slot v-else-if="loadingStatus===M.NoMore&&zSlots.loadingMoreNoMore&&showLoadingMore&&showLoadingMoreNoMoreView&&loadingMoreEnabled&&!useChatRecordMode" name="loadingMoreNoMore" />
+									<slot v-else-if="loadingStatus===M.Fail&&zSlots.loadingMoreFail&&showLoadingMore&&loadingMoreEnabled&&!useChatRecordMode" name="loadingMoreFail" />
+									<z-paging-load-more @doClick="_onLoadingMore('click')" v-else-if="showLoadingMore&&showDefaultLoadingMoreText&&!(loadingStatus===M.NoMore&&!showLoadingMoreNoMoreView)&&loadingMoreEnabled&&!useChatRecordMode" :zConfig="zLoadMoreConfig" />
+									<!-- #endif -->
+									<view v-if="safeAreaInsetBottom&&useSafeAreaPlaceholder" class="zp-safe-area-placeholder" :style="[{height:safeAreaBottom+'px'}]" />
+								</view>
+								<!-- 空数据图 -->
+								<view v-if="showEmpty" :class="{'zp-empty-view':true,'zp-empty-view-center':emptyViewCenter}" :style="[emptyViewSuperStyle]">
+									<slot v-if="zSlots.empty" name="empty" :isLoadFailed="isLoadFailed"/>
+									<z-paging-empty-view v-else :emptyViewImg="finalEmptyViewImg" :emptyViewText="finalEmptyViewText" :showEmptyViewReload="finalShowEmptyViewReload" 
+									:emptyViewReloadText="finalEmptyViewReloadText" :isLoadFailed="isLoadFailed" :emptyViewStyle="emptyViewStyle" :emptyViewTitleStyle="emptyViewTitleStyle" 
+									:emptyViewImgStyle="emptyViewImgStyle" :emptyViewReloadStyle="emptyViewReloadStyle" :emptyViewZIndex="emptyViewZIndex" :emptyViewFixed="emptyViewFixed" 
+									@reload="_emptyViewReload" @viewClick="_emptyViewClick" />
+								</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<view v-if="zSlots.right" :class="{'zp-page-right':true,'zp-absoulte zp-right':finalIsOldWebView}">
+				<slot name="right" />
+			</view>
+		</view>
+		<!-- 底部固定的slot -->
+		<slot v-if="!usePageScroll&&zSlots.bottom" name="bottom" />
+		<view class="zp-page-bottom" @touchmove.stop.prevent v-else-if="usePageScroll&&zSlots.bottom" :style="[{'bottom': `${windowBottom}px`}]">
+			<slot name="bottom" />
+		</view>
+		<!-- 点击返回顶部view -->
+		<view v-if="showBackToTopClass" :class="backToTopClass" :style="[finalBackToTopStyle]" @click.stop="_backToTopClick">
+			<slot v-if="zSlots.backToTop" name="backToTop" />
+			<image v-else class="zp-back-to-top-img" :src="backToTopImg.length?backToTopImg:base64BackToTop" />
+		</view>
+		<!-- 全屏Loading(铺满z-paging并固定) -->
+		<view v-if="showLoading&&zSlots.loading&&loadingFullFixed" class="zp-loading-fixed">
+			<slot name="loading" />
+		</view>
+	</view>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<component :is="finalNvueSuperListIs" :style="[finalPagingStyle]" :class="{'z-paging-content-fixed':fixed&&!usePageScroll}" :scrollable="false">
+		<!-- 顶部固定的slot -->
+		<view ref="zp-page-top" v-if="zSlots.top" :class="{'zp-page-top':usePageScroll}" :style="[usePageScroll?{'top':`${windowTop}px`,'z-index':topZIndex}:{}]">
+			<slot name="top" />
+		</view>
+		<component :is="finalNvueSuperListIs" class="zp-n-list-container" :scrollable="false">
+			<view v-if="zSlots.left" class="zp-page-left">
+				<slot name="left" />
+			</view>
+			<component :is="finalNvueListIs" ref="zp-n-list" :id="nvueListId" :style="[{'flex': 1,'top':isIos?'0px':'-1px'},usePageScroll?scrollViewStyle:{},nChatRecordRotateStyle]" :alwaysScrollableVertical="true"
+				:fixFreezing="nFixFreezing" :show-scrollbar="showScrollbar&&!useChatRecordMode" :loadmoreoffset="finalLowerThreshold" :enable-back-to-top="enableBackToTop"
+				:scrollable="scrollable&&scrollEnable&&(refresherCompleteScrollable?true:refresherStatus!==R.Complete)" :bounce="nvueBounce" :column-count="nWaterfallColumnCount" :column-width="nWaterfallColumnWidth"
+				:column-gap="nWaterfallColumnGap" :left-gap="nWaterfallLeftGap" :right-gap="nWaterfallRightGap" :pagingEnabled="nvuePagingEnabled" :offset-accuracy="offsetAccuracy"
+				@loadmore="_nOnLoadmore" @scroll="_nOnScroll">
+				<refresh v-if="(zSlots.top?cacheTopHeight!==-1:true)&&finalNvueRefresherEnabled" class="zp-n-refresh" :style="[nvueRefresherStyle]" :display="nRefresherLoading?'show':'hide'" @refresh="_nOnRrefresh" @pullingdown="_nOnPullingdown">
+					<view ref="zp-n-refresh-container" class="zp-n-refresh-container" :style="[{background:refresherBackground,width:nRefresherWidth}]" id="zp-n-refresh-container">
+						<!-- 下拉刷新view -->
+						<slot v-if="zSlots.refresherComplete&&refresherStatus===R.Complete" name="refresherComplete" />
+						<slot v-else-if="(nScopedSlots?nScopedSlots:zSlots).refresher" :refresherStatus="refresherStatus" name="refresher" />
+						<z-paging-refresh ref="refresh" v-else :status="refresherStatus" :defaultThemeStyle="finalRefresherThemeStyle"
+							:defaultText="finalRefresherDefaultText" :pullingText="finalRefresherPullingText" :refreshingText="finalRefresherRefreshingText" :completeText="finalRefresherCompleteText"
+							:defaultImg="refresherDefaultImg" :pullingImg="refresherPullingImg" :refreshingImg="refresherRefreshingImg" :completeImg="refresherCompleteImg" :refreshingAnimated="refresherRefreshingAnimated"
+							:showUpdateTime="showRefresherUpdateTime" :updateTimeKey="refresherUpdateTimeKey" :updateTimeTextMap="finalRefresherUpdateTimeTextMap"
+							:imgStyle="refresherImgStyle" :titleStyle="refresherTitleStyle" :updateTimeStyle="refresherUpdateTimeStyle" />
+					</view>
+				</refresh>
+				<component :is="nViewIs" v-if="isIos&&!useChatRecordMode?oldScrollTop>10:true" ref="zp-n-list-top-tag" class="zp-n-list-top-tag" style="margin-top: -1rpx;" :style="[{height:finalNvueRefresherEnabled?'0px':'1px'}]"></component>
+				<component :is="nViewIs" v-if="nShowRefresherReveal" ref="zp-n-list-refresher-reveal" :style="[{transform:`translateY(-${nShowRefresherRevealHeight}px)`},{background:refresherBackground}]">
+					<!-- 下拉刷新view -->
+					<slot v-if="zSlots.refresherComplete&&refresherStatus===R.Complete" name="refresherComplete" />
+					<slot v-else-if="(nScopedSlots?nScopedSlots:$slots).refresher" :refresherStatus="R.Loading" name="refresher" />
+					<z-paging-refresh ref="refresh" v-else :status="R.Loading" :defaultThemeStyle="finalRefresherThemeStyle"
+						:defaultText="finalRefresherDefaultText" :pullingText="finalRefresherPullingText" :refreshingText="finalRefresherRefreshingText" :completeText="finalRefresherCompleteText" 
+						:defaultImg="refresherDefaultImg" :pullingImg="refresherPullingImg" :refreshingImg="refresherRefreshingImg" :completeImg="refresherCompleteImg" :refreshingAnimated="refresherRefreshingAnimated"
+						:showUpdateTime="showRefresherUpdateTime" :updateTimeKey="refresherUpdateTimeKey" :updateTimeTextMap="finalRefresherUpdateTimeTextMap"
+						:imgStyle="refresherImgStyle" :titleStyle="refresherTitleStyle" :updateTimeStyle="refresherUpdateTimeStyle" />
+				</component>
+				<template v-if="finalUseInnerList">
+					<component :is="nViewIs">
+						<slot name="header"/>
+					</component>	
+					<component :is="nViewIs" class="zp-list-cell" v-for="(item,index) in realTotalData" :key="finalCellKeyName.length?item[finalCellKeyName]:index">
+						<slot name="cell" :item="item" :index="index"/>
+					</component>
+					<component :is="nViewIs">
+						<slot name="footer"/>
+					</component>	
+				</template>
+				<template v-else>
+					<slot />
+				</template>
+				<!-- 全屏Loading -->
+				<component :is="nViewIs" v-if="showLoading&&zSlots.loading&&!loadingFullFixed" :class="{'z-paging-content-fixed':usePageScroll}" style="flex:1" :style="[nChatRecordRotateStyle]">
+					<slot name="loading" />
+				</component>
+				<!-- 上拉加载更多view -->
+				<component :is="nViewIs" v-if="!refresherOnly&&loadingMoreEnabled&&!showEmpty">
+					<view v-if="useChatRecordMode">
+						<view v-if="loadingStatus!==M.NoMore&&realTotalData.length">
+							<slot v-if="zSlots.chatLoading" name="chatLoading" />
+							<view v-else class="zp-chat-record-loading-container">
+								<text v-if="loadingStatus!==M.Loading" @click="_onScrollToUpper"
+									:class="defaultThemeStyle==='white'?'zp-loading-more-text zp-loading-more-text-white':'zp-loading-more-text zp-loading-more-text-black'">{{chatRecordLoadingMoreText}}</text>
+								<view>
+									<loading-indicator v-if="loadingStatus===M.Loading" class="zp-line-loading-image" animating />
+								</view>
+							</view>
+						</view>
+					</view>
+					<view :style="nLoadingMoreFixedHeight?{height:loadingMoreCustomStyle&&loadingMoreCustomStyle.height?loadingMoreCustomStyle.height:'80rpx'}:{}">
+						<slot v-if="showLoadingMoreDefault" name="loadingMoreDefault" />
+						<slot v-else-if="showLoadingMoreLoading" name="loadingMoreLoading" />
+						<slot v-else-if="showLoadingMoreNoMore" name="loadingMoreNoMore" />
+						<slot v-else-if="showLoadingMoreFail" name="loadingMoreFail" />
+						<z-paging-load-more @doClick="_onLoadingMore('click')" v-else-if="showLoadingMoreCustom" :zConfig="zLoadMoreConfig" />
+						<view v-if="safeAreaInsetBottom&&useSafeAreaPlaceholder" class="zp-safe-area-placeholder" :style="[{height:safeAreaBottom+'px'}]" />
+					</view>
+				</component>
+				<!-- 空数据图 -->
+				<component :is="nViewIs" v-if="showEmpty" :class="{'z-paging-content-fixed':usePageScroll}" :style="[{flex:emptyViewCenter?1:0},emptyViewSuperStyle,nChatRecordRotateStyle]">
+					<view :class="{'zp-empty-view':true,'zp-empty-view-center':emptyViewCenter}">
+						<slot v-if="zSlots.empty" name="empty" :isLoadFailed="isLoadFailed" />
+						<z-paging-empty-view v-else :emptyViewImg="finalEmptyViewImg" :emptyViewText="finalEmptyViewText" :showEmptyViewReload="finalShowEmptyViewReload" 
+						:emptyViewReloadText="finalEmptyViewReloadText" :isLoadFailed="isLoadFailed" :emptyViewStyle="emptyViewStyle" :emptyViewTitleStyle="emptyViewTitleStyle" 
+						:emptyViewImgStyle="emptyViewImgStyle" :emptyViewReloadStyle="emptyViewReloadStyle" :emptyViewZIndex="emptyViewZIndex" :emptyViewFixed="emptyViewFixed" 
+						@reload="_emptyViewReload" @viewClick="_emptyViewClick" />
+					</view>
+				</component>
+				<component is="header" v-if="!hideNvueBottomTag" ref="zp-n-list-bottom-tag" class="zp-n-list-bottom-tag"></component>
+			</component>
+			<view v-if="zSlots.right" class="zp-page-right">
+				<slot name="right" />
+			</view>
+		</component>
+		<!-- 底部固定的slot -->
+		<slot name="bottom" />
+		<!-- 点击返回顶部view -->
+		<view v-if="showBackToTopClass" :class="backToTopClass" :style="[finalBackToTopStyle]" @click.stop="_backToTopClick">
+			<slot v-if="zSlots.backToTop" name="backToTop" />
+			<image v-else class="zp-back-to-top-img" :src="backToTopImg.length?backToTopImg:base64BackToTop" />
+		</view>
+		<!-- 全屏Loading(铺满z-paging并固定) -->
+		<view v-if="showLoading&&zSlots.loading&&loadingFullFixed" class="zp-loading-fixed">
+			<slot name="loading" />
+		</view>
+	</component>
+	<!-- #endif -->
+</template>
+<!-- #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5 -->
+<script src="./wxs/z-paging-wxs.wxs" module="pagingWxs" lang="wxs"></script>
+<!-- #endif -->
+<script module="pagingRenderjs" lang="renderjs">
+	import pagingRenderjs from './wxs/z-paging-renderjs.js';
+	/**
+	 * z-paging 分页组件
+	 * @description 高性能，全平台兼容。支持虚拟列表，支持nvue、vue3
+	 * @tutorial https://z-paging.zxlee.cn
+	 * @notice 以下仅为部分常用属性、方法和事件，完整文档请查阅z-paging官网
+	 * @property {Number|String} default-page-no 自定义初始的pageNo，默认为1
+	 * @property {Number|String} default-page-size 自定义pageSize，默认为10
+	 * @property {Object} paging-style 设置z-paging的style，部分平台(如微信小程序)无法直接修改组件的style，可使用此属性代替
+	 * @property {String} height z-paging的高度，优先级低于pagingStyle中设置的height，传字符串，如100px、100rpx、100%
+	 * @property {String} width z-paging的宽度，优先级低于pagingStyle中设置的width，传字符串，如100px、100rpx、100%
+	 * @property {Boolean} use-page-scroll 使用页面滚动，默认为否
+	 * @property {Boolean} use-virtual-list 是否使用虚拟列表，默认为否
+	 * @property {Boolean} fixed z-paging是否使用fixed布局，若使用fixed布局，则z-paging的父view无需固定高度，z-paging高度默认为100%，默认为是(当使用内置scroll-view滚动时有效)
+	 * @property {Boolean} auto [z-paging]mounted后是否自动调用reload方法(mounted后自动调用接口)，默认为是
+	 * @property {Boolean} use-chat-record-mode 使用聊天记录模式，默认为否
+	 * @event {Function} query 下拉刷新或滚动到底部时会自动触发此方法。z-paging加载时也会触发(若要禁止，请设置:auto="false")。pageNo和pageSize会自动计算好，直接传给服务器即可。
+	 * @example <z-paging ref="paging" v-model="dataList" @query="queryList"></z-paging>
+	 */
+	export default {
+		name:"z-paging",
+		// #ifdef APP-VUE || H5
+		mixins: [pagingRenderjs],
+		// #endif
+	}
+</script>
+<script src="./js/z-paging-main.js" />
+	
+<style scoped>
+	@import "./css/z-paging-main.css";
+	@import "./css/z-paging-static.css";
+</style>
diff --git a/uni_modules/z-paging/package.json b/uni_modules/z-paging/package.json
new file mode 100644
index 0000000..843a28f
--- /dev/null
+++ b/uni_modules/z-paging/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "z-paging",
+  "name": "z-paging",
+  "displayName": "【z-paging下拉刷新、上拉加载】高性能，全平台兼容。支持虚拟列表，支持nvue、vue3",
+  "version": "2.6.0",
+  "description": "超简单、低耦合！使用wxs+renderjs实现。支持长列表优化，支持自定义下拉刷新、上拉加载更多，支持自动管理空数据图、点击返回顶部，支持聊天分页、本地分页，支持国际化等100+项配置",
+  "keywords": [
+    "下拉刷新",
+    "上拉加载",
+    "分页器",
+    "nvue",
+    "虚拟列表"
+],
+  "repository": "https://github.com/SmileZXLee/uni-z-paging",
+  "engines": {
+    "HBuilderX": "^3.0.7"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": "393727164"
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/z-paging",
+    "type": "component-vue"
+  },
+  "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": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y",
+		  "钉钉": "y",
+		  "快手": "y",
+		  "飞书": "y",
+		  "京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/z-paging/readme.md b/uni_modules/z-paging/readme.md
new file mode 100644
index 0000000..5814202
--- /dev/null
+++ b/uni_modules/z-paging/readme.md
@@ -0,0 +1,53 @@
+# z-paging
+
+<p align="center">
+    <img alt="logo" src="https://z-paging.zxlee.cn/img/title-logo.png" height="100" style="margin-bottom: 50px;">
+</p>
+
+[![version](https://img.shields.io/badge/version-2.6.0-blue)](https://github.com/SmileZXLee/uni-z-paging)
+[![license](https://img.shields.io/github/license/SmileZXLee/uni-z-paging)](https://en.wikipedia.org/wiki/MIT_License)
+
+### 文档地址：[https://z-paging.zxlee.cn](https://z-paging.zxlee.cn)
+
+### 更新组件前，请注意[版本差异](https://z-paging.zxlee.cn/start/upgrade-guide.html)
+
+***  
+### 功能&特点
+* 【配置简单】仅需两步（绑定网络请求方法、绑定分页结果数组）轻松完成完整下拉刷新，上拉加载更多功能。
+* 【低耦合，低侵入】分页自动管理。在page中无需处理任何分页相关逻辑，无需在data中定义任何分页相关变量，全由z-paging内部处理。
+* 【超灵活，支持各种类型自定义】支持自定义下拉刷新，自定义上拉加载更多等各种自定义效果；支持使用内置自动分页，同时也支持通过监听下拉刷新和滚动到底部事件自行处理；支持使用自带全屏布局规范，同时也支持将z-paging自由放在任意容器中。
+* 【功能丰富】支持国际化，支持自定义且自动管理空数据图，支持主题模式切换，支持本地分页，支持聊天分页模式，支持展示最后更新时间，支持吸顶效果，支持内部scroll-view滚动与页面滚动，支持一键滚动到顶部等诸多功能。
+* 【全平台兼容】支持vue、nvue，vue2、vue3，支持h5、app及各家小程序。
+* 【高性能】在app-vue、h5、微信小程序、QQ小程序上使用wxs+renderjs从视图层实现下拉刷新；支持虚拟列表，轻松渲染万级数据！
+
+*** 
+### 反馈qq群
+* 官方1群`已满`：[790460711](https://jq.qq.com/?_wv=1027&k=vU2fKZZH)
+
+* 官方2群：[371624008](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=avPmibADf2TNi4LxkIwjCE5vbfXpa-r1&authKey=dQ%2FVDAR87ONxI4b32Py%2BvmXbhnopjHN7%2FJPtdsqJdsCPFZB6zDQ17L06Uh0kITUZ&noverify=0&group_code=371624008)
+ 
+*** 
+
+### 预览
+
+***
+
+|                 自定义下拉刷新效果演示                  |                      滑动切换选项卡+吸顶演示                       |
+| :----------------------------------------------------------: | :----------------------------------------------------------: |
+| ![](https://z-paging.zxlee.cn/public/img/z-paging-demo5.gif) | ![](https://z-paging.zxlee.cn/public/img/z-paging-demo6.gif) |
+
+|                   聊天记录模式演示                    |                    虚拟列表(流畅渲染1万+条)演示                     |
+| :----------------------------------------------------------: | :----------------------------------------------------------: |
+| ![](https://z-paging.zxlee.cn/public/img/z-paging-demo7.gif) | ![](https://z-paging.zxlee.cn/public/img/z-paging-demo8.gif) |
+
+### 在线demo体验地址：
+
+* [https://demo.z-paging.zxlee.cn](https://demo.z-paging.zxlee.cn)
+
+| 扫码体验                                                     |
+| ------------------------------------------------------------ |
+| ![](https://z-paging.zxlee.cn/public/img/code.png) |
+
+### demo下载
+* 支持vue2&vue3的`选项式api`写法demo下载，请点击页面右上角的【使用HBuilderX导入示例项目】或【下载示例项目ZIP】。
+* 支持vue3的`组合式api`写法demo下载，请访问[github](https://github.com/SmileZXLee/uni-z-paging)。
\ No newline at end of file
diff --git a/uni_modules/z-tabs/changelog.md b/uni_modules/z-tabs/changelog.md
new file mode 100644
index 0000000..8f6fd39
--- /dev/null
+++ b/uni_modules/z-tabs/changelog.md
@@ -0,0 +1,2 @@
+## 0.2.5（2023-01-09）
+修复可能出现的可能出现的与swiper联动时报错node不存在的bug
diff --git a/uni_modules/z-tabs/components/z-tabs/config/index.js b/uni_modules/z-tabs/components/z-tabs/config/index.js
new file mode 100644
index 0000000..56c953b
--- /dev/null
+++ b/uni_modules/z-tabs/components/z-tabs/config/index.js
@@ -0,0 +1,4 @@
+// z-tabs全局配置文件，注意避免更新时此文件被覆盖，若被覆盖，可在此文件中右键->点击本地历史记录，找回覆盖前的配置
+export default {
+	
+}
\ No newline at end of file
diff --git a/uni_modules/z-tabs/components/z-tabs/z-tabs.vue b/uni_modules/z-tabs/components/z-tabs/z-tabs.vue
new file mode 100644
index 0000000..32bb838
--- /dev/null
+++ b/uni_modules/z-tabs/components/z-tabs/z-tabs.vue
@@ -0,0 +1,736 @@
+<!-- z-tabs v0.2.5 by-ZXLee -->
+<!-- github地址:https://github.com/SmileZXLee/uni-z-tabs -->
+<!-- dcloud地址:https://ext.dcloud.net.cn/plugin?name=z-tabs -->
+<!-- 反馈QQ群：790460711 -->
+
+<template name="z-tabs">
+	<view class="z-tabs-conatiner" :style="[{background:bgColor}, tabsStyle]">
+		<view class="z-tabs-left">
+			<slot name="left" />
+		</view>
+		<view ref="z-tabs-scroll-view-conatiner" class="z-tabs-scroll-view-conatiner">
+			<scroll-view ref="z-tabs-scroll-view" class="z-tabs-scroll-view" :scroll-x="true" :scroll-left="scrollLeft" :show-scrollbar="false" :scroll-with-animation="isFirstLoaded" @scroll="scroll">
+				<view class="z-tabs-list-container" :style="[tabsListStyle]">
+					<view class="z-tabs-list" :style="[tabsListStyle, {marginTop: -finalBottomSpace+'px'}]">
+						<view :ref="`z-tabs-item-${index}`" :id="`z-tabs-item-${index}`" class="z-tabs-item" :style="[tabStyle]" v-for="(item,index) in list" :key="index" @click="tabsClick(index,item)">
+							<view class="z-tabs-item-title-container">
+								<text :class="{'z-tabs-item-title':true,'z-tabs-item-title-disabled':item.disabled}" 
+									:style="[{color:item.disabled?disabledColor:(currentIndex===index?activeColor:inactiveColor)},item.disabled?disabledStyle:(currentIndex===index?activeStyle:inactiveStyle)]">
+									{{item[nameKey]||item}}
+								</text>
+								<text v-if="item.badge&&_formatCount(item.badge.count).length" class="z-tabs-item-badge" :style="[badgeStyle]">{{_formatCount(item.badge.count)}}</text>
+							</view>
+						</view>
+					</view>
+					<view class="z-tabs-bottom" :style="[{width: tabsContainerWidth+'px', bottom: finalBottomSpace+'px'}]">
+						<view ref="z-tabs-bottom-dot" class="z-tabs-bottom-dot"
+						<!-- #ifndef APP-NVUE -->
+						:style="[{transform:`translateX(${bottomDotX}px)`,transition:dotTransition,background:activeColor},finalDotStyle]"
+						<!-- #endif -->
+						<!-- #ifdef APP-NVUE -->
+						:style="[{background:activeColor},finalDotStyle]"
+						<!-- #endif -->
+						/>
+					</view>	
+				</view>
+			</scroll-view>
+		</view>
+		<view class="z-tabs-right">
+			<slot name="right" />
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const weexDom = weex.requireModule('dom');
+	const weexAnimation = weex.requireModule('animation');
+	// #endif
+	import zTabsConfig from './config/index'
+	
+	//获取默认配置信息
+	function _gc(key, defaultValue) {
+		let config = null;
+		if (zTabsConfig && Object.keys(zTabsConfig).length) {
+			config = zTabsConfig;
+		} else {
+			return defaultValue;
+		}
+		const value = config[_toKebab(key)];
+		return value === undefined ? defaultValue : value;
+	}
+	//驼峰转短横线
+	function _toKebab(value) {
+		return value.replace(/([A-Z])/g, "-$1").toLowerCase();
+	}
+	
+	/**
+	 * z-tabs 标签
+	 * @description 一个简单轻量的tabs标签，全平台兼容，支持nvue、vue3
+	 * @tutorial https://ext.dcloud.net.cn/plugin?name=z-tabs
+	 * @property {Array} list 数据源数组，支持形如['tab1','tab2']的格式或[{name:'tab1',value:1}]的格式
+	 * @property {Number|String} current 当前选中的index，默认为0
+	 * @property {Number|String} scroll-count list数组长度超过scrollCount时滚动显示(不自动铺满全屏)，默认为5
+	 * @property {Number|String} tab-width 自定义每个tab的宽度，默认为0，即代表根据内容自动撑开，单位rpx，支持传100、"100px"或"100rpx"
+	 * @property {Number|String} bar-width 滑块宽度，单位rpx，支持传100、"100px"或"100rpx"
+	 * @property {Number|String} bar-height 滑块高度，单位rpx，支持传100、"100px"或"100rpx"
+	 * @property {Object} bar-style 滑块样式，其中的width和height将被bar-width和bar-height覆盖
+	 * @property {Number|String} bottom-space tabs与底部的间距，单位rpx，支持传100、"100px"或"100rpx"
+	 * @property {String} bar-animate-mode 切换tab时滑块动画模式，与swiper联动时有效，点击切换tab时无效，必须调用setDx。默认为line，即切换tab时滑块宽度保持不变，线性运动。可选值为worm，即为类似毛毛虫蠕动效果
+	 * @property {String} name-key list中item的name(标题)的key，默认为name
+	 * @property {String} value-key list中item的value的key，默认为value
+	 * @property {String} active-color 激活状态tab的颜色
+	 * @property {String} inactive-color 未激活状态tab的颜色
+	 * @property {String} disabled-color 禁用状态tab的颜色
+	 * @property {Object} active-style 激活状态tab的样式
+	 * @property {Object} inactive-style 未激活状态tab的样式
+	 * @property {Object} disabled-style 禁用状态tab的样式
+	 * @property {Number|String} badge-max-count 徽标数最大数字限制，超过这个数字将变成badge-max-count+，默认为99
+	 * @property {Object} badge-style 徽标样式，例如可自定义背景色，字体等等
+	 * @property {String} bg-color z-tabs背景色
+	 * @property {Object} tabs-style z-tabs样式
+	 * @property {Boolean} init-trigger-change 初始化时是否自动触发change事件
+	 * @event {Function(index,value)} change tabs改变时触发，index:当前切换到的index；value:当前切换到的value
+	 * @example <z-tabs :list="list"></z-tabs>
+	 */
+	export default {
+		name: 'z-tabs',
+		data() {
+			return {
+				currentIndex: 0,
+				currentSwiperIndex: 0,
+				bottomDotX: -1,
+				bottomDotXForIndex: 0,
+				showBottomDot: false,
+				shouldSetDx: true,
+				
+				barCalcedWidth: 0,
+				pxBarWidth: 0,
+				scrollLeft: 0,
+				tabsSuperWidth: uni.upx2px(750),
+				tabsWidth: uni.upx2px(750),
+				tabsHeight: uni.upx2px(80),
+				tabsLeft: 0,
+				tabsContainerWidth: 0,
+				itemNodeInfos: [],
+				isFirstLoaded: false,
+				currentScrollLeft: 0,
+				changeTriggerFailed: false,
+				currentChanged: false
+			};
+		},
+		props: {
+			//数据源数组，支持形如['tab1','tab2']的格式或[{name:'tab1',value:1}]的格式
+			list: {
+				type: Array,
+				default: function() {
+					return [];
+				}
+			},
+			//当前选中的index
+			current: {
+				type: [Number, String],
+				default: _gc('current',0)
+			},
+			//list数组长度超过scrollCount时滚动显示(不自动铺满全屏)
+			scrollCount: {
+				type: [Number, String],
+				default: _gc('scrollCount',5)
+			},
+			//z-tabs样式
+			tabsStyle: {
+				type: Object,
+				default: function() {
+					return _gc('tabsStyle',{})
+				}
+			},
+			//自定义每个tab的宽度，默认为0，即代表根据内容自动撑开，单位rpx，支持传100、"100px"或"100rpx"
+			tabWidth: {
+				type: [Number, String],
+				default: _gc('tabWidth',0)
+			},
+			//滑块宽度，单位rpx，支持传100、"100px"或"100rpx"
+			barWidth: {
+				type: [Number, String],
+				default: _gc('barWidth',45)
+			},
+			//滑块高度，单位rpx，支持传100、"100px"或"100rpx"
+			barHeight: {
+				type: [Number, String],
+				default: _gc('barHeight',8)
+			},
+			//滑块样式，其中的width和height将被barWidth和barHeight覆盖
+			barStyle: {
+				type: Object,
+				default: function() {
+					return _gc('barStyle',{});
+				}
+			},
+			//tabs与底部的间距，单位rpx，支持传100、"100px"或"100rpx"
+			bottomSpace: {
+				type: [Number, String],
+				default: _gc('bottomSpace',8)
+			},
+			//切换tab时滑块动画模式，与swiper联动时有效，点击切换tab时无效，必须调用setDx。默认为line，即切换tab时滑块宽度保持不变，线性运动。可选值为worm，即为类似毛毛虫蠕动效果
+			barAnimateMode: {
+				type: String,
+				default: _gc('barAnimateMode','line')
+			},
+			//list中item的name(标题)的key
+			nameKey: {
+				type: String,
+				default: _gc('nameKey','name')
+			},
+			//list中item的value的key
+			valueKey: {
+				type: String,
+				default: _gc('valueKey','value')
+			},
+			//激活状态tab的颜色
+			activeColor: {
+				type: String,
+				default: _gc('activeColor','#007AFF')
+			},
+			//未激活状态tab的颜色
+			inactiveColor: {
+				type: String,
+				default: _gc('inactiveColor','#666666')
+			},
+			//禁用状态tab的颜色
+			disabledColor: {
+				type: String,
+				default: _gc('disabledColor','#bbbbbb')
+			},
+			//激活状态tab的样式
+			activeStyle: {
+				type: Object,
+				default: function() {
+					return _gc('activeStyle',{});
+				}
+			},
+			//未激活状态tab的样式
+			inactiveStyle: {
+				type: Object,
+				default: function() {
+					return _gc('inactiveStyle',{});
+				}
+			},
+			//禁用状态tab的样式
+			disabledStyle: {
+				type: Object,
+				default: function() {
+					return _gc('disabledStyle',{});
+				}
+			},
+			//z-tabs背景色
+			bgColor: {
+				type: String,
+				default: _gc('bgColor','white')
+			},
+			//徽标数最大数字限制，超过这个数字将变成badgeMaxCount+
+			badgeMaxCount: {
+				type: [Number, String],
+				default: _gc('badgeMaxCount',99)
+			},
+			//徽标样式，例如可自定义背景色，字体等等
+			badgeStyle: {
+				type: Object,
+				default: function() {
+					return _gc('badgeStyle',{})
+				}
+			},
+			//初始化时是否自动触发change事件
+			initTriggerChange: {
+				type: Boolean,
+				default: _gc('initTriggerChange',false)
+			}
+		},
+		mounted() {
+			this.updateSubviewLayout();
+		},
+		watch: {
+			current: {
+				handler(newVal) {
+					this.currentChanged && this._lockDx();
+					this.currentIndex = newVal;
+					this._preUpdateDotPosition(this.currentIndex);
+					if (this.initTriggerChange) {
+						if (newVal < this.list.length) {
+							this.$emit('change', newVal, this.list[newVal][this.valueKey]);
+						}else {
+							this.changeTriggerFailed = true;
+						}
+					}
+					this.currentChanged = true;
+				},
+				immediate: true
+			},
+			list: {
+				handler(newVal) {
+					this._handleListChange(newVal);
+				},
+				immediate: false
+			},
+			bottomDotX(newVal) {
+				if(newVal >= 0){
+					// #ifndef APP-NVUE
+					this.showBottomDot = true;
+					// #endif
+					this.$nextTick(() => {
+						// #ifdef APP-NVUE
+						weexAnimation.transition(this.$refs['z-tabs-bottom-dot'], {
+							styles: {
+								transform: `translateX(${newVal}px)`
+							},
+							duration: this.showAnimate ? 200 : 0,
+							delay: 0
+						})
+						setTimeout(() => {
+							this.showBottomDot = true;
+						},10)
+						// #endif
+					})
+				}
+			},
+			finalBarWidth: {
+				handler(newVal) {
+					this.barCalcedWidth = newVal;
+					this.pxBarWidth = this.barCalcedWidth;
+				},
+				immediate: true
+			},
+			currentIndex: {
+				handler(newVal) {
+					this.currentSwiperIndex = newVal;
+				},
+				immediate: true
+			}
+		},
+		computed: {
+			shouldScroll(){
+				return this.list.length > this.scrollCount;
+			},
+			finalTabsHeight(){
+				return this.tabsHeight;
+			},
+			tabStyle(){
+				const stl = this.shouldScroll ? {'flex-shrink': 0} : {'flex': 1};
+				if(this.finalTabWidth > 0){
+					stl['width'] = this.finalTabWidth + 'px';
+				}else{
+					delete stl.width;
+				} 
+				return stl;
+			},
+			tabsListStyle(){
+				return this.shouldScroll ? {} : {'flex':1};
+			},
+			showAnimate(){
+				return this.isFirstLoaded && !this.shouldSetDx;
+			},
+			dotTransition(){
+				return this.showAnimate ? 'transform .2s linear':'none';
+			},
+			finalDotStyle(){
+				return {...this.barStyle, width: this.barCalcedWidth + 'px', height: this.finalBarHeight + 'px', opacity: this.showBottomDot ? 1 : 0};
+			},
+			finalTabWidth(){
+				return this._convertTextToPx(this.tabWidth);
+			},
+			finalBarWidth(){
+				return this._convertTextToPx(this.barWidth);
+			},
+			finalBarHeight(){
+				return this._convertTextToPx(this.barHeight);
+			},
+			finalBottomSpace(){
+				return this._convertTextToPx(this.bottomSpace);
+			}
+		},
+		methods: {
+			//根据swiper的@transition实时更新底部dot位置
+			setDx(dx) {
+				if (!this.shouldSetDx) return;
+				const isLineMode = this.barAnimateMode === 'line';
+				const isWormMode = this.barAnimateMode === 'worm';
+				let dxRate = dx / this.tabsSuperWidth;
+				this.currentSwiperIndex = this.currentIndex + parseInt(dxRate);
+				const isRight = dxRate > 0;
+				const barWidth = this.pxBarWidth;
+				if(this.currentSwiperIndex !== this.currentIndex){
+					dxRate = dxRate - (this.currentSwiperIndex - this.currentIndex);
+					const currentNode = this.itemNodeInfos[this.currentSwiperIndex];
+					if (!!currentNode){
+						this.bottomDotXForIndex = this._getBottomDotX(currentNode, barWidth);
+					}
+				}
+				const currentIndex = this.currentSwiperIndex;
+				let nextIndex = currentIndex + (isRight ? 1 : -1);
+				nextIndex = Math.max(0, nextIndex);
+				nextIndex = Math.min(nextIndex, this.itemNodeInfos.length - 1);
+				const currentNodeInfo = this.itemNodeInfos[currentIndex];
+				const nextNodeInfo = this.itemNodeInfos[nextIndex];
+				const nextBottomX = nextNodeInfo ? this._getBottomDotX(nextNodeInfo, barWidth) : 0;
+				if (isLineMode){
+					this.bottomDotX = this.bottomDotXForIndex + (nextBottomX - this.bottomDotXForIndex) * Math.abs(dxRate);
+				} else if (isWormMode) {
+					if ((isRight && currentIndex >= this.itemNodeInfos.length - 1) || (!isRight && currentIndex <= 0)) return;
+					const spaceOffset = isRight ? nextNodeInfo.right - currentNodeInfo.left : currentNodeInfo.right - nextNodeInfo.left;
+					let barCalcedWidth = barWidth + spaceOffset * Math.abs(dxRate);
+					if (isRight) {
+						if (barCalcedWidth > nextBottomX - this.bottomDotX + barWidth) {
+							const barMinusWidth = barWidth + spaceOffset * (1 - dxRate);
+							this.bottomDotX = this.bottomDotXForIndex + (barCalcedWidth - barMinusWidth) / 2;
+							barCalcedWidth = barMinusWidth;
+						}
+					}else if (!isRight) {
+						if (barCalcedWidth > this.bottomDotXForIndex + barWidth - nextBottomX){
+							const barMinusWidth = barWidth + spaceOffset * (1 + dxRate);
+							barCalcedWidth = barMinusWidth;
+							this.bottomDotX = nextBottomX;
+						} else{
+							this.bottomDotX = this.bottomDotXForIndex - (barCalcedWidth - barWidth);
+						}
+					}
+					barCalcedWidth = Math.max(barCalcedWidth, barWidth);
+					this.barCalcedWidth = barCalcedWidth;
+				}
+			},
+			//在swiper的@animationfinish中通知z-tabs结束多setDx的锁定，若在父组件中调用了setDx，则必须调用unlockDx
+			unlockDx() {
+				this.$nextTick(() => {
+					this.shouldSetDx = true;
+				})
+			},
+			//更新z-tabs内部布局
+			updateSubviewLayout(tryCount = 0) {
+				this.$nextTick(() => {
+					let delayTime = 10;
+					// #ifdef APP-NVUE || MP-BAIDU
+					delayTime = 50;
+					// #endif
+					setTimeout(() => {
+						this._getNodeClientRect('.z-tabs-scroll-view-conatiner').then(res=>{
+							if (res){ 
+								if (!res[0].width && tryCount < 10) {
+									setTimeout(() => {
+										tryCount ++;
+										this.updateSubviewLayout(tryCount);
+									}, 50);
+									return;
+								}
+								this.tabsWidth = res[0].width;
+								this.tabsHeight = res[0].height;
+								this.tabsLeft = res[0].left;
+								this._handleListChange(this.list);
+							}
+						})
+						this._getNodeClientRect('.z-tabs-conatiner').then(res=>{
+							if(res && res[0].width){
+								this.tabsSuperWidth = res[0].width;
+							}
+						})
+					},delayTime)
+				})
+			},
+			//点击了tabs
+			tabsClick(index,item) {
+				if (item.disabled) return;
+				if (this.currentIndex != index) {
+					this.shouldSetDx = false;
+					this.$emit('change', index, item[this.valueKey]);
+					this.currentIndex = index;
+					this._preUpdateDotPosition(index);
+				} else {
+					this.$emit('secondClick',index, item[this.valueKey]);
+				}
+			},
+			//scroll-view滚动
+			scroll(e){
+				this.currentScrollLeft = e.detail.scrollLeft;
+			},
+			//锁定dx，用于避免在swiper被动触发滚动时候执行setDx中的代码
+			_lockDx() {
+				this.shouldSetDx = false;
+			},
+			//更新底部dot位置之前的预处理
+			_preUpdateDotPosition(index) {
+				// #ifndef APP-NVUE
+				this.$nextTick(() => {
+					uni.createSelectorQuery().in(this).select(".z-tabs-scroll-view").fields({
+					  scrollOffset: true
+					}, data => {
+						if (data) {
+							this.currentScrollLeft = data.scrollLeft;
+							this._updateDotPosition(index);
+						} else {
+							this._updateDotPosition(index);
+						}
+					}).exec();
+				})
+				// #endif
+				
+				// #ifdef APP-NVUE
+				this._updateDotPosition(index);
+				// #endif
+			},
+			//更新底部dot位置
+			_updateDotPosition(index){
+				if(index >= this.itemNodeInfos.length) return;
+				this.$nextTick(async ()=>{
+					let node = this.itemNodeInfos[index];
+					let offset = 0;
+					let tabsContainerWidth = this.tabsContainerWidth;
+					if (JSON.stringify(this.activeStyle) !== '{}') {
+						const nodeRes = await this._getNodeClientRect(`#z-tabs-item-${index}`,true);
+						if (nodeRes) {
+							node = nodeRes[0];
+							offset = this.currentScrollLeft;
+							this.tabsHeight = Math.max(node.height + uni.upx2px(28), this.tabsHeight);
+							tabsContainerWidth = 0;
+							for(let i = 0;i < this.itemNodeInfos.length;i++){
+								let oldNode = this.itemNodeInfos[i];
+								tabsContainerWidth += i === index ? node.width : oldNode.width;
+							}
+						}
+					}
+					this.bottomDotX = this._getBottomDotX(node, this.finalBarWidth, offset);
+					this.bottomDotXForIndex = this.bottomDotX;
+					if (this.tabsWidth) {
+						setTimeout(()=>{
+							let scrollLeft = this.bottomDotX - this.tabsWidth / 2 + this.finalBarWidth / 2;
+							scrollLeft = Math.max(0,scrollLeft);
+							if (tabsContainerWidth) {
+								scrollLeft = Math.min(scrollLeft,tabsContainerWidth - this.tabsWidth + 10);
+							}
+							if (this.shouldScroll && tabsContainerWidth > this.tabsWidth) {
+								this.scrollLeft = scrollLeft;
+							}
+							this.$nextTick(()=>{
+								this.isFirstLoaded = true;
+							})
+						},200)
+					}
+				})
+			},
+			// 处理list改变
+			_handleListChange(newVal) {
+				this.$nextTick(async ()=>{
+					if(newVal.length){
+						let itemNodeInfos = [];
+						let tabsContainerWidth = 0;
+						let delayTime = 0;
+						// #ifdef MP-BAIDU
+						delayTime = 100;
+						// #endif
+						setTimeout(async()=>{
+							for(let i = 0;i < newVal.length;i++){
+								const nodeRes = await this._getNodeClientRect(`#z-tabs-item-${i}`,true);
+								if(nodeRes){
+									const node = nodeRes[0];
+									node.left += this.currentScrollLeft;
+									itemNodeInfos.push(node);
+									tabsContainerWidth += node.width;
+								}
+								if (i === this.currentIndex){
+									this.itemNodeInfos = itemNodeInfos;
+									this.tabsContainerWidth = tabsContainerWidth;
+									this._updateDotPosition(this.currentIndex);
+								}
+							}
+							this.itemNodeInfos = itemNodeInfos;
+							this.tabsContainerWidth = tabsContainerWidth;
+							this._updateDotPosition(this.currentIndex);
+						},delayTime)
+					}
+				})
+				
+				if (this.initTriggerChange && this.changeTriggerFailed && newVal.length) {
+					if (this.current < newVal.length) {
+						this.$emit('change', this.current, newVal[this.current][this.valueKey]);
+					}
+				}
+			},
+			//根据node获取bottomX
+			_getBottomDotX(node, barWidth = this.finalBarWidth, offset = 0){
+				return node.left + node.width / 2 - barWidth / 2 + offset - this.tabsLeft;
+			},
+			//获取节点信息
+			_getNodeClientRect(select, withRefArr = false) {
+				// #ifdef APP-NVUE
+				select = select.replace('.', '').replace('#', '');
+				const ref = withRefArr ? this.$refs[select][0] : this.$refs[select];
+				return new Promise((resolve, reject) => {
+					if (ref) {
+						weexDom.getComponentRect(ref, option => {
+							if (option && option.result) {
+								resolve([option.size]);
+							} else resolve(false);
+						})
+					} else resolve(false);
+				});
+				return;
+				// #endif
+				const res = uni.createSelectorQuery().in(this);
+				res.select(select).boundingClientRect();
+				return new Promise((resolve, reject) => {
+					res.exec(data => {
+						resolve((data && data != '' && data != undefined && data.length) ? data : false);
+					});
+				});
+			},
+			//格式化badge中的count
+			_formatCount(count) {
+				if (!count) return '';
+				if (count > this.badgeMaxCount) {
+					return this.badgeMaxCount + '+';
+				}
+				return count.toString();
+			},
+			//将文本的px或者rpx转为px的值
+			_convertTextToPx(text) {
+				const dataType = Object.prototype.toString.call(text);
+				if (dataType === '[object Number]') {
+					return uni.upx2px(text);
+				}
+				let isRpx = false;
+				if (text.indexOf('rpx') !== -1 || text.indexOf('upx') !== -1) {
+					text = text.replace('rpx', '').replace('upx', '');
+					isRpx = true;
+				} else if (text.indexOf('px') !== -1) {
+					text = text.replace('px', '');
+				} else {
+					text = uni.upx2px(text);
+				}
+				if (!isNaN(text)) {
+					if (isRpx) return Number(uni.upx2px(text));
+					return Number(text);
+				}
+				return 0;
+			}
+		}
+		
+	}
+</script>
+
+<style scoped>
+	.z-tabs-conatiner{
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		display: flex;
+		width: 100%;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 750rpx;
+		/* #endif */
+		flex-direction: row;
+		height: 80rpx;
+	}
+	
+	.z-tabs-scroll-view-conatiner{
+		flex: 1;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		height: 100%;
+		width: 100%;
+		/* #endif */
+		flex-direction: row;
+	}
+	
+	/* #ifndef APP-NVUE */
+	.z-tabs-scroll-view ::-webkit-scrollbar {
+		display: none;
+		-webkit-appearance: none;
+		width: 0 !important;
+		height: 0 !important;
+		background: transparent;
+	}
+	/* #endif */
+	
+	.z-tabs-scroll-view{
+		flex-direction: row;
+		position: absolute;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		height: 100%;
+		/* #endif */
+		flex: 1;
+	}
+	
+	.z-tabs-list-container{
+		position: relative;
+		/* #ifndef APP-NVUE */
+		height: 100%;
+		/* #endif */
+	}
+	
+	.z-tabs-list,.z-tabs-list-container{
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+	
+	.z-tabs-item{
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 0px 20rpx;
+	}
+	
+	.z-tabs-item-title-container{
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+	}
+	
+	.z-tabs-item-title{
+		font-size: 30rpx;
+	}
+	
+	.z-tabs-item-title-disabled{
+		/* #ifndef APP-NVUE */
+		cursor: not-allowed;
+		/* #endif */
+	}
+	
+	.z-tabs-item-badge{
+		margin-left: 8rpx;
+		background-color: #ec5b56;
+		color: white;
+		font-size: 22rpx;
+		border-radius: 100px;
+		padding: 0rpx 10rpx;
+	}
+	
+	.z-tabs-bottom{
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		right: 0;
+	}
+	
+	.z-tabs-bottom-dot{
+		border-radius: 100px;
+	}
+	
+	.z-tabs-left,.z-tabs-right{
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+	}
+</style>
+
diff --git a/uni_modules/z-tabs/package.json b/uni_modules/z-tabs/package.json
new file mode 100644
index 0000000..51773e5
--- /dev/null
+++ b/uni_modules/z-tabs/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "z-tabs",
+  "name": "z-tabs",
+  "displayName": "【z-tabs】一个简单轻量的tabs组件",
+  "version": "0.2.5",
+  "description": "全平台兼容，支持nvue、vue3",
+  "keywords": [
+    "tabs"
+],
+  "repository": "https://github.com/SmileZXLee/uni-z-tabs",
+  "engines": {
+    "HBuilderX": "^3.0.7"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": "393727164"
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@zxlee/z-tabs",
+    "type": "component-vue"
+  },
+  "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": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y",
+		  "钉钉": "y",
+		  "快手": "y",
+		  "飞书": "y",
+		  "京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/z-tabs/readme.md b/uni_modules/z-tabs/readme.md
new file mode 100644
index 0000000..41d563f
--- /dev/null
+++ b/uni_modules/z-tabs/readme.md
@@ -0,0 +1,175 @@
+# z-tabs
+
+[![version](https://img.shields.io/badge/version-0.2.5-blue)](https://github.com/SmileZXLee/uni-z-tabs)
+[![license](https://img.shields.io/github/license/SmileZXLee/uni-z-tabs)](https://en.wikipedia.org/wiki/MIT_License)
+
+***
+
+### 反馈qq群(点击加群)：[790460711](https://jq.qq.com/?_wv=1027&k=vU2fKZZH)
+
+***
+
+## z-tabs文档
+
+### 安装
+
+#### 方式1(推荐)：通过uni_modules安装，在插件市场中点击右上角【使用HbuilderX导入插件】即可。 
+
+***
+
+#### 方式2：通过npm安装  
+
+```bash
+//若项目之前未使用npm管理依赖（项目根目录下无package.json文件），先在项目根目录执行命令初始化npm工程
+npm init -y
+
+//安装
+npm install @zxlee/z-tabs --save
+//更新
+npm update @zxlee/z-tabs
+```
+
+然后在`pages.json`中配置`easycom`(注意：下方配置只有在使用npm安装时才需要配置！！！！！)  
+
+```json
+"easycom": {
+    "^z-tabs": "@zxlee/z-tabs/components/z-tabs/z-tabs.vue"
+}
+```
+
+### 基本使用
+
+```html
+<template>
+	<z-tabs :list="list"></z-tabs>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                list: []
+            }
+        },
+        onLoad() {
+            const list = [];
+            for(let i = 0;i < 10;i++) {
+				// list内item支持字符串或对象，下方这个是字符串
+				list.push('tab标题');
+
+				// 如果要展示徽标数，则list中item的数据结构应为：
+				list.push({
+					name: 'tab标题',
+					badge: {
+						// 设置徽标数为6
+						count: 6
+					},
+					// 可以禁用某个item
+					disabled: true
+				});
+            }
+			this.list = list;
+		}
+    }
+</script>
+```
+
+
+
+### props
+
+| 参数                | 说明                                                         | 类型           | 默认值  | 可选值 |
+| :------------------ | :----------------------------------------------------------- | :------------- | :------ | :----- |
+| list                | 数据源数组，支持形如`['tab1','tab2']`的格式或`[{name:'tab1',value:1}]`的格式 | Array          | []      | -      |
+| current             | 当前选中的index                                              | Number\|String | 0       | -      |
+| scroll-count        | list数组长度超过scrollCount时滚动显示(不自动铺满全屏)        | Number\|String | 5       | -      |
+| tab-width           | 自定义每个tab的宽度，默认为0，即代表根据内容自动撑开，单位rpx，支持传100、"100px"或"100rpx" | Number\|String | 0       | 0      |
+| bar-width           | 滑块宽度，单位rpx，支持传100、"100px"或"100rpx"              | Number\|String | 45rpx   | -      |
+| bar-height          | 滑块高度，单位rpx，支持传100、"100px"或"100rpx"              | Number\|String | 8rpx    | -      |
+| bar-style           | 滑块样式，其中的`width`和`height`将被`bar-width`和`bar-height`覆盖 | Object         | {}      | -      |
+| bottom-space        | tabs与底部的间距，单位rpx，支持传100、"100px"或"100rpx"      | Number\|String | 8rpx    | -      |
+| bar-animate-mode    | 【v0.1.5起支持】切换tab时滑块动画模式，与`swiper`联动时有效，点击切换tab时无效，必须调用`setDx`。默认为`line`，即切换tab时滑块宽度保持不变，线性运动。可选值为`worm`，即为类似毛毛虫蠕动效果 | String         | line    | worm   |
+| name-key            | list中item的name(标题)的key                                  | String         | name    | -      |
+| value-key           | list中item的value的key                                       | String         | value   | -      |
+| active-color        | 激活状态tab的颜色                                            | String         | #007AFF | -      |
+| inactive-color      | 未激活状态tab的颜色                                          | String         | #666666 | -      |
+| disabled-color      | 禁用状态tab的颜色                                            | String         | #bbbbbb | -      |
+| active-style        | 激活状态tab的样式                                            | Object         | {}      | -      |
+| inactive-style      | 未激活状态tab的样式                                          | Object         | {}      | -      |
+| disabled-style      | 禁用状态tab的样式                                            | Object         | {}      | -      |
+| badge-max-count     | 徽标数最大数字限制，超过这个数字将变成`badge-max-count`+     | Number\|String | 99      | -      |
+| badge-style         | 徽标样式，例如可自定义背景色，字体等等                       | Object         | {}      | -      |
+| bg-color            | z-tabs背景色                                                 | String         | white   | -      |
+| tabs-style          | z-tabs样式                                                   | Object         | {}      | -      |
+| init-trigger-change | 初始化时是否自动触发change事件                               | Boolean        | true    | false  |
+
+
+### events
+
+| 事件名       | 说明                 | 回调参数                                                     |
+| ------------ | -------------------- | ------------------------------------------------------------ |
+| @change      | tabs改变(点击)时触发 | `参数1`:index(当前切换到的index)；<br/>`参数2`:value(当前切换到的value) |
+| @secondClick | tabs二次点击时触发   | `参数1`:index(当前切换到的index)；<br/>`参数2`:value(当前切换到的value) |
+
+### methods
+
+| 方法名              | 说明                                                         | 参数                                   |
+| ------------------- | ------------------------------------------------------------ | -------------------------------------- |
+| setDx               | 根据swiper的`@transition`实时更新底部dot位置                 | swiper的`@transition`中的`e.detail.dx` |
+| unlockDx            | 在swiper的`@animationfinish`中通知`z-tabs`结束多`setDx`的锁定，若在父组件中调用了`setDx`，则必须调用`unlockDx` | -                                      |
+| updateSubviewLayout | 在nvue+安卓中，若在cell中使用`z-tabs`，且页面加载时cell在屏幕之外，因cell的复用机制，可能导致`z-tabs`内部的布局失效：例如底部bar无法显示，此时可在list滚动到一定区域内(例如快显示`z-tabs`)的时候调用此方法以更新其内部布局。其他情况无需调用！ | -                                      |
+
+### slots
+
+| 名称  | 说明         |
+| :---- | ------------ |
+| left  | tabs左侧插槽 |
+| right | tabs右侧插槽 |
+
+### 支持全局配置
+
+* 在`/z-tabs/components/z-tabs/config/index.js`文件中进行配置
+
+```js
+export default {
+	'active-color': 'red'
+}
+```
+
+### 【v0.1.4起支持】底部dot与swiper联动演示
+
+```html
+<template>
+  <z-tabs ref="tabs" :list="tabList" :current="current" @change="tabsChange" />
+  <swiper :current="current" @transition="swiperTransition" @animationfinish="swiperAnimationfinish">
+    <swiper-item class="swiper-item" v-for="(item, index) in tabList" :key="index">
+      xxx
+    </swiper-item>
+  </swiper>
+<template>
+<script>
+	export default {
+		data() {
+			return {
+				tabList: ['测试1','测试2','测试3','测试4'],
+				current: 0, // tabs组件的current值，表示当前活动的tab选项
+			};
+		},
+		methods: {
+			//tabs通知swiper切换
+			tabsChange(index) {
+				this.current = index;
+			},
+			//swiper滑动中
+			swiperTransition(e) {
+				this.$refs.tabs.setDx(e.detail.dx);
+			},
+			//swiper滑动结束
+			swiperAnimationfinish(e) {
+				this.current = e.detail.current;
+				this.$refs.tabs.unlockDx();
+			}
+		}
+	}
+</script>
+```
\ No newline at end of file
diff --git a/utils/auth.js b/utils/auth.js
new file mode 100644
index 0000000..cf27e27
--- /dev/null
+++ b/utils/auth.js
@@ -0,0 +1,22 @@
+const AccessTokenKey = 'ACCESS_TOKEN'
+const RefreshTokenKey = 'REFRESH_TOKEN'
+
+// ========== Token 相关 ==========
+
+export function getAccessToken() {
+  return uni.getStorageSync(AccessTokenKey)
+}
+
+export function getRefreshToken() {
+  return uni.getStorageSync(RefreshTokenKey)
+}
+
+export function setToken(token) {
+  uni.setStorageSync(AccessTokenKey, token.accessToken)
+  uni.setStorageSync(RefreshTokenKey, token.refreshToken)
+}
+
+export function removeToken() {
+  uni.removeStorageSync(AccessTokenKey)
+  uni.removeStorageSync(RefreshTokenKey)
+}
diff --git a/utils/common.ts b/utils/common.ts
new file mode 100644
index 0000000..1dc4fca
--- /dev/null
+++ b/utils/common.ts
@@ -0,0 +1,138 @@
+
+
+const _dTo = function(url) {
+	if (!_getSync('isLogin')) {
+		_gTo('/pages/login/index')
+		return;
+	}
+	uni.navigateTo({
+		url: url
+	});
+}
+const _gTo = function(url) {
+	uni.navigateTo({
+		url: url
+	});
+}
+const _getSync = (i) => {
+	return uni.getStorageSync(i);
+}
+const _removeSync = (i) => {
+	return uni.removeStorageSync(i);
+}
+const _setSync = (i, data) => {
+	return uni.setStorageSync(i, data);
+}
+const _alert = (txt, cb) => {
+	uni.showModal({
+		title: '温馨提示',
+		content: txt,
+		showCancel: false,
+		confirmColor: '#2979ff',
+		success: function() {
+			cb && cb();
+		}
+	});
+}
+
+const _confirm = function(txt, cb) {
+	uni.showModal({
+		title: '温馨提示',
+		content: txt,
+		showCancel: true,
+		confirmColor: '#2979ff',
+		success: function(res) {
+			if (res.confirm) {
+				cb && cb();
+			}
+		}
+	});
+}
+
+const _toast = function(txt) {
+	uni.showToast({
+		title: txt,
+		icon: 'none',
+		duration: 1500
+	});
+}
+
+
+const _backT = function() {
+	uni.navigateBack();
+}
+const _call = function(tel) {
+	uni.makePhoneCall({
+		phoneNumber: tel
+	});
+}
+
+const _showLoading = (msg = '') => uni.showLoading({
+	mask: true,
+	title: msg
+});
+
+/**
+ * 关闭loading
+ */
+const _closeLoading = () => uni.hideLoading();
+
+// 获取截图宽高
+const _screenshot = function(fromWhere, widthProp, proportion) {
+	var width = 0,
+		height = 0;
+	uni.getSystemInfo({
+		//整个手机屏幕的高
+		success: function(res) {
+			width = parseInt(res.screenWidth * widthProp) //宽等于屏幕款*百分比
+			height = width * proportion
+		}
+	});
+	_gTo('../u-avatar-cropper/u-avatar-cropper?destWidth=' + (width * 2) + '&destHeight=' + (height * 2) +
+		'&rectWidth=' + width + '&rectHeight=' + height + '&fileType=jpg' + '&fromWhere=' +
+		fromWhere)
+}
+// 复制
+const _copy = (data) => {
+	uni.setClipboardData({
+		data: data,
+		success: function() {
+		}
+	});
+}
+const _upLoad = function(tempFilePaths) {
+	return new Promise((resolve, reject) => {
+		uni.uploadFile({
+			url: import.meta.env.VITE_BASE_URL + '/common/upload', //仅为示例，非真实的接口地址
+			filePath: tempFilePaths,
+			name: 'file',
+			formData: {
+				'user': 'test'
+			},
+			header: { "Content-Type": "multipart/form-data", 'openId': uni.getStorageSync('openId') },
+			success: (uploadFileRes) => {
+                let item = JSON.parse(uploadFileRes.data.replace(/\ufeff/g, ""));
+				resolve(item)
+			},
+			fail(err) {
+			}
+		});
+	})
+}
+export {
+	_dTo,
+	_gTo,
+	_toast,
+	_backT,
+	_call,
+	_confirm,
+	_alert,
+	_getSync,
+	_setSync,
+	_removeSync,
+	_showLoading,
+	_closeLoading,
+	_screenshot,
+	_copy,
+	_upLoad
+};
diff --git a/utils/dateTime.ts b/utils/dateTime.ts
new file mode 100644
index 0000000..2e1495a
--- /dev/null
+++ b/utils/dateTime.ts
@@ -0,0 +1,50 @@
+const zeroPadd = function(date,seperator) {
+	var hours = date.getHours();				// 获取时
+	var minutes = date.getMinutes();		// 获取分
+	var second = date.getSeconds();		// 获取秒
+	var seperator1 = seperator?seperator:"-";							// 自定义日期分隔符
+	var year = date.getFullYear();				// 获取年
+	var month = date.getMonth() + 1;		// 获取月
+	var strDate = date.getDate();				// 获取日
+
+	if (month >= 1 && month <= 9) {
+		month = "0" + month;
+	}
+	if (strDate >= 0 && strDate <= 9) {
+		strDate = "0" + strDate;
+	}
+	if (hours >= 0 && hours <= 9) {
+		hours = "0" + hours;
+	}
+	if (minutes >= 0 && minutes <= 9) {
+		minutes = "0" + minutes;
+	}
+	if (second >= 0 && second <= 9) {
+		second = "0" + second;
+	}
+	var time = hours + ":" + minutes + ":" + second;			// 时分秒
+	var currentdate = year + seperator1 + month + seperator1 + strDate;		// 年月日
+	var date = {
+		time, currentdate
+	}
+	return date;
+}
+
+// 获取当前日期 时间
+const getNowFormatDate = function(date,seperator) {
+	return zeroPadd(date,seperator);
+}
+
+//获取一小时后的日期  时间
+const accessTimeInAnHour = function(date, h,seperator) {
+	var date1 = date.getTime();	// 获取当前时间戳
+	// 当前时间戳+3600s（一小时，其他时间通过计算时间戳进行相应加减），重新设置 Date 对象
+	date.setTime(date1 + h * 3600000);
+	return zeroPadd(date,seperator);
+}
+
+
+export {
+	getNowFormatDate,
+	accessTimeInAnHour,
+};
diff --git a/utils/http.ts b/utils/http.ts
new file mode 100644
index 0000000..0c62a65
--- /dev/null
+++ b/utils/http.ts
@@ -0,0 +1,19 @@
+// @ts-ignore
+import buildURL from 'axios/lib/helpers/buildURL'
+import type { AxiosRequestConfig } from 'axios'
+
+type ParamsSerializer = AxiosRequestConfig['paramsSerializer']
+
+export function getFullURL(
+  baseURL: string,
+  url: string,
+  params: Record<string, any>,
+  paramsSerializer?: ParamsSerializer
+) {
+  if (url.startsWith('http')) {
+    return buildURL(url, params, paramsSerializer)
+  }
+  baseURL = baseURL.endsWith('/') ? baseURL : `${baseURL}/`
+  url = url.startsWith('/') ? url.slice(1) : url
+  return buildURL(`${baseURL}${url}`, params, paramsSerializer)
+}
diff --git a/utils/utils.ts b/utils/utils.ts
new file mode 100644
index 0000000..023eb13
--- /dev/null
+++ b/utils/utils.ts
@@ -0,0 +1,31 @@
+
+
+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])
+    const num2 = parseInt(v2[i])
+
+    if (num1 > num2) {
+      return 1
+    } else if (num1 < num2) {
+      return -1
+    }
+  }
+
+  return 0
+}
+
+export default {
+  compareVersion
+}
diff --git a/utils/validator.ts b/utils/validator.ts
new file mode 100644
index 0000000..7452a7c
--- /dev/null
+++ b/utils/validator.ts
@@ -0,0 +1,783 @@
+//校验学校编码 只能为数字
+export function validateCode(rule, value, callback) {
+    if (!value) {
+        return callback(new Error('学校编码不能为空'))
+    } else {
+        const codeReg = /^[0-9]+$/
+        const codeMax = /^\d{0,5}$/
+        if (codeReg.test(value)) {
+            if (codeMax.test(value)) {
+                callback()
+            } else {
+                callback(new Error('学校编码不能大于5位'))
+            }
+
+        } else {
+            callback(new Error('请输入正确的学校编码，只能是数字'))
+        }
+    }
+}
+
+//校验邮箱
+export function validateEmail(rule, value, callback) {
+    if (value) {
+        const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
+        if (mailReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的邮箱格式'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验英文
+export function validateEng(rule, value, callback) {
+    if (value) {
+        const mailReg = /^[A-Za-z\-\&\(\)\Ⅰ\Ⅱ\Ⅲ\Ⅳ\Ⅴ\Ⅵ\Ⅶ\Ⅷ\Ⅸ\Ⅹ\s]+$/;
+        if (mailReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的英文名字'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验姓名拼音
+export function validateEngName(rule, value, callback) {
+    if (value) {
+        const EngNameReg = /^[A-Za-z \(\)\s]+$/
+        if (EngNameReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的姓名拼音'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验手机号码
+export function validateHanset(rule, value, callback) {
+    if (value) {
+        // const regs =/^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+        // const regs = /^1[3|4|5|7|8][0-9]\d{8}$/
+        const regs = /^1[3-9]\d{9}$/
+        if (regs.test(value)) {
+            callback()
+        } else {
+            return callback(new Error('请输入正确的手机号'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验座机电话
+export function validatePhone(rule, value, callback) {
+    if (value) {
+        //const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
+        // const regs = /^([0-9]{3,4}-)?[0-9]{7,8}$/;
+        const regs = /^((0\d{2,3}-\d{7,8}))$/;
+        if (regs.test(value)) {
+            callback()
+        } else {
+            return callback(new Error('请输入正确的座机号'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验家庭电话 手机或者座机
+export function validateFamilyPhone(rule, value, callback) {
+    if (value) {
+        const isPhone = /^([0-9]{3,4}-)?[0-9]{7,8}$/;
+        const isMob = /^((\+?86)|(\+86))?(13[0123456789][0-9]{8}|15[0123456789][0-9]{8}|17[0123456789][0-9]{8}|18[0123456789][0-9]{8}|147[0-9]{8}|1349[0-9]{7})$/;
+        if (isPhone.test(value) || isMob.test(value)) {
+            callback()
+        } else {
+            return callback(new Error('请输入正确的手机或者座机电话'))
+        }
+    } else {
+        callback()
+    }
+}
+
+// 校验只能为中文
+export function validateChinese(rule, value, callback) {
+    if (value) {
+        const chineseReg = /^[\u4E00-\u9FA5]+$/
+        if (chineseReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入简介，只能为中文'))
+        }
+    } else {
+        callback()
+    }
+}
+
+// 校验名称既能为中文也可以为英文
+export function validateName(rule, value, callback) {
+    if (value) {
+        const chineseReg = /^[\u4E00-\u9FA5]+$/
+        const engLish = /^[A-Za-z]+$/
+        if (chineseReg.test(value) || engLish.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的中文或者英文名称'))
+        }
+    } else {
+        callback()
+    }
+}
+
+// 校验负责人既能为中文也可以为英文
+export function validateChargeperson(rule, value, callback) {
+    if (value) {
+        const chineseReg = /^[\u4E00-\u9FA5]+$/
+        const engLish = /^[A-Za-z]+$/
+        if (chineseReg.test(value) || engLish.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的负责人（中英文都可以）'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验学校名称不能为空
+export function validateXXMC(rule, value, callback) {
+    if (!value) {
+        return callback(new Error('案例名称不能为空'))
+    } else {
+        const chineseReg = /^[\u4E00-\u9FA5]+$/
+        if (chineseReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的案例名称，只能是汉字'))
+        }
+    }
+}
+
+//校验中英文数字和下划线都可以
+export function validateZYS(rule, value, callback) {
+    if (value) {
+        //const postReg =/^[\u4e00-\u9fa5_a-zA-Z0-9_]{4,10}+$/
+        const Reg = /^[\u4e00-\u9fa5a-zA-Z0-9]+$/
+        if (Reg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的名称'))
+        }
+    } else {
+        callback()
+    }
+}
+
+// 校验邮政编码
+export function validatePostCode(rule, value, callback) {
+    if (value) {
+        const postReg = /^[1-9]\d{5}$/
+        if (postReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的邮政编码'))
+        }
+    } else {
+        callback()
+    }
+}
+
+// 数字
+export function validateNum(rule, value, callback) {
+    if (value) {
+        const numReg = /^[\d]+$/
+        if (numReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入数字'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//数字和小数点
+export function validateNumDot(rule, value, callback) {
+    if (value) {
+        const numReg = /^\d+$|^\d+\.\d+$/g
+        if (numReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入数字或小数点'))
+        }
+    } else {
+        callback()
+    }
+}
+
+// 组织机构代码
+export function validateOrganization(rule, value, callback) {
+    if (value) {
+        const orgReg = /^[A-Za-z0-9]\w{14}$/g
+        if (orgReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入组织机构代码'))
+        }
+    } else {
+        callback()
+    }
+
+}
+
+// 传真
+export function validateFax(rule, value, callback) {
+    if (value) {
+        const faxReg = /^(\d{3,4}-)?\d{7,8}$/
+        if (faxReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的传真'))
+        }
+    } else {
+        callback()
+    }
+}
+
+// 主页地址
+export function validateHome(rule, value, callback) {
+    if (value) {
+        const homeReg = /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\*\+,;=.]+$/
+        if (homeReg.test(value)) {
+            callback()
+        } else {
+            return callback(new Error('请输入正确的主页地址'))
+        }
+    } else {
+        callback()
+    }
+}
+
+// 学分 小数，且保留最多三位小数
+export function validateXf(rule, value, callback) {
+    if (!value) {
+        return callback(new Error('学分不能为空'))
+    } else {
+        const numReg = /^[0-9]+\.[0-9]{0,3}$/
+        if (numReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入小数，且小数点后最多三位'))
+        }
+    }
+}
+
+// 数字格式  小数点后一位
+export function validateOneNum(rule, value, callback) {
+    if (value) {
+        const numReg = /^\d+(\.\d+)?$/
+        const numOneReg = /^\d*\.{0,1}\d{0,1}$/
+        if (numReg.test(value)) {
+            if (numOneReg.test(value)) {
+                callback()
+            } else {
+                callback(new Error('小数点后最多1位'))
+            }
+        } else {
+            callback(new Error('请输入数字'))
+        }
+    }
+    callback()
+}
+
+// 数字格式  小数点后两位
+export function validateTwoNum(rule, value, callback) {
+    if (value) {
+        const numReg = /^\d+(\.\d+)?$/
+        const numTwoReg = /^\d*\.{0,2}\d{0,2}$/
+        if (numReg.test(value)) {
+            if (numTwoReg.test(value)) {
+                callback()
+            } else {
+                callback(new Error('小数点后最多2位'))
+            }
+        } else {
+            callback(new Error('请输入数字'))
+        }
+    }
+    callback()
+}
+
+// 数字格式  小数点后两位  	小数点前保留五位
+export function validateTwoNumThree(rule, value, callback) {
+    if (value) {
+        if (Number(value) > 10000) {// 校验value值不能大于10000
+            callback(new Error('数值过大，请重新输入'))
+        } const numReg = /^\d+(\.\d+)?$/
+        const numTwoReg = /^\d*\.{0,2}\d{0,2}$/
+        if (numReg.test(value)) {
+            if (numTwoReg.test(value)) {
+                callback()
+            } else {
+                callback(new Error('小数点后最多2位'))
+            }
+        } else {
+            callback(new Error('请输入数字'))
+        }
+    }
+
+    callback()
+}
+
+// 数字格式  小数点后三位
+export function validateThreeNum(rule, value, callback) {
+    if (value) {
+        const numReg = /^\d+(\.\d+)?$/
+        const numTwoReg = /^\d*\.{0,3}\d{0,3}$/
+        if (numReg.test(value)) {
+            if (numTwoReg.test(value)) {
+                callback()
+            } else {
+                callback(new Error('小数点后最多3位'))
+            }
+        } else {
+            callback(new Error('请输入数字'))
+        }
+    }
+    callback()
+    // if (!value) {
+    // 	return callback(new Error('字段不能为空'))
+    // } else {
+    // 	const numReg = /^\d+(\.\d+)?$/
+    // 	const numTwoReg = /^\d*\.{0,3}\d{0,3}$/
+    // 	if (numReg.test(value)) {
+    // 		if (numTwoReg.test(value)) {
+    // 				callback()
+    // 		} else {
+    // 			callback(new Error('小数点后最多3位'))
+    // 		}
+    // 	} else {
+    // 		callback(new Error('请输入数字'))
+    // 	}
+    // }
+}
+
+//校验年份必须为4位数字
+export function validateNF(rule, value, callback) {
+    if (value) {
+        const NFReg = /^\d{4}$/
+        if (NFReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入4位数字'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验年份必须为4位数字
+export function validateXQ(rule, value, callback) {
+    if (value) {
+        const NFReg = /^\d{5}$/
+        if (NFReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入5位数字'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验分数最大值
+export function validateMaxNumber(rule, value, callback) {
+    if (parseInt(value) <= 200) {
+        callback()
+    } else {
+        callback(new Error('分数不能大于200'))
+    }
+
+}
+
+//校验正整数
+export function validateInteger(rule, value, callback) {
+    if (value) {
+        const integerReg = /^[+]{0,1}(\d+)$/
+        if (integerReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的整数'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验整数
+export function validateroundNumber(rule, value, callback) {
+    if (value) {
+        const numReg = /^[1-9]\d*$/
+        if (numReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的整数'))
+        }
+    } else {
+        callback()
+    }
+}
+// 校验车牌号
+export function validateCarNumber(rule, value, callback) {
+    if (value) {
+        // 新能源
+        const numReg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([A-HJ-K][A-HJ-NP-Z0-9][0-9]{4}$))/;
+        // 燃油车
+        const numReg1 = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/;
+		if (value.length == 7) {
+            if (numReg1.test(value)) {
+                callback()
+            }else{
+            callback(new Error('请输入正确的车牌号'))
+            }
+          } else if (value.length == 8) {
+            if (numReg.test(value)) {
+                callback()
+            }else{
+            callback(new Error('请输入正确的车牌号'))
+            }
+          } else {
+            callback(new Error('请输入正确的车牌号'))
+          }
+    } else {
+        callback()
+    }
+}
+
+//校验身份证号
+export function validateCard(rule, value, callback) {
+    if (value) {
+        let cardBoolean = IdCardValidate(value);
+        // const cardReg =/(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+        // if (cardReg.test(value)) {
+        if (cardBoolean) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的身份证号'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//身份证：身份证校验
+function IdCardValidate(code) {
+    var tip = "";
+    if (code != "") {
+        var city = {
+            11: "北京",
+            12: "天津",
+            13: "河北",
+            14: "山西",
+            15: "内蒙古",
+            21: "辽宁",
+            22: "吉林",
+            23: "黑龙江 ",
+            31: "上海",
+            32: "江苏",
+            33: "浙江",
+            34: "安徽",
+            35: "福建",
+            36: "江西",
+            37: "山东",
+            41: "河南",
+            42: "湖北 ",
+            43: "湖南",
+            44: "广东",
+            45: "广西",
+            46: "海南",
+            50: "重庆",
+            51: "四川",
+            52: "贵州",
+            53: "云南",
+            54: "西藏 ",
+            61: "陕西",
+            62: "甘肃",
+            63: "青海",
+            64: "宁夏",
+            65: "新疆",
+            71: "台湾",
+            81: "香港",
+            82: "澳门",
+            91: "国外 "
+        };
+
+        var pass = true;
+
+        //是否为空
+        if (code === '') {
+            tip = "请输入身份证号，身份证号不能为空";
+            pass = false;
+        }
+        //校验长度，类型
+        else if (isCardNo(code) === false) {
+            tip = "您输入的身份证号码不正确，请重新输入";
+            pass = false;
+        }
+        //检查省份
+        else if (checkProvince(code, city) === false) {
+            tip = "您输入的身份证号码不正确,请重新输入";
+            pass = false;
+        }
+        //校验生日
+        else if (checkBirthday(code) === false) {
+            tip = "您输入的身份证号码生日不正确,请重新输入";
+            pass = false;
+        } else {
+            //18位身份证需要验证最后一位校验位
+            if (code.length == 18) {
+                code = code.split('');
+                //∑(ai×Wi)(mod 11)
+                //加权因子
+                var factor = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
+                //校验位
+                var parity = [1, 0, 'X', 9, 8, 7, 6, 5, 4, 3, 2];
+                var sum = 0;
+                var ai = 0;
+                var wi = 0;
+                for (var i = 0; i < 17; i++) {
+                    ai = code[i];
+                    wi = factor[i];
+                    sum += ai * wi;
+                }
+                var last = parity[sum % 11];
+                if (parity[sum % 11] != code[17]) {
+                    tip = "身份证格式错误";
+                    pass = false;
+                }
+            }
+        }
+        return pass;
+    }
+}
+
+//身份证：检查身份证号码是否符合规范，包括长度，类型
+function isCardNo(card) {
+    //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+    var reg = /(^\d{15}$)|(^\d{17}(\d|X)$)/;
+    if (reg.test(card) === false) {
+        return false;
+    }
+    return true;
+};
+
+//身份证：取身份证前两位,校验省份
+function checkProvince(card, city) {
+    var province = card.substr(0, 2);
+    if (city[province] == undefined) {
+        return false;
+    }
+    return true;
+};
+
+//身份证：检查生日是否正确
+function checkBirthday(card) {
+    var len = card.length;
+    //身份证15位时，次序为省（3位）市（3位）年（2位）月（2位）日（2位）校验位（3位），皆为数字
+    if (len == '15') {
+        var re_fifteen = /^(\d{6})(\d{2})(\d{2})(\d{2})(\d{3})$/;
+        var arr_data = card.match(re_fifteen);
+        var year = arr_data[2];
+        var month = arr_data[3];
+        var day = arr_data[4];
+        var birthday = new Date('19' + year + '/' + month + '/' + day);
+        return verifyBirthday('19' + year, month, day, birthday);
+    }
+    //身份证18位时，次序为省（3位）市（3位）年（4位）月（2位）日（2位）校验位（4位），校验位末尾可能为X
+    if (len == '18') {
+        var re_eighteen = /^(\d{6})(\d{4})(\d{2})(\d{2})(\d{3})([0-9]|X)$/;
+        var arr_data = card.match(re_eighteen);
+        var year = arr_data[2];
+        var month = arr_data[3];
+        var day = arr_data[4];
+        var birthday = new Date(year + '/' + month + '/' + day);
+        return verifyBirthday(year, month, day, birthday);
+    }
+    return false;
+};
+
+//身份证：校验日期
+function verifyBirthday(year, month, day, birthday) {
+    var now = new Date();
+    var now_year = now.getFullYear();
+    //年月日是否合理
+    if (birthday.getFullYear() == year && (birthday.getMonth() + 1) == month && birthday.getDate() == day) {
+        //判断年份的范围（3岁到100岁之间)
+        var time = now_year - year;
+        if (time >= 3 && time <= 100) {
+            return true;
+        }
+        return false;
+    }
+    return false;
+};
+
+/**
+ * 判断身份证号码为18位时最后的验证位是否正确
+ * @param a_idCard 身份证号码数组
+ * @return
+ */
+function isTrueValidateCodeBy18IdCard(a_idCard) {
+    let By18Val = a_idCard[17].toLowerCase(); // 获取第十八位值
+    const numReg = /^[1-9]\d*$/
+    let numVal = false; // 校验第十八位是否为整数
+    if (numReg.test(Number(By18Val))) {
+        numVal = true
+    } else {
+        numVal = false
+    }
+    if (By18Val == 'x' || By18Val == 'X' || numVal) {
+        return true
+    } else {
+        return false
+    }
+}
+
+/**
+ * 验证身份证号码前两位，省级编码的准确性
+ * @param AddressNum
+ * @constructor
+ */
+function IdCardValidateAddress(AddressNum) {
+    var city = {
+        11: "北京",
+        12: "天津",
+        13: "河北",
+        14: "山西",
+        15: "内蒙古",
+        21: "辽宁",
+        22: "吉林",
+        23: "黑龙江 ",
+        31: "上海",
+        32: "江苏",
+        33: "浙江",
+        34: "安徽",
+        35: "福建",
+        36: "江西",
+        37: "山东",
+        41: "河南",
+        42: "湖北 ",
+        43: "湖南",
+        44: "广东",
+        45: "广西",
+        46: "海南",
+        50: "重庆",
+        51: "四川",
+        52: "贵州",
+        53: "云南",
+        54: "西藏 ",
+        61: "陕西",
+        62: "甘肃",
+        63: "青海",
+        64: "宁夏",
+        65: "新疆",
+        71: "台湾",
+        81: "香港",
+        82: "澳门",
+        91: "国外 "
+    };
+    if (city[AddressNum.substr(0, 2)]) {
+        return true
+    } else {
+        return false
+    }
+}
+
+/**
+ * 验证18位数身份证号码中的生日是否是有效生日
+ * @param idCard 18位书身份证字符串
+ * @return
+ */
+function isValidityBrithBy18IdCard(idCard18) {
+    var year = idCard18.substring(6, 10);
+    var month = idCard18.substring(10, 12);
+    var day = idCard18.substring(12, 14);
+    var temp_date = new Date(year, parseFloat(month) - 1, parseFloat(day));
+    // 这里用getFullYear()获取年份，避免千年虫问题
+    if (temp_date.getFullYear() != parseFloat(year)
+        || temp_date.getMonth() != parseFloat(month) - 1
+        || temp_date.getDate() != parseFloat(day)) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+/**
+ * 验证15位数身份证号码中的生日是否是有效生日
+ * @param idCard15 15位书身份证字符串
+ * @return
+ */
+function isValidityBrithBy15IdCard(idCard15) {
+    var year = idCard15.substring(6, 8);
+    var month = idCard15.substring(8, 10);
+    var day = idCard15.substring(10, 12);
+    var temp_date = new Date(year, parseFloat(month) - 1, parseFloat(day));
+    // 对于老身份证中的你年龄则不需考虑千年虫问题而使用getYear()方法
+    if (temp_date.getYear() != parseFloat(year)
+        || temp_date.getMonth() != parseFloat(month) - 1
+        || temp_date.getDate() != parseFloat(day)) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+/**
+ * 去掉字符串头尾空格
+ * @param str
+ * @returns {*}
+ */
+function trim(str) {
+    return str.replace(/(^\s*)|(\s*$)/g, "");
+}
+
+export default {
+    validateCode,
+    validateEmail,
+    validateEng,
+    validatePhone,
+    validateChinese,
+    validatePostCode,
+    validateNum,
+    validateNumDot,
+    validateZYS,
+    validateOrganization,
+    validateFax,
+    validateHome,
+    validateXXMC,
+    validateXf,
+    validateOneNum,
+    validateMaxNumber,
+    validateTwoNum,
+    validateTwoNumThree,
+    validateThreeNum,
+    validateInteger,
+    validateNF,
+    validateXQ,
+    validateroundNumber,
+    validateEngName,
+    validateCard,
+    validateHanset,
+    validateFamilyPhone,
+    validateName,
+    validateChargeperson,
+	validateCarNumber
+}